Added DevInst pointer to Signal

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

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 54faa601dc16f97ac4b80fba50e5d8af0f3bf992..81ddd6e92ea4a925b0eb9d06e22b417d4f8f83cc 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -28,13 +28,18 @@
 #include "logicsignal.h"
 #include "view.h"
 
-#include "pv/sigsession.h"
-#include "pv/data/logic.h"
-#include "pv/data/logicsnapshot.h"
-#include "pv/view/view.h"
-
-using namespace boost;
-using namespace std;
+#include <pv/sigsession.h>
+#include <pv/devinst.h>
+#include <pv/data/logic.h>
+#include <pv/data/logicsnapshot.h>
+#include <pv/view/view.h>
+
+using boost::shared_ptr;
+using std::deque;
+using std::max;
+using std::min;
+using std::pair;
+using std::vector;
 
 namespace pv {
 namespace view {
@@ -58,9 +63,10 @@ const QColor LogicSignal::SignalColours[10] = {
        QColor(0xEE, 0xEE, 0xEC),       // White
 };
 
-LogicSignal::LogicSignal(pv::SigSession &session, sr_probe *const probe,
+LogicSignal::LogicSignal(pv::SigSession &session,
+       shared_ptr<pv::DevInst> dev_inst, sr_probe *const probe,
        shared_ptr<data::Logic> data) :
-       Signal(session, probe),
+       Signal(session, dev_inst, probe),
        _data(data),
        _trigger_none(NULL),
        _trigger_rising(NULL),
@@ -76,12 +82,12 @@ LogicSignal::~LogicSignal()
 {
 }
 
-boost::shared_ptr<pv::data::SignalData> LogicSignal::data() const
+shared_ptr<pv::data::SignalData> LogicSignal::data() const
 {
        return _data;
 }
 
-boost::shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
+shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
 {
        return _data;
 }
@@ -126,7 +132,7 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right)
        const shared_ptr<pv::data::LogicSnapshot> &snapshot =
                snapshots.front();
 
-       double samplerate = _data->get_samplerate();
+       double samplerate = _data->samplerate();
 
        // Show sample rate as 1Hz when it is unknown
        if (samplerate == 0.0)
@@ -163,7 +169,7 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right)
        delete[] edge_lines;
 
        // Paint the caps
-       const unsigned int max_cap_line_count = (edges.size() - 1);
+       const unsigned int max_cap_line_count = edges.size();
        QLineF *const cap_lines = new QLineF[max_cap_line_count];
 
        p.setPen(HighColour);
@@ -242,9 +248,10 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
        Signal::populate_popup_form(parent, form);
 
        // Add the trigger actions
-       const sr_dev_inst *const sdi = _session.get_device();
-       if (sr_config_list(sdi->driver, sdi, NULL, SR_CONF_TRIGGER_TYPE,
-               &gvar) == SR_OK)
+       boost::shared_ptr<DevInst> dev_inst = _session.get_device();
+       assert(dev_inst);
+
+       if (!(gvar = dev_inst->list_config(NULL, SR_CONF_TRIGGER_TYPE)))
        {
                const char *const trig_types =
                        g_variant_get_string(gvar, NULL);
@@ -298,7 +305,12 @@ void LogicSignal::set_trigger(char type)
        const char *const trigger_string =
                (type != 0) ? trigger_type_string : NULL;
 
-       const sr_dev_inst *const sdi = _session.get_device();
+       boost::shared_ptr<DevInst> dev_inst = _session.get_device();
+       assert(dev_inst);
+
+       const sr_dev_inst *const sdi = dev_inst->dev_inst();
+       assert(sdi);
+
        const int probe_count = g_slist_length(sdi->probes);
        assert(probe_count > 0);