X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=136080694bbb03029c21691efe0b9b3293ac5c3c;hp=126ecb1f0b1330515c774f2f69fce673b3268ab4;hb=2658961bdef3601e07d494a8ed3d01a8101b68cd;hpb=a8acb46e05a84d7487e2cf7c914ba82215f812cc

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 126ecb1f..13608069 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -23,8 +23,8 @@
 #include <math.h>
 
 #include "analogsignal.h"
-#include "../analogdata.h"
-#include "../analogdatasnapshot.h"
+#include "pv/data/analog.h"
+#include "pv/data/analogsnapshot.h"
 
 using namespace boost;
 using namespace std;
@@ -32,25 +32,26 @@ using namespace std;
 namespace pv {
 namespace view {
 
-AnalogSignal::AnalogSignal(QString name, shared_ptr<AnalogData> data) :
+AnalogSignal::AnalogSignal(QString name, shared_ptr<data::Analog> data) :
 	Signal(name),
 	_data(data)
 {
 	_colour = Qt::blue;
 }
 
-void AnalogSignal::paint(QPainter &p, const QRect &rect, double scale,
+void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
 	double offset)
 {
 	assert(scale > 0);
 	assert(_data);
+	assert(right >= left);
 
-	const deque< shared_ptr<pv::AnalogDataSnapshot> > &snapshots =
+	const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
 		_data->get_snapshots();
 	if (snapshots.empty())
 		return;
 
-	const shared_ptr<pv::AnalogDataSnapshot> &snapshot =
+	const shared_ptr<pv::data::AnalogSnapshot> &snapshot =
 		snapshots.front();
 
 	const double pixels_offset = offset / scale;
@@ -59,15 +60,13 @@ void AnalogSignal::paint(QPainter &p, const QRect &rect, double scale,
 	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 * rect.width();
+	const double end = start + samples_per_pixel * (right - left);
 
 	const int64_t start_sample = min(max((int64_t)floor(start),
 		(int64_t)0), last_sample);
 	const int64_t end_sample = min(max((int64_t)ceil(end),
 		(int64_t)0), last_sample);
 
-	const int y_offset = rect.center().y();
-
 	const float* samples = snapshot->get_samples();
 	assert(samples);
 
@@ -77,9 +76,8 @@ void AnalogSignal::paint(QPainter &p, const QRect &rect, double scale,
 	for (int64_t sample = start_sample;
 		sample != end_sample; sample++) {
 		const float x = (sample / samples_per_pixel -
-			pixels_offset) + rect.left();
-		const float y = samples[sample] + y_offset;
-		*point++ = QPointF(x, y);
+			pixels_offset) + left;
+		*point++ = QPointF(x, samples[sample] + y);
 	}
 
 	p.drawPoints(points, point - points);
@@ -87,10 +85,5 @@ void AnalogSignal::paint(QPainter &p, const QRect &rect, double scale,
 	delete[] points;
 }
 
-int AnalogSignal::get_nominal_offset(const QRect &rect) const
-{
-	return rect.center().y();
-}
-
 } // namespace view
 } // namespace pv