X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=eaa25bccc947dac826d5bddf2eff50ec2fcdd325;hb=f0c0b38f812bfbb2bb1978d40e2ce93f1da3f89d;hp=82e31a842c0134bfed1c94dafdb1c2c3b06129f9;hpb=3b68d03ddae96edb38a80f31bf6a990bde21cd1d;p=pulseview.git

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 82e31a84..eaa25bcc 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -28,11 +28,15 @@
 #include "pv/data/analogsnapshot.h"
 #include "pv/view/view.h"
 
+#include <libsigrok/libsigrok.hpp>
+
 using std::max;
 using std::min;
 using std::shared_ptr;
 using std::deque;
 
+using sigrok::Channel;
+
 namespace pv {
 namespace view {
 
@@ -45,13 +49,15 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
-AnalogSignal::AnalogSignal(shared_ptr<pv::device::DevInst> dev_inst,
-	const sr_channel *const probe, shared_ptr<data::Analog> data) :
-	Signal(dev_inst, probe),
+AnalogSignal::AnalogSignal(
+	pv::SigSession &session,
+	shared_ptr<Channel> channel,
+	shared_ptr<data::Analog> data) :
+	Signal(session, channel),
 	_data(data),
 	_scale(1.0f)
 {
-	_colour = SignalColours[probe->index % countof(SignalColours)];
+	_colour = SignalColours[_channel->index() % countof(SignalColours)];
 }
 
 AnalogSignal::~AnalogSignal()
@@ -75,7 +81,7 @@ void AnalogSignal::set_scale(float scale)
 
 void AnalogSignal::paint_back(QPainter &p, int left, int right)
 {
-	if (_probe->enabled)
+	if (_channel->enabled())
 		paint_axis(p, get_y(), left, right);
 }
 
@@ -83,16 +89,19 @@ void AnalogSignal::paint_mid(QPainter &p, int left, int right)
 {
 	assert(_data);
 	assert(right >= left);
+	assert(_owner);
+
+	const int y = get_y();
 
-	assert(_view);
-	const int y = _v_offset - _view->v_offset();
+	const View *const view = _owner->view();
+	assert(view);
 
-	const double scale = _view->scale();
+	const double scale = view->scale();
 	assert(scale > 0);
 
-	const double offset = _view->offset();
+	const double offset = view->offset();
 
-	if (!_probe->enabled)
+	if (!_channel->enabled())
 		return;
 
 	const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =