X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=8363383ac2125bfae2b04c21fa30d5749f87b147;hb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;hp=57a988c38e736fc908c99cbd0b64d337a871c910;hpb=e80da8d9b7d81cc91ef0a4cc23533f26cc47d238;p=pulseview.git

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 57a988c..8363383 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -29,16 +29,16 @@
 #include "view.h"
 
 #include <pv/sigsession.h>
-#include <pv/devinst.h>
+#include <pv/device/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::shared_ptr;
 using std::vector;
 
 namespace pv {
@@ -63,10 +63,9 @@ const QColor LogicSignal::SignalColours[10] = {
 	QColor(0xEE, 0xEE, 0xEC),	// White
 };
 
-LogicSignal::LogicSignal(pv::SigSession &session,
-	shared_ptr<pv::DevInst> dev_inst, sr_probe *const probe,
-	shared_ptr<data::Logic> data) :
-	Signal(session, dev_inst, 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),
@@ -156,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);
@@ -189,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 -
@@ -249,7 +245,7 @@ void LogicSignal::populate_popup_form(QWidget *parent, QFormLayout *form)
 
 	// Add the trigger actions
 	assert(_dev_inst);
-	if (!(gvar = _dev_inst->list_config(NULL, SR_CONF_TRIGGER_TYPE)))
+	if ((gvar = _dev_inst->list_config(NULL, SR_CONF_TRIGGER_TYPE)))
 	{
 		const char *const trig_types =
 			g_variant_get_string(gvar, NULL);
@@ -307,7 +303,7 @@ void LogicSignal::set_trigger(char type)
 	const sr_dev_inst *const sdi = _dev_inst->dev_inst();
 	assert(sdi);
 
-	const int probe_count = g_slist_length(sdi->probes);
+	const int probe_count = g_slist_length(sdi->channels);
 	assert(probe_count > 0);
 
 	assert(_probe && _probe->index < probe_count);