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 7ea6a6fd87408f733af9f74cc8f1144d85c5f12e..75b5d3dfd245bcc5b982a4545245461b7cf627af 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -32,11 +32,25 @@ using namespace std;
 namespace pv {
 namespace view {
 
 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),
        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,
 }
 
 void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,


@@ -68,20 +82,24 @@ 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);
                (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);
 
        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;
        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,
+                       y - samples[sample - start_sample] * _scale);

        }
 
        }
 

+       p.setPen(_colour);

        p.drawPoints(points, point - points);
 
        delete[] points;
        p.drawPoints(points, point - points);
 
        delete[] points;