Explicitly set analog signal painting colour

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

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 73ab168685e28e531bb7aff9927afbddb1fa4df8..209512b595880d9be9e55aed4947935e89b5ae22 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -23,8 +23,8 @@
 #include <math.h>
 
 #include "analogsignal.h"
-#include "../analogdata.h"
-#include "../analogdatasnapshot.h"
+#include "pv/data/analog.h"
+#include "pv/data/analogsnapshot.h"
 
 using namespace boost;
 using namespace std;
@@ -32,21 +32,60 @@ using namespace std;
 namespace pv {
 namespace view {
 
-AnalogSignal::AnalogSignal(QString name, shared_ptr<AnalogData> data) :
+AnalogSignal::AnalogSignal(QString name, shared_ptr<data::Analog> data) :
        Signal(name),
        _data(data)
 {
        _colour = Qt::blue;
 }
 
-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);
 
-int AnalogSignal::get_nominal_offset(const QRect &rect) const
-{
-       return rect.bottom();
+       paint_axis(p, y, left, right);
+
+       const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
+               _data->get_snapshots();
+       if (snapshots.empty())
+               return;
+
+       const shared_ptr<pv::data::AnalogSnapshot> &snapshot =
+               snapshots.front();
+
+       const double pixels_offset = offset / scale;
+       const double samplerate = _data->get_samplerate();
+       const double start_time = _data->get_start_time();
+       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 * (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 float* samples = snapshot->get_samples();
+       assert(samples);
+
+       QPointF *points = new QPointF[end_sample - start_sample];
+       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);
+       }
+
+       p.setPen(_colour);
+       p.drawPoints(points, point - points);
+
+       delete[] points;
 }
 
 } // namespace view