Added a scale factor to AnalogSignal

[pulseview.git] / pv / view / analogsignal.cpp

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index a6f032b5793aa0422e8e71b07f5e5b2f56fb3e2d..75b5d3dfd245bcc5b982a4545245461b7cf627af 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -32,11 +32,25 @@ 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)
+       _data(data),
+       _scale(1.0f)
 {
-       _colour = Qt::blue;
+       _colour = SignalColours[probe_index % countof(SignalColours)];
+}
+
+void AnalogSignal::set_scale(float scale)
+{
+       _scale = scale;
 }
 
 void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
@@ -82,7 +96,7 @@ void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
                const float x = (sample / samples_per_pixel -
                        pixels_offset) + left;
                *point++ = QPointF(x,
-                       samples[sample - start_sample] + y);
+                       y - samples[sample - start_sample] * _scale);
        }
 
        p.setPen(_colour);