X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fview%2Fanalogsignal.cpp;h=64633717fb4b8098637901813421df24f83c3d30;hb=d7c0ca4a965c5f9cb2ae9aea584bb2547f4baca1;hp=a4474dac8e06a0026b40da41e53b15b3cc7e8bc9;hpb=fe08b6e8a85c80ae738757f7d85aa38ef7c4bdc3;p=pulseview.git diff --git a/pv/view/analogsignal.cpp b/pv/view/analogsignal.cpp index a4474dac..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) : 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) @@ -98,7 +96,7 @@ void AnalogSignal::paint_mid(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;