Added Signal::data accessor function

[pulseview.git] / pv / view / logicsignal.cpp

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index a9484817eb839da2e98f76b3985d8debce174951..54faa601dc16f97ac4b80fba50e5d8af0f3bf992 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -22,6 +22,9 @@
 
 #include <math.h>
 
+#include <QFormLayout>
+#include <QToolBar>
+
 #include "logicsignal.h"
 #include "view.h"
 
@@ -73,7 +76,12 @@ LogicSignal::~LogicSignal()
 {
 }
 
-boost::shared_ptr<pv::data::Logic> LogicSignal::data() const
+boost::shared_ptr<pv::data::SignalData> LogicSignal::data() const
+{
+       return _data;
+}
+
+boost::shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
 {
        return _data;
 }
@@ -235,8 +243,8 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 
        // Add the trigger actions
        const sr_dev_inst *const sdi = _session.get_device();
-       if (sr_config_list(sdi->driver, SR_CONF_TRIGGER_TYPE,
-               &gvar, sdi) == SR_OK)
+       if (sr_config_list(sdi->driver, sdi, NULL, SR_CONF_TRIGGER_TYPE,
+               &gvar) == SR_OK)
        {
                const char *const trig_types =
                        g_variant_get_string(gvar, NULL);