X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=37c3b14a1380f45994648099944625b8f4295c21;hp=af0892b81d1fb4d85003b179ce38f99d72369676;hb=a5d93c27b5bd6b95000e29c6cddac56ab254b289;hpb=33c62f44b72abab27bc141d66712ff0d1a2e395f diff --git a/pv/view/view.cpp b/pv/view/view.cpp index af0892b8..37c3b14a 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -22,9 +22,10 @@ #include #endif -#include -#include -#include +#include +#include +#include +#include #include #include @@ -42,9 +43,13 @@ #include "pv/data/logic.h" #include "pv/data/logicsnapshot.h" +using boost::shared_lock; +using boost::shared_mutex; using pv::data::SignalData; +using std::back_inserter; using std::deque; using std::list; +using std::lock_guard; using std::max; using std::make_pair; using std::min; @@ -62,10 +67,6 @@ const double View::MinScale = 1e-15; const int View::MaxScrollValue = INT_MAX / 2; -const int View::SignalHeight = 30; -const int View::SignalMargin = 10; -const int View::SignalSnapGridSize = 10; - const QColor View::CursorAreaColour(220, 231, 243); const QSizeF View::LabelPadding(4, 0); @@ -148,6 +149,16 @@ const SigSession& View::session() const return _session; } +View* View::view() +{ + return this; +} + +const View* View::view() const +{ + return this; +} + Viewport* View::viewport() { return _viewport; @@ -168,9 +179,9 @@ double View::offset() const return _offset; } -int View::v_offset() const +int View::owner_v_offset() const { - return _v_offset; + return -_v_offset; } void View::zoom(double steps) @@ -203,9 +214,6 @@ void View::zoom_one_to_one() { using pv::data::SignalData; - const vector< shared_ptr > sigs( - session().get_signals()); - // Make a set of all the visible data objects set< shared_ptr > visible_data = get_visible_data(); if (visible_data.empty()) @@ -240,54 +248,10 @@ void View::set_scale_offset(double scale, double offset) scale_offset_changed(); } -vector< shared_ptr > View::get_traces() const -{ - const vector< shared_ptr > sigs( - session().get_signals()); -#ifdef ENABLE_DECODE - const vector< shared_ptr > decode_sigs( - session().get_decode_signals()); - vector< shared_ptr > traces( - sigs.size() + decode_sigs.size()); -#else - vector< shared_ptr > traces(sigs.size()); -#endif - - auto i = traces.begin(); - i = copy(sigs.begin(), sigs.end(), i); -#ifdef ENABLE_DECODE - i = copy(decode_sigs.begin(), decode_sigs.end(), i); -#endif - - stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets); - return traces; -} - -list > View::selected_items() const -{ - list > items; - - // List the selected signals - const vector< shared_ptr > traces(get_traces()); - for (shared_ptr t : traces) { - assert(t); - if (t->selected()) - items.push_back(t); - } - - // List the selected cursors - if (_cursors.first()->selected()) - items.push_back(_cursors.first()); - if (_cursors.second()->selected()) - items.push_back(_cursors.second()); - - return items; -} - set< shared_ptr > View::get_visible_data() const { - const vector< shared_ptr > sigs( - session().get_signals()); + shared_lock lock(session().signals_mutex()); + const vector< shared_ptr > &sigs(session().signals()); // Make a set of all the visible data objects set< shared_ptr > visible_data; @@ -358,15 +322,13 @@ const QPoint& View::hover_point() const void View::normalize_layout() { - const vector< shared_ptr > traces(get_traces()); - int v_min = INT_MAX; - for (const shared_ptr t : traces) - v_min = min(t->get_v_offset(), v_min); + for (const shared_ptr r : *this) + v_min = min(r->v_offset(), v_min); const int delta = -min(v_min, 0); - for (shared_ptr t : traces) - t->set_v_offset(t->get_v_offset() + delta); + for (shared_ptr r : *this) + r->set_v_offset(r->v_offset() + delta); verticalScrollBar()->setSliderPosition(_v_offset + delta); v_scroll_value_changed(verticalScrollBar()->sliderPosition()); @@ -421,9 +383,11 @@ void View::update_scroll() // Set the vertical scrollbar verticalScrollBar()->setPageStep(areaSize.height()); - verticalScrollBar()->setRange(0, - _viewport->get_total_height() + SignalMargin - - areaSize.height()); + + const pair extents = v_extents(); + const int extra_scroll_height = (extents.second - extents.first) / 4; + verticalScrollBar()->setRange(extents.first - extra_scroll_height, + extents.first + extra_scroll_height); } void View::update_layout() @@ -442,12 +406,17 @@ void View::update_layout() update_scroll(); } -bool View::compare_trace_v_offsets(const shared_ptr &a, - const shared_ptr &b) +void View::paint_label(QPainter &p, int right, bool hover) { - assert(a); - assert(b); - return a->get_v_offset() < b->get_v_offset(); + (void)p; + (void)right; + (void)hover; +} + +QRectF View::label_rect(int right) +{ + (void)right; + return QRectF(); } bool View::eventFilter(QObject *object, QEvent *event) @@ -527,16 +496,38 @@ void View::v_scroll_value_changed(int value) void View::signals_changed() { - int offset = SignalMargin + SignalHeight; - const vector< shared_ptr > traces(get_traces()); - for (shared_ptr t : traces) { - t->set_view(this); - t->set_v_offset(offset); - offset += SignalHeight + 2 * SignalMargin; + // Populate the traces + clear_child_items(); + + shared_lock lock(session().signals_mutex()); + const vector< shared_ptr > &sigs(session().signals()); + for (auto s : sigs) + add_child_item(s); + +#ifdef ENABLE_DECODE + const vector< shared_ptr > decode_sigs( + session().get_decode_signals()); + for (auto s : decode_sigs) + add_child_item(s); +#endif + + // Create the initial layout + int offset = 0; + for (shared_ptr r : *this) { + const pair extents = r->v_extents(); + if (r->enabled()) + offset += -extents.first; + r->set_v_offset(offset); + if (r->enabled()) + offset += extents.second; } update_layout(); normalize_layout(); + + // Update the child widgets + _header->signals_updated(); + _viewport->signals_updated(); } void View::data_updated() @@ -567,9 +558,8 @@ void View::on_geometry_updated() void View::on_hover_point_changed() { - const vector< shared_ptr > traces(get_traces()); - for (shared_ptr t : traces) - t->hover_point_changed(); + for (shared_ptr r : *this) + r->hover_point_changed(); } } // namespace view