RowItem: Split appart visual and layout v offsets

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

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 079d8d89b38ffaec8e42b1c6a7f173e56a46bb30..d48bbabebd4088e0b49128e00f5152577350b6b6 100644 (file)
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -43,6 +43,8 @@
 #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;
@@ -51,7 +53,6 @@ using std::lock_guard;
 using std::max;
 using std::make_pair;
 using std::min;
-using std::mutex;
 using std::pair;
 using std::set;
 using std::shared_ptr;
@@ -66,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);
@@ -251,29 +248,9 @@ void View::set_scale_offset(double scale, double offset)
        scale_offset_changed();
 }
 
-list<weak_ptr<SelectableItem> > View::selected_items() const
-{
-       list<weak_ptr<SelectableItem> > items;
-
-       // List the selected signals
-       const vector< shared_ptr<RowItem> > row_items(child_items());
-       for (shared_ptr<RowItem> 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<SignalData> > View::get_visible_data() const
 {
-       lock_guard<mutex> lock(session().signals_mutex());
+       shared_lock<shared_mutex> lock(session().signals_mutex());
        const vector< shared_ptr<Signal> > &sigs(session().signals());
 
        // Make a set of all the visible data objects
@@ -343,22 +320,6 @@ const QPoint& View::hover_point() const
        return _hover_point;
 }
 
-void View::normalize_layout()
-{
-       const vector< shared_ptr<RowItem> > row_items(child_items());
-
-       int v_min = INT_MAX;
-       for (const shared_ptr<RowItem> r : row_items)
-               v_min = min(r->v_offset(), v_min);
-
-       const int delta = -min(v_min, 0);
-       for (shared_ptr<RowItem> r : row_items)
-               r->set_v_offset(r->v_offset() + delta);
-
-       verticalScrollBar()->setSliderPosition(_v_offset + delta);
-       v_scroll_value_changed(verticalScrollBar()->sliderPosition());
-}
-
 void View::update_viewport()
 {
        assert(_viewport);
@@ -408,9 +369,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<int, int> 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()
@@ -522,7 +485,7 @@ void View::signals_changed()
        // Populate the traces
        clear_child_items();
 
-       lock_guard<mutex> lock(session().signals_mutex());
+       shared_lock<shared_mutex> lock(session().signals_mutex());
        const vector< shared_ptr<Signal> > &sigs(session().signals());
        for (auto s : sigs)
                add_child_item(s);
@@ -535,14 +498,21 @@ void View::signals_changed()
 #endif
 
        // Create the initial layout
-       int offset = SignalMargin + SignalHeight;
-       for (shared_ptr<RowItem> r : child_items()) {
-               r->set_v_offset(offset);
-               offset += SignalHeight + 2 * SignalMargin;
+       int offset = 0;
+       for (shared_ptr<RowItem> r : *this) {
+               const pair<int, int> 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();
+
+       // Update the child widgets
+       _header->signals_updated();
+       _viewport->signals_updated();
 }
 
 void View::data_updated()
@@ -573,8 +543,7 @@ void View::on_geometry_updated()
 
 void View::on_hover_point_changed()
 {
-       const vector< shared_ptr<RowItem> > row_items(child_items());
-       for (shared_ptr<RowItem> r : row_items)
+       for (shared_ptr<RowItem> r : *this)
                r->hover_point_changed();
 }