X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=615235efbd0af80e845d29106fd55d695791b690;hb=7ff0145fbf19de010232ea5edadea5df6c28ed8e;hp=61f017660cab050cc5ae84f0b9d626daef69bcca;hpb=aca64cac30aadeee90510958b081cd385221b258;p=pulseview.git diff --git a/pv/view/view.cpp b/pv/view/view.cpp index 61f0176..615235e 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -26,6 +26,7 @@ #include #include #include +#include #include #include @@ -56,6 +57,7 @@ using std::min; using std::pair; using std::set; using std::shared_ptr; +using std::unordered_set; using std::vector; using std::weak_ptr; @@ -67,10 +69,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); @@ -109,8 +107,6 @@ View::View(SigSession &session, QWidget *parent) : connect(_cursors.second().get(), SIGNAL(time_changed()), this, SLOT(marker_time_changed())); - connect(_header, SIGNAL(geometry_updated()), - this, SLOT(on_geometry_updated())); connect(_header, SIGNAL(signals_moved()), this, SLOT(on_signals_moved())); @@ -127,6 +123,10 @@ View::View(SigSession &session, QWidget *parent) : connect(this, SIGNAL(hover_point_changed()), this, SLOT(on_hover_point_changed())); + connect(&_lazy_event_handler, SIGNAL(timeout()), + this, SLOT(process_sticky_events())); + _lazy_event_handler.setSingleShot(true); + setViewport(_viewport); _viewport->installEventFilter(this); @@ -183,11 +183,16 @@ double View::offset() const return _offset; } -int View::owner_v_offset() const +int View::owner_visual_v_offset() const { return -_v_offset; } +unsigned int View::depth() const +{ + return 0; +} + void View::zoom(double steps) { zoom(steps, _viewport->width() / 2); @@ -252,26 +257,6 @@ void View::set_scale_offset(double scale, double offset) scale_offset_changed(); } -list > View::selected_items() const -{ - list > items; - - // List the selected signals - const vector< shared_ptr > row_items(child_items()); - for (shared_ptr r : row_items) { - if (r && r->selected()) - items.push_back(r); - } - - // 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 { shared_lock lock(session().signals_mutex()); @@ -344,26 +329,33 @@ const QPoint& View::hover_point() const return _hover_point; } -void View::normalize_layout() +void View::update_viewport() { - const vector< shared_ptr > row_items(child_items()); + assert(_viewport); + _viewport->update(); + _header->update(); +} - int v_min = INT_MAX; - for (const shared_ptr r : row_items) - v_min = min(r->v_offset(), v_min); +void View::restack_all_row_items() +{ + // Make a set of owners + unordered_set< RowItemOwner* > owners; + for (const auto &r : *this) + owners.insert(r->owner()); - const int delta = -min(v_min, 0); - for (shared_ptr r : row_items) - r->set_v_offset(r->v_offset() + delta); + // Make a list that is sorted from deepest first + vector< RowItemOwner* > sorted_owners(owners.begin(), owners.end()); + sort(sorted_owners.begin(), sorted_owners.end(), + [](const RowItemOwner* a, const RowItemOwner *b) { + return a->depth() > b->depth(); }); - verticalScrollBar()->setSliderPosition(_v_offset + delta); - v_scroll_value_changed(verticalScrollBar()->sliderPosition()); -} + // Restack the items recursively + for (auto &o : sorted_owners) + o->restack_items(); -void View::update_viewport() -{ - assert(_viewport); - _viewport->update(); + // Animate the items to their destination + for (const auto &r : *this) + r->animate_to_layout_v_offset(); } void View::get_scroll_layout(double &length, double &offset) const @@ -409,9 +401,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() @@ -492,6 +486,22 @@ void View::resizeEvent(QResizeEvent*) update_layout(); } +void View::appearance_changed(bool label, bool content) +{ + if (label) + _header->update(); + if (content) + _viewport->update(); +} + +void View::extents_changed(bool horz, bool vert) +{ + _sticky_events |= + (horz ? SelectableItemHExtentsChanged : 0) | + (vert ? SelectableItemVExtentsChanged : 0); + _lazy_event_handler.start(); +} + void View::h_scroll_value_changed(int value) { if (_updating_scroll) @@ -536,14 +546,17 @@ void View::signals_changed() #endif // Create the initial layout - int offset = SignalMargin + SignalHeight; - for (shared_ptr r : child_items()) { - r->set_v_offset(offset); - offset += SignalHeight + 2 * SignalMargin; + int offset = 0; + for (shared_ptr r : *this) { + const pair extents = r->v_extents(); + if (r->enabled()) + offset += -extents.first; + r->force_to_v_offset(offset); + if (r->enabled()) + offset += extents.second; } update_layout(); - normalize_layout(); } void View::data_updated() @@ -567,15 +580,20 @@ void View::on_signals_moved() signals_moved(); } -void View::on_geometry_updated() +void View::process_sticky_events() { - update_layout(); + if (_sticky_events & SelectableItemHExtentsChanged) + update_layout(); + if (_sticky_events & SelectableItemVExtentsChanged) + restack_all_row_items(); + + // Clear the sticky events + _sticky_events = 0; } void View::on_hover_point_changed() { - const vector< shared_ptr > row_items(child_items()); - for (shared_ptr r : row_items) + for (shared_ptr r : *this) r->hover_point_changed(); }