Rename 'probe' to 'channel' everywhere.

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

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 64633717fb4b8098637901813421df24f83c3d30..e3f51aabc6d787b00f10955432a1c53e73d5a179 100644 (file)
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -20,15 +20,18 @@
 
 #include <extdef.h>
 
-#include <math.h>
+#include <cassert>
+#include <cmath>
 
 #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 std::max;
+using std::min;
+using std::shared_ptr;
+using std::deque;
 
 namespace pv {
 namespace view {
@@ -42,20 +45,25 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
-AnalogSignal::AnalogSignal(pv::SigSession &session, sr_probe *const probe,
-       shared_ptr<data::Analog> data) :
-       Signal(session, probe),
+AnalogSignal::AnalogSignal(shared_ptr<pv::device::DevInst> dev_inst,
+       const sr_channel *const channel, shared_ptr<data::Analog> data) :
+       Signal(dev_inst, channel),
        _data(data),
        _scale(1.0f)
 {
-       _colour = SignalColours[probe->index % countof(SignalColours)];
+       _colour = SignalColours[channel->index % countof(SignalColours)];
 }
 
 AnalogSignal::~AnalogSignal()
 {
 }
 
-boost::shared_ptr<pv::data::SignalData> AnalogSignal::data() const
+shared_ptr<pv::data::SignalData> AnalogSignal::data() const
+{
+       return _data;
+}
+
+shared_ptr<pv::data::Analog> AnalogSignal::analog_data() const
 {
        return _data;
 }
@@ -67,7 +75,7 @@ void AnalogSignal::set_scale(float scale)
 
 void AnalogSignal::paint_back(QPainter &p, int left, int right)
 {
-       if (_probe->enabled)
+       if (_channel->enabled)
                paint_axis(p, get_y(), left, right);
 }
 
@@ -84,7 +92,7 @@ void AnalogSignal::paint_mid(QPainter &p, int left, int right)
 
        const double offset = _view->offset();
 
-       if (!_probe->enabled)
+       if (!_channel->enabled)
                return;
 
        const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
@@ -151,7 +159,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;
@@ -160,7 +167,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];