Replaced lengthy iterator types with the auto keyword

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

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index b0fe95135eb782e9231d98d63dadf398a9cb6fda..546743e337bd62caae00f836a31c09b0630f664d 100644 (file)
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -22,16 +22,24 @@
 
 #include <math.h>
 
+#include <QFormLayout>
+#include <QToolBar>
+
 #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"
+#include <pv/sigsession.h>
+#include <pv/device/devinst.h>
+#include <pv/data/logic.h>
+#include <pv/data/logicsnapshot.h>
+#include <pv/view/view.h>
 
-using namespace boost;
-using namespace std;
+using boost::shared_ptr;
+using std::deque;
+using std::max;
+using std::min;
+using std::pair;
+using std::vector;
 
 namespace pv {
 namespace view {
@@ -55,9 +63,9 @@ const QColor LogicSignal::SignalColours[10] = {
        QColor(0xEE, 0xEE, 0xEC),       // White
 };
 
-LogicSignal::LogicSignal(pv::SigSession &session, const sr_probe *const probe,
-       shared_ptr<data::Logic> data) :
-       Signal(session, probe),
+LogicSignal::LogicSignal(shared_ptr<pv::device::DevInst> dev_inst,
+       const sr_channel *const probe, shared_ptr<data::Logic> data) :
+       Signal(dev_inst, probe),
        _data(data),
        _trigger_none(NULL),
        _trigger_rising(NULL),
@@ -73,7 +81,12 @@ LogicSignal::~LogicSignal()
 {
 }
 
-boost::shared_ptr<pv::data::Logic> LogicSignal::data() const
+shared_ptr<pv::data::SignalData> LogicSignal::data() const
+{
+       return _data;
+}
+
+shared_ptr<pv::data::Logic> LogicSignal::logic_data() const
 {
        return _data;
 }
@@ -118,7 +131,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)
@@ -142,9 +155,7 @@ void LogicSignal::paint_mid(QPainter &p, int left, int right)
        QLineF *const edge_lines = new QLineF[edge_count];
        line = edge_lines;
 
-       for (vector<pv::data::LogicSnapshot::EdgePair>::const_iterator i =
-                       edges.begin() + 1;
-               i != edges.end() - 1; i++) {
+       for (auto i = edges.cbegin() + 1; i != edges.cend() - 1; i++) {
                const float x = ((*i).first / samples_per_pixel -
                        pixels_offset) + left;
                *line++ = QLineF(x, high_offset, x, low_offset);
@@ -155,7 +166,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);
@@ -175,8 +186,7 @@ void LogicSignal::paint_caps(QPainter &p, QLineF *const lines,
 {
        QLineF *line = lines;
 
-       for (vector<pv::data::LogicSnapshot::EdgePair>::const_iterator i =
-               edges.begin(); i != (edges.end() - 1); i++)
+       for (auto i = edges.begin(); i != (edges.end() - 1); i++)
                if ((*i).second == level) {
                        *line++ = QLineF(
                                ((*i).first / samples_per_pixel -
@@ -234,9 +244,8 @@ 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, SR_CONF_TRIGGER_TYPE,
-               &gvar, sdi) == SR_OK)
+       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);
@@ -290,8 +299,11 @@ 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();
-       const int probe_count = g_slist_length(sdi->probes);
+       assert(_dev_inst);
+       const sr_dev_inst *const sdi = _dev_inst->dev_inst();
+       assert(sdi);
+
+       const int probe_count = g_slist_length(sdi->channels);
        assert(probe_count > 0);
 
        assert(_probe && _probe->index < probe_count);