X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=a8d7b3e8113d6c514e9955fc9c897a65175977a3;hb=be9e7b4bb29b6594ec2b64442748ab135b684bf8;hp=6aeef98a57aa14f474e7b7d0fdcacbae8158a07a;hpb=ef8311a4296a2dc85c82b063de61efa4eb7a8404;p=pulseview.git

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 6aeef98..a8d7b3e 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -20,18 +20,29 @@
 
 #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::make_pair;
+using std::min;
+using std::shared_ptr;
+using std::deque;
+
+using sigrok::Channel;
 
 namespace pv {
 namespace view {
 
+const int AnalogSignal::NominalHeight = 80;
+
 const QColor AnalogSignal::SignalColours[4] = {
 	QColor(0xC4, 0xA0, 0x00),	// Yellow
 	QColor(0x87, 0x20, 0x7A),	// Magenta
@@ -41,24 +52,29 @@ 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()
 {
 }
 
-const list<QAction*> AnalogSignal::get_context_bar_actions()
+shared_ptr<pv::data::SignalData> AnalogSignal::data() const
+{
+	return _data;
+}
+
+shared_ptr<pv::data::Analog> AnalogSignal::analog_data() const
 {
-	list<QAction*> actions;
-	actions.push_back(_name_action);
-	return actions;
+	return _data;
 }
 
 void AnalogSignal::set_scale(float scale)
@@ -66,17 +82,35 @@ void AnalogSignal::set_scale(float scale)
 	_scale = scale;
 }
 
-void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
-	double offset)
+std::pair<int, int> AnalogSignal::v_extents() const
+{
+	return make_pair(-NominalHeight / 2, NominalHeight / 2);
+}
+
+void AnalogSignal::paint_back(QPainter &p, int left, int right)
+{
+	if (_channel->enabled())
+		paint_axis(p, get_visual_y(), left, right);
+}
+
+void AnalogSignal::paint_mid(QPainter &p, int left, int right)
 {
-	assert(scale > 0);
 	assert(_data);
 	assert(right >= left);
+	assert(_owner);
 
-	if (!_probe->enabled)
-		return;
+	const int y = get_visual_y();
+
+	const View *const view = _owner->view();
+	assert(view);
 
-	paint_axis(p, y, left, right);
+	const double scale = view->scale();
+	assert(scale > 0);
+
+	const double offset = view->offset();
+
+	if (!_channel->enabled())
+		return;
 
 	const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
 		_data->get_snapshots();
@@ -87,7 +121,7 @@ void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
 		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;
@@ -142,7 +176,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;
@@ -151,7 +184,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];