X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;ds=inline;f=pv%2Fview%2Fanalogsignal.cpp;h=5d838506cedb1877ccf3b284b92735ba2cf0025f;hb=4c8a6a6d03e2a12f67d910a83589072b478114cb;hp=3509a040d201c84c896df69db0d6208aeb8f30bd;hpb=8dbbc7f0b9ea59d0f0d62225772f8a56eee125f5;p=pulseview.git

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 3509a040..5d838506 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -23,10 +23,10 @@
 #include <cassert>
 #include <cmath>
 
-#include "analogsignal.h"
-#include "pv/data/analog.h"
-#include "pv/data/analogsnapshot.h"
-#include "pv/view/view.h"
+#include "analogsignal.hpp"
+#include "pv/data/analog.hpp"
+#include "pv/data/analogsnapshot.hpp"
+#include "pv/view/view.hpp"
 
 #include <libsigrok/libsigrok.hpp>
 
@@ -53,7 +53,7 @@ const QColor AnalogSignal::SignalColours[4] = {
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
 AnalogSignal::AnalogSignal(
-	pv::SigSession &session,
+	pv::Session &session,
 	shared_ptr<Channel> channel,
 	shared_ptr<data::Analog> data) :
 	Signal(session, channel),
@@ -87,28 +87,19 @@ std::pair<int, int> AnalogSignal::v_extents() const
 	return make_pair(-NominalHeight / 2, NominalHeight / 2);
 }
 
-void AnalogSignal::paint_back(QPainter &p, int left, int right)
+void AnalogSignal::paint_back(QPainter &p, const RowItemPaintParams &pp)
 {
 	if (channel_->enabled())
-		paint_axis(p, get_visual_y(), left, right);
+		paint_axis(p, pp, get_visual_y());
 }
 
-void AnalogSignal::paint_mid(QPainter &p, int left, int right)
+void AnalogSignal::paint_mid(QPainter &p, const RowItemPaintParams &pp)
 {
 	assert(data_);
-	assert(right >= left);
 	assert(owner_);
 
 	const int y = get_visual_y();
 
-	const View *const view = owner_->view();
-	assert(view);
-
-	const double scale = view->scale();
-	assert(scale > 0);
-
-	const double offset = view->offset();
-
 	if (!channel_->enabled())
 		return;
 
@@ -120,13 +111,13 @@ void AnalogSignal::paint_mid(QPainter &p, int left, int right)
 	const shared_ptr<pv::data::AnalogSnapshot> &snapshot =
 		snapshots.front();
 
-	const double pixels_offset = offset / scale;
+	const double pixels_offset = pp.pixels_offset();
 	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;
-	const double start = samplerate * (offset - start_time);
-	const double end = start + samples_per_pixel * (right - left);
+	const double samples_per_pixel = samplerate * pp.scale();
+	const double start = samplerate * (pp.offset() - start_time);
+	const double end = start + samples_per_pixel * pp.width();
 
 	const int64_t start_sample = min(max((int64_t)floor(start),
 		(int64_t)0), last_sample);
@@ -134,11 +125,11 @@ void AnalogSignal::paint_mid(QPainter &p, int left, int right)
 		(int64_t)0), last_sample);
 
 	if (samples_per_pixel < EnvelopeThreshold)
-		paint_trace(p, snapshot, y, left,
+		paint_trace(p, snapshot, y, pp.left(),
 			start_sample, end_sample,
 			pixels_offset, samples_per_pixel);
 	else
-		paint_envelope(p, snapshot, y, left,
+		paint_envelope(p, snapshot, y, pp.left(),
 			start_sample, end_sample,
 			pixels_offset, samples_per_pixel);
 }