X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=64633717fb4b8098637901813421df24f83c3d30;hb=39a9065fa0b4fab83190b3bb468d0fdf7546197e;hp=681386ff6b91f9c69e4f1a84f350b08675551b43;hpb=01fd32630269c1cfb99eb2b0d6060d7d19a42475;p=pulseview.git

diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp
index 681386ff..64633717 100644
--- a/pv/view/analogsignal.cpp
+++ b/pv/view/analogsignal.cpp
@@ -42,7 +42,7 @@ 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, sr_probe *const probe,
 	shared_ptr<data::Analog> data) :
 	Signal(session, probe),
 	_data(data),
@@ -55,11 +55,9 @@ AnalogSignal::~AnalogSignal()
 {
 }
 
-const list<QAction*> AnalogSignal::get_context_bar_actions()
+boost::shared_ptr<pv::data::SignalData> AnalogSignal::data() const
 {
-	list<QAction*> actions;
-	actions.push_back(_name_action);
-	return actions;
+	return _data;
 }
 
 void AnalogSignal::set_scale(float scale)
@@ -67,7 +65,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 (_probe->enabled)
+		paint_axis(p, get_y(), left, right);
+}
+
+void AnalogSignal::paint_mid(QPainter &p, int left, int right)
 {
 	assert(_data);
 	assert(right >= left);
@@ -83,8 +87,6 @@ void AnalogSignal::paint(QPainter &p, int left, int right)
 	if (!_probe->enabled)
 		return;
 
-	paint_axis(p, y, left, right);
-
 	const deque< shared_ptr<pv::data::AnalogSnapshot> > &snapshots =
 		_data->get_snapshots();
 	if (snapshots.empty())
@@ -94,7 +96,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;