X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=bcd0f20020a2d326b7b1be314fe97838909acbcc;hb=9a0cd293620ae082a46ee5f2e53bf700301f9c87;hp=681386ff6b91f9c69e4f1a84f350b08675551b43;hpb=01fd32630269c1cfb99eb2b0d6060d7d19a42475;p=pulseview.git diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp index 681386ff..bcd0f200 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) : Signal(session, probe), _data(data), @@ -55,11 +55,9 @@ AnalogSignal::~AnalogSignal() { } -const list AnalogSignal::get_context_bar_actions() +boost::shared_ptr AnalogSignal::data() const { - list 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 > &snapshots = _data->get_snapshots(); if (snapshots.empty())