Moved all sr_probe modification into pv::DevInst

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

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index e29930865f6601eccf8b43986db1f44f9523b090..a64cf70f430dc4fd7c8d8d47432c24f593aa63ed 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -25,9 +25,12 @@
 #include "analogsignal.h"
 #include "pv/data/analog.h"
 #include "pv/data/analogsnapshot.h"
+#include "pv/view/view.h"
 
-using namespace boost;
-using namespace std;
+using boost::shared_ptr;
+using std::max;
+using std::min;
+using std::deque;
 
 namespace pv {
 namespace view {
@@ -41,13 +44,27 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
-AnalogSignal::AnalogSignal(QString name, shared_ptr<data::Analog> data,
-       int probe_index) :
-       Signal(name),
+AnalogSignal::AnalogSignal(shared_ptr<pv::DevInst> dev_inst,
+       const sr_probe *const probe, shared_ptr<data::Analog> data) :
+       Signal(dev_inst, probe),
        _data(data),
        _scale(1.0f)
 {
-       _colour = SignalColours[probe_index % countof(SignalColours)];
+       _colour = SignalColours[probe->index % countof(SignalColours)];
+}
+
+AnalogSignal::~AnalogSignal()
+{
+}
+
+shared_ptr<pv::data::SignalData> AnalogSignal::data() const
+{
+       return _data;
+}
+
+shared_ptr<pv::data::Analog> AnalogSignal::analog_data() const
+{
+       return _data;
 }
 
 void AnalogSignal::set_scale(float scale)
@@ -55,14 +72,27 @@ void AnalogSignal::set_scale(float scale)
        _scale = scale;
 }
 
-void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
-       double offset)
+void AnalogSignal::paint_back(QPainter &p, int left, int right)
+{
+       if (_probe->enabled)
+               paint_axis(p, get_y(), left, right);
+}
+
+void AnalogSignal::paint_mid(QPainter &p, int left, int right)
 {
-       assert(scale > 0);
        assert(_data);
        assert(right >= left);
 
-       paint_axis(p, y, left, right);
+       assert(_view);
+       const int y = _v_offset - _view->v_offset();
+
+       const double scale = _view->scale();
+       assert(scale > 0);
+
+       const double offset = _view->offset();
+
+       if (!_probe->enabled)
+               return;
 
        const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
                _data->get_snapshots();
@@ -73,7 +103,7 @@ void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
                snapshots.front();
 
        const double pixels_offset = offset / scale;
-       const double samplerate = _data->get_samplerate();
+       const double samplerate = _data->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;
@@ -82,7 +112,7 @@ void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
 
        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),
+       const int64_t end_sample = min(max((int64_t)ceil(end) + 1,
                (int64_t)0), last_sample);
 
        if (samples_per_pixel < EnvelopeThreshold)
@@ -117,7 +147,7 @@ void AnalogSignal::paint_trace(QPainter &p,
                        y - samples[sample - start] * _scale);
        }
 
-       p.drawPoints(points, point - points);
+       p.drawPolyline(points, point - points);
 
        delete[] samples;
        delete[] points;
@@ -128,7 +158,6 @@ void AnalogSignal::paint_envelope(QPainter &p,
        int y, int left, const int64_t start, const int64_t end,
        const double pixels_offset, const double samples_per_pixel)
 {
-       using namespace Qt;
        using pv::data::AnalogSnapshot;
 
        AnalogSnapshot::EnvelopeSection e;
@@ -137,7 +166,7 @@ void AnalogSignal::paint_envelope(QPainter &p,
        if (e.length < 2)
                return;
 
-       p.setPen(QPen(NoPen));
+       p.setPen(QPen(Qt::NoPen));
        p.setBrush(_colour);
 
        QRectF *const rects = new QRectF[e.length];