Added missing includes and defintions

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

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 6aeef98a57aa14f474e7b7d0fdcacbae8158a07a..4304fd1e5a9bfd7ec61fcf3e3a9c24594086fed0 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -25,6 +25,7 @@
 #include "analogsignal.h"
 #include "pv/data/analog.h"
 #include "pv/data/analogsnapshot.h"
+#include "pv/view/view.h"
 
 using namespace boost;
 using namespace std;
@@ -41,7 +42,7 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
-AnalogSignal::AnalogSignal(pv::SigSession &session, const sr_probe *const probe,
+AnalogSignal::AnalogSignal(pv::SigSession &session, sr_probe *const probe,
        shared_ptr<data::Analog> data) :
        Signal(session, probe),
        _data(data),
@@ -54,30 +55,33 @@ AnalogSignal::~AnalogSignal()
 {
 }
 
-const list<QAction*> AnalogSignal::get_context_bar_actions()
+void AnalogSignal::set_scale(float scale)
 {
-       list<QAction*> actions;
-       actions.push_back(_name_action);
-       return actions;
+       _scale = scale;
 }
 
-void AnalogSignal::set_scale(float scale)
+void AnalogSignal::paint_back(QPainter &p, int left, int right)
 {
-       _scale = scale;
+       if (_probe->enabled)
+               paint_axis(p, get_y(), left, right);
 }
 
-void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
-       double offset)
+void AnalogSignal::paint_mid(QPainter &p, int left, int right)
 {
-       assert(scale > 0);
        assert(_data);
        assert(right >= left);
 
+       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;
 
-       paint_axis(p, y, left, right);
-
        const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
                _data->get_snapshots();
        if (snapshots.empty())