X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=e3f51aabc6d787b00f10955432a1c53e73d5a179;hb=0715fb8c638b53ac25590841fcbf3a1da3546b68;hp=156af1003a4440ed527516123f22352aa9768029;hpb=f9abf97e78bc4825d80926b0ebc6cbaef40768b1;p=pulseview.git

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 156af100..e3f51aab 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -20,7 +20,8 @@
 
 #include <extdef.h>
 
-#include <math.h>
+#include <cassert>
+#include <cmath>
 
 #include "analogsignal.h"
 #include "pv/data/analog.h"
@@ -45,12 +46,12 @@ const QColor AnalogSignal::SignalColours[4] = {
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
 AnalogSignal::AnalogSignal(shared_ptr<pv::device::DevInst> dev_inst,
-	const sr_channel *const probe, shared_ptr<data::Analog> data) :
-	Signal(dev_inst, probe),
+	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()
@@ -74,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);
 }
 
@@ -91,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 =