X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=7b49bbd2b7d454606d2ac5d51e482a331ca1b01c;hb=e8d009288de28cb194bc7964f96677c2baf900c9;hp=292d5f9e55809c0cf755af8ace4b141abdd7678c;hpb=83c23cc9fa0d4501d9e6b8759251fa6337f5d491;p=pulseview.git

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 292d5f9e..7b49bbd2 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -20,18 +20,23 @@
 
 #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 boost::shared_ptr;
+#include <libsigrok/libsigrok.hpp>
+
 using std::max;
 using std::min;
+using std::shared_ptr;
 using std::deque;
 
+using sigrok::Channel;
+
 namespace pv {
 namespace view {
 
@@ -44,13 +49,13 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
-AnalogSignal::AnalogSignal(shared_ptr<pv::DevInst> dev_inst,
-	sr_probe *const probe, shared_ptr<data::Analog> data) :
-	Signal(dev_inst, probe),
+AnalogSignal::AnalogSignal(shared_ptr<Channel> channel,
+	shared_ptr<data::Analog> data) :
+	Signal(channel),
 	_data(data),
 	_scale(1.0f)
 {
-	_colour = SignalColours[probe->index % countof(SignalColours)];
+	_colour = SignalColours[_channel->index() % countof(SignalColours)];
 }
 
 AnalogSignal::~AnalogSignal()
@@ -74,7 +79,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);
 }
 
@@ -91,7 +96,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 =