X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=eaa25bccc947dac826d5bddf2eff50ec2fcdd325;hb=eae6e30af53f6b3e42dc5be212c82870078276b0;hp=53af2643132ee895c65e5bd8df10e4bc655a3061;hpb=03ce95a9bb81c05bae0da9de189d280214db67c3;p=pulseview.git

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 53af264..eaa25bc 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -20,15 +20,22 @@
 
 #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;
+#include <libsigrok/libsigrok.hpp>
+
+using std::max;
+using std::min;
+using std::shared_ptr;
+using std::deque;
+
+using sigrok::Channel;
 
 namespace pv {
 namespace view {
@@ -42,19 +49,31 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
-AnalogSignal::AnalogSignal(pv::SigSession &session, const sr_probe *const probe,
+AnalogSignal::AnalogSignal(
+	pv::SigSession &session,
+	shared_ptr<Channel> channel,
 	shared_ptr<data::Analog> data) :
-	Signal(session, probe),
+	Signal(session, channel),
 	_data(data),
 	_scale(1.0f)
 {
-	_colour = SignalColours[probe->index % countof(SignalColours)];
+	_colour = SignalColours[_channel->index() % countof(SignalColours)];
 }
 
 AnalogSignal::~AnalogSignal()
 {
 }
 
+shared_ptr<pv::data::SignalData> AnalogSignal::data() const
+{
+	return _data;
+}
+
+shared_ptr<pv::data::Analog> AnalogSignal::analog_data() const
+{
+	return _data;
+}
+
 void AnalogSignal::set_scale(float scale)
 {
 	_scale = scale;
@@ -62,7 +81,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);
 }
 
@@ -70,16 +89,19 @@ void AnalogSignal::paint_mid(QPainter &p, int left, int right)
 {
 	assert(_data);
 	assert(right >= left);
+	assert(_owner);
+
+	const int y = get_y();
 
-	assert(_view);
-	const int y = _v_offset - _view->v_offset();
+	const View *const view = _owner->view();
+	assert(view);
 
-	const double scale = _view->scale();
+	const double scale = view->scale();
 	assert(scale > 0);
 
-	const double offset = _view->offset();
+	const double offset = view->offset();
 
-	if (!_probe->enabled)
+	if (!_channel->enabled())
 		return;
 
 	const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
@@ -91,7 +113,7 @@ void AnalogSignal::paint_mid(QPainter &p, int left, int right)
 		snapshots.front();
 
 	const double pixels_offset = offset / scale;
-	const double samplerate = _data->get_samplerate();
+	const double samplerate = _data->samplerate();
 	const double start_time = _data->get_start_time();
 	const int64_t last_sample = snapshot->get_sample_count() - 1;
 	const double samples_per_pixel = samplerate * scale;
@@ -146,7 +168,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;
@@ -155,7 +176,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];