SigSession: Added signals_mutex(), and made signals() give a reference

[pulseview.git] / pv / view / decodetrace.cpp

diff --git a/pv/view/decodetrace.cpp b/pv/view/decodetrace.cpp
index fb4b7c29844fa5be0cc35b23fd45db6f50d8ea45..138ba0a14263fc92e0ce09cb74232f227d0b0c22 100644 (file)
--- a/pv/view/decodetrace.cpp
+++ b/pv/view/decodetrace.cpp
@@ -22,8 +22,12 @@ extern "C" {
 #include <libsigrokdecode/libsigrokdecode.h>
 }
 
+#include <mutex>
+
 #include <extdef.h>
 
+#include <tuple>
+
 #include <boost/functional/hash.hpp>
 
 #include <QAction>
@@ -51,12 +55,15 @@ extern "C" {
 
 using std::dynamic_pointer_cast;
 using std::list;
+using std::lock_guard;
 using std::make_pair;
 using std::max;
 using std::map;
 using std::min;
+using std::mutex;
 using std::pair;
 using std::shared_ptr;
+using std::tie;
 using std::vector;
 
 namespace pv {
@@ -147,12 +154,6 @@ const std::shared_ptr<pv::data::DecoderStack>& DecodeTrace::decoder() const
        return _decoder_stack;
 }
 
-void DecodeTrace::set_view(pv::view::View *view)
-{
-       assert(view);
-       Trace::set_view(view);
-}
-
 void DecodeTrace::paint_back(QPainter &p, int left, int right)
 {
        Trace::paint_back(p, left, right);
@@ -178,7 +179,6 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right)
        }
 
        // Iterate through the rows
-       assert(_view);
        int y = get_y();
        pair<uint64_t, uint64_t> sample_range = get_sample_range(left, right);
 
@@ -328,8 +328,9 @@ void DecodeTrace::draw_annotation(const pv::data::decode::Annotation &a,
        QPainter &p, QColor text_color, int h, int left, int right, int y,
        size_t base_colour) const
 {
-       const double samples_per_pixel = get_samples_per_pixel();
-       const double pixels_offset = get_pixels_offset();
+       double samples_per_pixel, pixels_offset;
+       tie(pixels_offset, samples_per_pixel) =
+               get_pixels_offset_samples_per_pixel();
 
        const double start = a.start_sample() / samples_per_pixel -
                pixels_offset;
@@ -454,6 +455,8 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left,
        using namespace pv::data;
        using pv::data::decode::Decoder;
 
+       double samples_per_pixel, pixels_offset;
+
        assert(_decoder_stack); 
 
        shared_ptr<Logic> data;
@@ -486,8 +489,8 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left,
 
        const int y = get_y();
 
-       const double samples_per_pixel = get_samples_per_pixel();
-       const double pixels_offset = get_pixels_offset();
+       tie(pixels_offset, samples_per_pixel) =
+               get_pixels_offset_samples_per_pixel();
 
        const double start = max(samples_decoded /
                samples_per_pixel - pixels_offset, left - 1.0);
@@ -504,39 +507,35 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left,
        p.drawRect(no_decode_rect);
 }
 
-double DecodeTrace::get_pixels_offset() const
+pair<double, double> DecodeTrace::get_pixels_offset_samples_per_pixel() const
 {
-       assert(_view);
+       assert(_owner);
        assert(_decoder_stack);
 
-       const double scale = _view->scale();
-       assert(scale > 0);
-
-       return (_view->offset() - _decoder_stack->get_start_time()) / scale;
-}
-
-double DecodeTrace::get_samples_per_pixel() const
-{
-       assert(_view);
-       assert(_decoder_stack);
+       const View *view = _owner->view();
+       assert(view);
 
-       const double scale = _view->scale();
+       const double scale = view->scale();
        assert(scale > 0);
 
+       const double pixels_offset =
+               (view->offset() - _decoder_stack->get_start_time()) / scale;
+
        double samplerate = _decoder_stack->samplerate();
 
        // Show sample rate as 1Hz when it is unknown
        if (samplerate == 0.0)
                samplerate = 1.0;
 
-       return samplerate * scale;
+       return make_pair(pixels_offset, samplerate * scale);
 }
 
 pair<uint64_t, uint64_t> DecodeTrace::get_sample_range(
        int x_start, int x_end) const
 {
-       const double samples_per_pixel = get_samples_per_pixel();
-       const double pixels_offset = get_pixels_offset();
+       double samples_per_pixel, pixels_offset;
+       tie(pixels_offset, samples_per_pixel) =
+               get_pixels_offset_samples_per_pixel();
 
        const uint64_t start = (uint64_t)max(
                (x_start + pixels_offset) * samples_per_pixel, 0.0);
@@ -588,10 +587,15 @@ void DecodeTrace::hide_hover_annotation()
 
 void DecodeTrace::hover_point_changed()
 {
-       QPoint hp = _view->hover_point();
+       assert(_owner);
+
+       const View *const view = _owner->view();
+       assert(view);
+
+       QPoint hp = view->hover_point();
        QString ann = get_annotation_at_point(hp);
 
-       assert(_view);
+       assert(view);
        assert(_row_height);
 
        if (ann.isEmpty()) {
@@ -617,7 +621,7 @@ void DecodeTrace::hover_point_changed()
        hp.setY(get_y() - (_row_height / 2) + (hover_row * _row_height)
                - _row_height - text_size.height());
 
-       QToolTip::showText(_view->viewport()->mapToGlobal(hp), ann);
+       QToolTip::showText(view->viewport()->mapToGlobal(hp), ann);
 }
 
 void DecodeTrace::create_decoder_form(int index,
@@ -692,7 +696,8 @@ QComboBox* DecodeTrace::create_channel_selector(
 {
        assert(dec);
 
-       const vector< shared_ptr<Signal> > sigs = _session.get_signals();
+       lock_guard<mutex> lock(_session.signals_mutex());
+       const vector< shared_ptr<Signal> > &sigs(_session.signals());
 
        assert(_decoder_stack);
        const auto channel_iter = dec->channels().find(pdch);
@@ -710,7 +715,7 @@ QComboBox* DecodeTrace::create_channel_selector(
 
                if (dynamic_pointer_cast<LogicSignal>(s) && s->enabled())
                {
-                       selector->addItem(s->get_name(),
+                       selector->addItem(s->name(),
                                qVariantFromValue((void*)s.get()));
                        if ((*channel_iter).second == s)
                                selector->setCurrentIndex(i + 1);
@@ -725,7 +730,9 @@ void DecodeTrace::commit_decoder_channels(shared_ptr<data::decode::Decoder> &dec
        assert(dec);
 
        map<const srd_channel*, shared_ptr<LogicSignal> > channel_map;
-       const vector< shared_ptr<Signal> > sigs = _session.get_signals();
+
+       lock_guard<mutex> lock(_session.signals_mutex());
+       const vector< shared_ptr<Signal> > &sigs(_session.signals());
 
        for (const ChannelSelector &s : _channel_selectors)
        {
@@ -758,8 +765,8 @@ void DecodeTrace::commit_channels()
 
 void DecodeTrace::on_new_decode_data()
 {
-       if (_view)
-               _view->update_viewport();
+       if (_owner)
+               _owner->update_viewport();
 }
 
 void DecodeTrace::delete_pressed()
@@ -818,7 +825,7 @@ void DecodeTrace::on_show_hide_decoder(int index)
        assert(index < (int)_decoder_forms.size());
        _decoder_forms[index]->set_decoder_visible(show);
 
-       _view->update_viewport();
+       _owner->update_viewport();
 }
 
 } // namespace view