X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=03b05955e4820f90bfd40e12058ccef2d7d60701;hb=568b90d4fcfb5f67f5fb642a9f0fdb3a54607bf3;hp=fb5eba6103ad6ba9f3f22936d86fe831d07a5d66;hpb=1b1ec774978b65209ce2b454cbf81da499b797d2;p=pulseview.git

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index fb5eba6..03b0595 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -32,18 +32,29 @@ using namespace std;
 namespace pv {
 namespace view {
 
-AnalogSignal::AnalogSignal(QString name, shared_ptr<data::Analog> 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)
 {
-	_colour = Qt::blue;
+	_colour = SignalColours[probe_index % countof(SignalColours)];
 }
 
-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);
+
+	paint_axis(p, y, left, right);
 
 	const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
 		_data->get_snapshots();
@@ -59,38 +70,34 @@ 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 int64_t sample_count = end_sample - start_sample;
 
-	const int y_offset = rect.center().y();
-
-	const float* samples = snapshot->get_samples();
+	const float* samples = snapshot->get_samples(
+		start_sample, end_sample);
 	assert(samples);
 
-	QPointF *points = new QPointF[end_sample - start_sample];
+	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) + rect.left();
-		const float y = samples[sample] + y_offset;
-		*point++ = QPointF(x, y);
+			pixels_offset) + left;
+		*point++ = QPointF(x,
+			samples[sample - start_sample] + y);
 	}
 
+	p.setPen(_colour);
 	p.drawPoints(points, point - points);
 
 	delete[] points;
 }
 
-int AnalogSignal::get_nominal_offset(const QRect &rect) const
-{
-	return rect.center().y();
-}
-
 } // namespace view
 } // namespace pv