X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=64633717fb4b8098637901813421df24f83c3d30;hp=f4a665c2ec49f225a5c8f246937e713923f89295;hb=9d28da5ae394e572dedf0ec22c17fd259825e1c9;hpb=cec48d1618edd0f28f21d5351f53692876222e16

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index f4a665c2..64633717 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,9 +42,9 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
-AnalogSignal::AnalogSignal(const sr_probe *const probe,
+AnalogSignal::AnalogSignal(pv::SigSession &session, sr_probe *const probe,
 	shared_ptr<data::Analog> data) :
-	Signal(probe),
+	Signal(session, probe),
 	_data(data),
 	_scale(1.0f)
 {
@@ -54,23 +55,38 @@ AnalogSignal::~AnalogSignal()
 {
 }
 
+boost::shared_ptr<pv::data::SignalData> AnalogSignal::data() const
+{
+	return _data;
+}
+
 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);
 
+	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;
 
-	paint_axis(p, y, left, right);
-
 	const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
 		_data->get_snapshots();
 	if (snapshots.empty())
@@ -80,7 +96,7 @@ void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
 		snapshots.front();
 
 	const double pixels_offset = offset / scale;
-	const double samplerate = _data->get_samplerate();
+	const double samplerate = _data->samplerate();
 	const double start_time = _data->get_start_time();
 	const int64_t last_sample = snapshot->get_sample_count() - 1;
 	const double samples_per_pixel = samplerate * scale;