Removed context bar

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

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index e29930865f6601eccf8b43986db1f44f9523b090..53af2643132ee895c65e5bd8df10e4bc655a3061 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 "analogsignal.h"
 #include "pv/data/analog.h"
 #include "pv/data/analogsnapshot.h"

+#include "pv/view/view.h"

 
 using namespace boost;
 using namespace std;
 
 using namespace boost;
 using namespace std;


@@ -41,13 +42,17 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 

-AnalogSignal::AnalogSignal(QString name, shared_ptr<data::Analog> data,
-       int probe_index) :
-       Signal(name),
+AnalogSignal::AnalogSignal(pv::SigSession &session, const sr_probe *const probe,
+       shared_ptr<data::Analog> data) :
+       Signal(session, probe),

        _data(data),
        _scale(1.0f)
 {
        _data(data),
        _scale(1.0f)
 {

-       _colour = SignalColours[probe_index % countof(SignalColours)];
+       _colour = SignalColours[probe->index % countof(SignalColours)];
+}
+
+AnalogSignal::~AnalogSignal()
+{

 }
 
 void AnalogSignal::set_scale(float scale)
 }
 
 void AnalogSignal::set_scale(float scale)


@@ -55,14 +60,27 @@ void AnalogSignal::set_scale(float scale)
        _scale = 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);
 
        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();
 
        const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
                _data->get_snapshots();


@@ -82,7 +100,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 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)
                (int64_t)0), last_sample);
 
        if (samples_per_pixel < EnvelopeThreshold)


@@ -117,7 +135,7 @@ void AnalogSignal::paint_trace(QPainter &p,
                        y - samples[sample - start] * _scale);
        }
 
                        y - samples[sample - start] * _scale);
        }
 

-       p.drawPoints(points, point - points);
+       p.drawPolyline(points, point - points);

 
        delete[] samples;
        delete[] points;
 
        delete[] samples;
        delete[] points;