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 fb5eba6103ad6ba9f3f22936d86fe831d07a5d66..75b5d3dfd245bcc5b982a4545245461b7cf627af 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -32,18 +32,35 @@ 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::paint(QPainter &p, const QRect &rect, double scale,
+void AnalogSignal::set_scale(float scale)
+{
+       _scale = 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 +76,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,
+                       y - samples[sample - start_sample] * _scale);
        }
 
+       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