]> sigrok.org Git - pulseview.git/blobdiff - pv/view/decodetrace.cpp
RowItem: Split appart visual and layout v offsets
[pulseview.git] / pv / view / decodetrace.cpp
index 5b1999cc9f671c37c9b3e18c559b0a049b053318..5ca665e0dff947f17ebbcbd0a5a77aa8802d1b98 100644 (file)
@@ -22,8 +22,12 @@ extern "C" {
 #include <libsigrokdecode/libsigrokdecode.h>
 }
 
+#include <mutex>
+
 #include <extdef.h>
 
+#include <tuple>
+
 #include <boost/functional/hash.hpp>
 
 #include <QAction>
@@ -45,17 +49,23 @@ extern "C" {
 #include <pv/data/decode/annotation.h>
 #include <pv/view/logicsignal.h>
 #include <pv/view/view.h>
+#include <pv/view/viewport.h>
 #include <pv/widgets/decodergroupbox.h>
 #include <pv/widgets/decodermenu.h>
 
+using boost::shared_lock;
+using boost::shared_mutex;
 using std::dynamic_pointer_cast;
 using std::list;
+using std::lock_guard;
 using std::make_pair;
 using std::max;
+using std::make_pair;
 using std::map;
 using std::min;
 using std::pair;
 using std::shared_ptr;
+using std::tie;
 using std::vector;
 
 namespace pv {
@@ -146,16 +156,20 @@ const std::shared_ptr<pv::data::DecoderStack>& DecodeTrace::decoder() const
        return _decoder_stack;
 }
 
-void DecodeTrace::set_view(pv::view::View *view)
+pair<int, int> DecodeTrace::v_extents() const
 {
-       assert(view);
-       Trace::set_view(view);
+       /// @todo Replace this with an implementation that knows the true
+       /// height of the trace
+       QFontMetrics m(QApplication::font());
+       const int text_height =  m.boundingRect(QRect(), 0, "Tg").height();
+       const int row_height = (text_height * 6) / 4;
+       return make_pair(-row_height / 2, row_height * 7 / 2);
 }
 
 void DecodeTrace::paint_back(QPainter &p, int left, int right)
 {
        Trace::paint_back(p, left, right);
-       paint_axis(p, get_y(), left, right);
+       paint_axis(p, get_visual_y(), left, right);
 }
 
 void DecodeTrace::paint_mid(QPainter &p, int left, int right)
@@ -177,14 +191,13 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right)
        }
 
        // Iterate through the rows
-       assert(_view);
-       int y = get_y();
+       int y = get_visual_y();
        pair<uint64_t, uint64_t> sample_range = get_sample_range(left, right);
 
        assert(_decoder_stack);
        const vector<Row> rows(_decoder_stack->get_visible_rows());
 
-       _cur_row_headings.clear();
+       _visible_rows.clear();
        for (size_t i = 0; i < rows.size(); i++)
        {
                const Row &row = rows[i];
@@ -205,7 +218,7 @@ void DecodeTrace::paint_mid(QPainter &p, int left, int right)
                                        base_colour);
                        y += _row_height;
 
-                       _cur_row_headings.push_back(row.title());
+                       _visible_rows.push_back(rows[i]);
                }
        }
 
@@ -221,9 +234,9 @@ void DecodeTrace::paint_fore(QPainter &p, int left, int right)
 
        assert(_row_height);
 
-       for (size_t i = 0; i < _cur_row_headings.size(); i++)
+       for (size_t i = 0; i < _visible_rows.size(); i++)
        {
-               const int y = i * _row_height + get_y();
+               const int y = i * _row_height + get_visual_y();
 
                p.setPen(QPen(Qt::NoPen));
                p.setBrush(QApplication::palette().brush(QPalette::WindowText));
@@ -240,7 +253,7 @@ void DecodeTrace::paint_fore(QPainter &p, int left, int right)
 
                const QRect r(left + ArrowSize * 2, y - _row_height / 2,
                        right - left, _row_height);
-               const QString h(_cur_row_headings[i]);
+               const QString h(_visible_rows[i].title());
                const int f = Qt::AlignLeft | Qt::AlignVCenter |
                        Qt::TextDontClip;
 
@@ -327,8 +340,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;
@@ -429,7 +443,7 @@ void DecodeTrace::draw_range(const pv::data::decode::Annotation &a, QPainter &p,
 void DecodeTrace::draw_error(QPainter &p, const QString &message,
        int left, int right)
 {
-       const int y = get_y();
+       const int y = get_visual_y();
 
        p.setPen(ErrorBgColour.darker());
        p.setBrush(ErrorBgColour);
@@ -453,6 +467,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;
@@ -483,10 +499,10 @@ void DecodeTrace::draw_unresolved_period(QPainter &p, int h, int left,
        if (sample_count == samples_decoded)
                return;
 
-       const int y = get_y();
+       const int y = get_visual_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);
@@ -503,129 +519,80 @@ 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
+pair<uint64_t, uint64_t> DecodeTrace::get_sample_range(
+       int x_start, int x_end) const
 {
-       assert(_view);
-       assert(_decoder_stack);
+       double samples_per_pixel, pixels_offset;
+       tie(pixels_offset, samples_per_pixel) =
+               get_pixels_offset_samples_per_pixel();
 
-       const double samples_per_pixel = get_samples_per_pixel();
-       const double pixels_offset = get_pixels_offset();
-
-       uint64_t start, end;
-
-       start = (uint64_t)max((x_start + pixels_offset) * samples_per_pixel, 0.0);
-       end = (uint64_t)max((x_end + pixels_offset) * samples_per_pixel, 0.0);
+       const uint64_t start = (uint64_t)max(
+               (x_start + pixels_offset) * samples_per_pixel, 0.0);
+       const uint64_t end = (uint64_t)max(
+               (x_end + pixels_offset) * samples_per_pixel, 0.0);
 
        return make_pair(start, end);
 }
 
-bool DecodeTrace::hover_point_is_over_trace()
+int DecodeTrace::get_row_at_point(const QPoint &point)
 {
-       assert(_view);
-       assert(_row_height);
-
-       // Note: if _row_height is valid then _cur_row_headings is valid, too,
-       // as both are set in paint_mid().
+       if (!_row_height)
+               return -1;
 
-       // Note: hp.x will be 0 if the cursor is above the header area,
-       // so we set trace.left to 1 to exclude this.
+       const int row = (point.y() - get_visual_y() + _row_height / 2) /
+               _row_height;
+       if (row < 0 || row >= (int)_visible_rows.size())
+               return -1;
 
-       QRect trace(1, get_y() - (_row_height/2),
-               _view->width(), _row_height * _cur_row_headings.size());
-
-       // Note: We don't need to check for _row_height being 0 here but
-       // we do it anyway to be more robust.
-
-       return _row_height && enabled() && trace.contains(_view->hover_point());
+       return row;
 }
 
-int DecodeTrace::get_row_at_hover_point()
-{
-       assert(_view);
-       assert(_row_height);
-       assert(_decoder_stack);
-
-       QPoint hp = _view->hover_point();
-       int hover_row = (hp.y() - get_y() + (_row_height/2)) / _row_height;
-
-       const vector<pv::data::decode::Row> rows(_decoder_stack->get_visible_rows());
-
-       return min(hover_row, (int)rows.size() - 1);
-}
-
-const QString DecodeTrace::get_annotation_at_hover_point()
+const QString DecodeTrace::get_annotation_at_point(const QPoint &point)
 {
        using namespace pv::data::decode;
 
-       assert(_view);
-       QPoint hp = _view->hover_point();
+       if (!enabled())
+               return QString();
 
-       pair<uint64_t, uint64_t> sample_range = get_sample_range(hp.x(), hp.x() + 1);
-
-       assert(_decoder_stack);
-       const vector<pv::data::decode::Row> rows(_decoder_stack->get_visible_rows());
-
-       const int hover_row = get_row_at_hover_point();
+       const pair<uint64_t, uint64_t> sample_range =
+               get_sample_range(point.x(), point.x() + 1);
+       const int row = get_row_at_point(point);
+       if (row < 0)
+               return QString();
 
        vector<pv::data::decode::Annotation> annotations;
 
-       _decoder_stack->get_annotation_subset(annotations, rows[hover_row],
+       assert(_decoder_stack);
+       _decoder_stack->get_annotation_subset(annotations, _visible_rows[row],
                sample_range.first, sample_range.second);
 
        return (annotations.empty()) ?
                QString() : annotations[0].annotations().front();
 }
 
-void DecodeTrace::show_hover_annotation()
-{
-       QString ann = get_annotation_at_hover_point();
-
-       assert(_view);
-       assert(_row_height);
-       assert(_text_height);
-
-       if (!ann.isEmpty()) {
-               const int hover_row = get_row_at_hover_point();
-
-               // Make sure the tool tip doesn't overlap with the mouse cursor.
-               // If it did, the tool tip would constantly hide and re-appear.
-               QPoint hp = _view->hover_point();
-               hp.setY(get_y() - (_row_height/2) +
-                       (hover_row * _row_height) - _text_height);
-
-               QToolTip::showText(_view->mapToGlobal(hp), ann);
-       } else
-               hide_hover_annotation();
-}
-
 void DecodeTrace::hide_hover_annotation()
 {
        QToolTip::hideText();
@@ -633,10 +600,42 @@ void DecodeTrace::hide_hover_annotation()
 
 void DecodeTrace::hover_point_changed()
 {
-       if (hover_point_is_over_trace())
-               show_hover_annotation();
-       else
+       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(_row_height);
+
+       if (ann.isEmpty()) {
                hide_hover_annotation();
+               return;
+       }
+
+       const int hover_row = get_row_at_point(hp);
+
+       QFontMetrics m(QToolTip::font());
+       const QRect text_size = m.boundingRect(QRect(), 0, ann);
+
+       // This is OS-specific and unfortunately we can't query it, so
+       // use an approximation to at least try to minimize the error.
+       const int padding = 8;
+
+       // Make sure the tool tip doesn't overlap with the mouse cursor.
+       // If it did, the tool tip would constantly hide and re-appear.
+       // We also push it up by one row so that it appears above the
+       // decode trace, not below.
+       hp.setX(hp.x() - (text_size.width() / 2) - padding);
+
+       hp.setY(get_visual_y() - (_row_height / 2) +
+               (hover_row * _row_height) -
+               _row_height - text_size.height());
+
+       QToolTip::showText(view->viewport()->mapToGlobal(hp), ann);
 }
 
 void DecodeTrace::create_decoder_form(int index,
@@ -711,7 +710,8 @@ QComboBox* DecodeTrace::create_channel_selector(
 {
        assert(dec);
 
-       const vector< shared_ptr<Signal> > sigs = _session.get_signals();
+       shared_lock<shared_mutex> lock(_session.signals_mutex());
+       const vector< shared_ptr<Signal> > &sigs(_session.signals());
 
        assert(_decoder_stack);
        const auto channel_iter = dec->channels().find(pdch);
@@ -729,7 +729,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);
@@ -744,7 +744,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();
+
+       shared_lock<shared_mutex> lock(_session.signals_mutex());
+       const vector< shared_ptr<Signal> > &sigs(_session.signals());
 
        for (const ChannelSelector &s : _channel_selectors)
        {
@@ -777,8 +779,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()
@@ -837,7 +839,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