X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Flogicsignal.cpp;h=e1f0377e9307d0b25d3104f47fd409c9014d5b8d;hb=e0e90d8091d3e4f20c03de6015bcedc5e4568567;hp=87fe5b0469e08c417804ac5b0a2519b3331dc95e;hpb=299d0e751844eb09d88f1a5bac45231571ca5c66;p=pulseview.git

diff --git a/pv/view/logicsignal.cpp b/pv/view/logicsignal.cpp
index 87fe5b04..e1f0377e 100644
--- a/pv/view/logicsignal.cpp
+++ b/pv/view/logicsignal.cpp
@@ -52,14 +52,16 @@ const QColor LogicSignal::SignalColours[10] = {
 	QColor(0xEE, 0xEE, 0xEC),	// White
 };
 
-LogicSignal::LogicSignal(QString name, shared_ptr<data::Logic> data,
-	int probe_index) :
-	Signal(name),
-	_probe_index(probe_index),
+LogicSignal::LogicSignal(const sr_probe *const probe,
+	shared_ptr<data::Logic> data) :
+	Signal(probe),
 	_data(data)
 {
-	assert(_probe_index >= 0);
-	_colour = SignalColours[_probe_index % countof(SignalColours)];
+	_colour = SignalColours[probe->index % countof(SignalColours)];
+}
+
+LogicSignal::~LogicSignal()
+{
 }
 
 void LogicSignal::paint(QPainter &p, int y, int left, int right,
@@ -71,10 +73,14 @@ void LogicSignal::paint(QPainter &p, int y, int left, int right,
 
 	vector< pair<int64_t, bool> > edges;
 
+	assert(_probe);
 	assert(scale > 0);
 	assert(_data);
 	assert(right >= left);
 
+	if (!_probe->enabled)
+		return;
+
 	paint_axis(p, y, left, right);
 
 	const float high_offset = y - View::SignalHeight + 0.5f;
@@ -104,7 +110,7 @@ void LogicSignal::paint(QPainter &p, int y, int left, int right,
 	snapshot->get_subsampled_edges(edges,
 		min(max((int64_t)floor(start), (int64_t)0), last_sample),
 		min(max((int64_t)ceil(end), (int64_t)0), last_sample),
-		samples_per_pixel / Oversampling, _probe_index);
+		samples_per_pixel / Oversampling, _probe->index);
 	assert(edges.size() >= 2);
 
 	// Paint the edges