X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=53af2643132ee895c65e5bd8df10e4bc655a3061;hp=367b5890d7d6ef46f078c732cd579a2b4a5daa09;hb=03ce95a9bb81c05bae0da9de189d280214db67c3;hpb=f459c5400e067c4389c472b84194d760e7bfd585

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 367b5890..53af2643 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -25,6 +25,7 @@
 #include "analogsignal.h"
 #include "pv/data/analog.h"
 #include "pv/data/analogsnapshot.h"
+#include "pv/view/view.h"
 
 using namespace boost;
 using namespace std;
@@ -41,13 +42,13 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
-AnalogSignal::AnalogSignal(QString name, shared_ptr<data::Analog> data,
-	int probe_index) :
-	Signal(name),
+AnalogSignal::AnalogSignal(pv::SigSession &session, const sr_probe *const probe,
+	shared_ptr<data::Analog> data) :
+	Signal(session, probe),
 	_data(data),
 	_scale(1.0f)
 {
-	_colour = SignalColours[probe_index % countof(SignalColours)];
+	_colour = SignalColours[probe->index % countof(SignalColours)];
 }
 
 AnalogSignal::~AnalogSignal()
@@ -59,14 +60,27 @@ void AnalogSignal::set_scale(float scale)
 	_scale = scale;
 }
 
-void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
-	double offset)
+void AnalogSignal::paint_back(QPainter &p, int left, int right)
+{
+	if (_probe->enabled)
+		paint_axis(p, get_y(), left, right);
+}
+
+void AnalogSignal::paint_mid(QPainter &p, int left, int right)
 {
-	assert(scale > 0);
 	assert(_data);
 	assert(right >= left);
 
-	paint_axis(p, y, left, right);
+	assert(_view);
+	const int y = _v_offset - _view->v_offset();
+
+	const double scale = _view->scale();
+	assert(scale > 0);
+
+	const double offset = _view->offset();
+
+	if (!_probe->enabled)
+		return;
 
 	const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
 		_data->get_snapshots();