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

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 681386f..e3f51aa 100644
--- 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,24 +45,27 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
-AnalogSignal::AnalogSignal(pv::SigSession &session, const 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()
 {
 }
 
-const list<QAction*> AnalogSignal::get_context_bar_actions()
+shared_ptr<pv::data::SignalData> AnalogSignal::data() const
 {
-	list<QAction*> actions;
-	actions.push_back(_name_action);
-	return actions;
+	return _data;
+}
+
+shared_ptr<pv::data::Analog> AnalogSignal::analog_data() const
+{
+	return _data;
 }
 
 void AnalogSignal::set_scale(float scale)
@@ -67,7 +73,13 @@ void AnalogSignal::set_scale(float scale)
 	_scale = scale;
 }
 
-void AnalogSignal::paint(QPainter &p, int left, int right)
+void AnalogSignal::paint_back(QPainter &p, int left, int right)
+{
+	if (_channel->enabled)
+		paint_axis(p, get_y(), left, right);
+}
+
+void AnalogSignal::paint_mid(QPainter &p, int left, int right)
 {
 	assert(_data);
 	assert(right >= left);
@@ -80,11 +92,9 @@ void AnalogSignal::paint(QPainter &p, int left, int right)
 
 	const double offset = _view->offset();
 
-	if (!_probe->enabled)
+	if (!_channel->enabled)
 		return;
 
-	paint_axis(p, y, left, right);
-
 	const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
 		_data->get_snapshots();
 	if (snapshots.empty())
@@ -94,7 +104,7 @@ void AnalogSignal::paint(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;
@@ -149,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;
@@ -158,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];