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

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 209512b..03b0595 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -32,11 +32,19 @@ 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, int y, int left, int right, double scale,
@@ -68,18 +76,21 @@ void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
 		(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();
+	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) + left;
-		*point++ = QPointF(x, samples[sample] + y);
+		*point++ = QPointF(x,
+			samples[sample - start_sample] + y);
 	}
 
 	p.setPen(_colour);