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

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 251a0ff..681386f 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -25,6 +25,7 @@
 #include "analogsignal.h"
 #include "pv/data/analog.h"
 #include "pv/data/analogsnapshot.h"
+#include "pv/view/view.h"
 
 using namespace boost;
 using namespace std;
@@ -41,13 +42,24 @@ const QColor AnalogSignal::SignalColours[4] = {
 
 const float AnalogSignal::EnvelopeThreshold = 256.0f;
 
-AnalogSignal::AnalogSignal(QString name, shared_ptr<data::Analog> data,
-	int probe_index) :
-	Signal(name),
+AnalogSignal::AnalogSignal(pv::SigSession &session, const sr_probe *const probe,
+	shared_ptr<data::Analog> data) :
+	Signal(session, probe),
 	_data(data),
 	_scale(1.0f)
 {
-	_colour = SignalColours[probe_index % countof(SignalColours)];
+	_colour = SignalColours[probe->index % countof(SignalColours)];
+}
+
+AnalogSignal::~AnalogSignal()
+{
+}
+
+const list<QAction*> AnalogSignal::get_context_bar_actions()
+{
+	list<QAction*> actions;
+	actions.push_back(_name_action);
+	return actions;
 }
 
 void AnalogSignal::set_scale(float scale)
@@ -55,13 +67,22 @@ void AnalogSignal::set_scale(float scale)
 	_scale = scale;
 }
 
-void AnalogSignal::paint(QPainter &p, int y, int left, int right, double scale,
-	double offset)
+void AnalogSignal::paint(QPainter &p, int left, int right)
 {
-	assert(scale > 0);
 	assert(_data);
 	assert(right >= left);
 
+	assert(_view);
+	const int y = _v_offset - _view->v_offset();
+
+	const double scale = _view->scale();
+	assert(scale > 0);
+
+	const double offset = _view->offset();
+
+	if (!_probe->enabled)
+		return;
+
 	paint_axis(p, y, left, right);
 
 	const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =