X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=e3f51aabc6d787b00f10955432a1c53e73d5a179;hb=6ac6242b25cfbd4df14abe7580adc9d0f4cffe43;hp=84e55cc3b6e0a2f9c48b1554395f69d8c9490606;hpb=8d3e0764def48fdf19dc9100c87bbb42da5a9d6d;p=pulseview.git

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 84e55cc..e3f51aa 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -20,16 +20,17 @@
 
 #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;
 using std::max;
 using std::min;
+using std::shared_ptr;
 using std::deque;
 
 namespace pv {
@@ -44,14 +45,13 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
-AnalogSignal::AnalogSignal(pv::SigSession &session,
-	shared_ptr<pv::DevInst> dev_inst, sr_probe *const probe,
-	shared_ptr<data::Analog> data) :
-	Signal(session, dev_inst, 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()
@@ -75,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);
 }
 
@@ -92,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 =