X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=75b5d3dfd245bcc5b982a4545245461b7cf627af;hp=73ab168685e28e531bb7aff9927afbddb1fa4df8;hb=785fd8d138e5866ade499c02ea405b8852fee113;hpb=aba1dd166b90f3408cd9d2b23b906df081845563

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 73ab1686..75b5d3df 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,21 +32,77 @@ using namespace std;
 namespace pv {
 namespace view {
 
-AnalogSignal::AnalogSignal(QString name, shared_ptr<AnalogData> data) :
+const QColor AnalogSignal::SignalColours[4] = {
+	QColor(0xC4, 0xA0, 0x00),	// Yellow
+	QColor(0x87, 0x20, 0x7A),	// Magenta
+	QColor(0x20, 0x4A, 0x87),	// Blue
+	QColor(0x4E, 0x9A, 0x06)	// Green
+};
+
+AnalogSignal::AnalogSignal(QString name, shared_ptr<data::Analog> data,
+	int probe_index) :
 	Signal(name),
-	_data(data)
+	_data(data),
+	_scale(1.0f)
 {
-	_colour = Qt::blue;
+	_colour = SignalColours[probe_index % countof(SignalColours)];
 }
 
-void AnalogSignal::paint(QPainter &p, const QRect &rect, double scale,
-	double offset)
+void AnalogSignal::set_scale(float scale)
 {
+	_scale = scale;
 }
 
-int AnalogSignal::get_nominal_offset(const QRect &rect) const
+void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
+	double offset)
 {
-	return rect.bottom();
+	assert(scale > 0);
+	assert(_data);
+	assert(right >= left);
+
+	paint_axis(p, y, left, right);
+
+	const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
+		_data->get_snapshots();
+	if (snapshots.empty())
+		return;
+
+	const shared_ptr<pv::data::AnalogSnapshot> &snapshot =
+		snapshots.front();
+
+	const double pixels_offset = offset / scale;
+	const double samplerate = _data->get_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 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 int64_t sample_count = end_sample - start_sample;
+
+	const float* samples = snapshot->get_samples(
+		start_sample, end_sample);
+	assert(samples);
+
+	QPointF *points = new QPointF[sample_count];
+	QPointF *point = points;
+
+	for (int64_t sample = start_sample;
+		sample != end_sample; sample++) {
+		const float x = (sample / samples_per_pixel -
+			pixels_offset) + left;
+		*point++ = QPointF(x,
+			y - samples[sample - start_sample] * _scale);
+	}
+
+	p.setPen(_colour);
+	p.drawPoints(points, point - points);
+
+	delete[] points;
 }
 
 } // namespace view