]> sigrok.org Git - pulseview.git/blobdiff - pv/view/view.cpp
TraceView: Improve the way we do the initial scrolling setup
[pulseview.git] / pv / view / view.cpp
index 9e2aeaa87af8c4319447e564009cd4332915aca8..c7944179ad5a7185de2dc3c0bf2a30c69ef09860 100644 (file)
@@ -36,9 +36,9 @@
 #include <boost/serialization/serialization.hpp>
 
 #include <QApplication>
-#include <QHBoxLayout>
 #include <QEvent>
 #include <QFontMetrics>
+#include <QHBoxLayout>
 #include <QMouseEvent>
 #include <QScrollBar>
 
 #include "view.hpp"
 #include "viewport.hpp"
 
-#include "pv/session.hpp"
-#include "pv/globalsettings.hpp"
-#include "pv/devices/device.hpp"
 #include "pv/data/logic.hpp"
 #include "pv/data/logicsegment.hpp"
+#include "pv/devices/device.hpp"
+#include "pv/globalsettings.hpp"
+#include "pv/session.hpp"
 #include "pv/util.hpp"
 
 #ifdef ENABLE_DECODE
 #include "decodetrace.hpp"
 #endif
 
-
 using pv::data::SignalData;
 using pv::data::Segment;
 using pv::util::TimeUnit;
@@ -97,7 +96,6 @@ const Timestamp View::MaxScale("1e9");
 const Timestamp View::MinScale("1e-12");
 
 const int View::MaxScrollValue = INT_MAX / 2;
-const int View::MaxViewAutoUpdateRate = 25; // No more than 25 Hz with sticky scrolling
 
 const int View::ScaleUnits[3] = {1, 2, 5};
 
@@ -151,8 +149,7 @@ View::View(Session &session, bool is_main_view, QWidget *parent) :
        trigger_markers_(),
        hover_point_(-1, -1),
        scroll_needs_defaults_(false),
-       saved_v_offset_(0),
-       size_finalized_(false)
+       saved_v_offset_(0)
 {
        GlobalSettings settings;
        coloured_bg_ = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
@@ -179,11 +176,6 @@ View::View(Session &session, bool is_main_view, QWidget *parent) :
                this, SLOT(process_sticky_events()));
        lazy_event_handler_.setSingleShot(true);
 
-       connect(&delayed_view_updater_, SIGNAL(timeout()),
-               this, SLOT(perform_delayed_view_update()));
-       delayed_view_updater_.setSingleShot(true);
-       delayed_view_updater_.setInterval(1000 / MaxViewAutoUpdateRate);
-
        /* To let the scroll area fill up the parent QWidget (this), we need a layout */
        QHBoxLayout *layout = new QHBoxLayout(this);
        setLayout(layout);
@@ -225,11 +217,13 @@ unordered_set< shared_ptr<Signal> > View::signals() const
 
 void View::clear_signals()
 {
+       ViewBase::clear_signalbases();
        signals_.clear();
 }
 
 void View::add_signal(const shared_ptr<Signal> signal)
 {
+       ViewBase::add_signalbase(signal->base());
        signals_.insert(signal);
 }
 
@@ -324,7 +318,7 @@ void View::restore_settings(QSettings &settings)
                saved_v_offset_ = settings.value("v_offset").toInt();
                set_v_offset(saved_v_offset_);
                scroll_needs_defaults_ = false;
-               // Note: see resizeEvent() for additional information
+               // Note: see eventFilter() for additional information
        }
 }
 
@@ -444,7 +438,7 @@ void View::zoom(double steps)
 
 void View::zoom(double steps, int offset)
 {
-       set_zoom(scale_ * pow(3.0/2.0, -steps), offset);
+       set_zoom(scale_ * pow(3.0 / 2.0, -steps), offset);
 }
 
 void View::zoom_fit(bool gui_state)
@@ -533,8 +527,7 @@ pair<Timestamp, Timestamp> View::get_time_extents() const
        boost::optional<Timestamp> left_time, right_time;
        const set< shared_ptr<SignalData> > visible_data = get_visible_data();
        for (const shared_ptr<SignalData> d : visible_data) {
-               const vector< shared_ptr<Segment> > segments =
-                       d->segments();
+               const vector< shared_ptr<Segment> > segments = d->segments();
                for (const shared_ptr<Segment> &s : segments) {
                        double samplerate = s->samplerate();
                        samplerate = (samplerate <= 0.0) ? 1.0 : samplerate;
@@ -563,33 +556,24 @@ void View::enable_show_sampling_points(bool state)
        viewport_->update();
 }
 
-void View::enable_coloured_bg(bool state)
+void View::enable_show_analog_minor_grid(bool state)
 {
-       const vector<shared_ptr<TraceTreeItem>> items(
-               list_by_type<TraceTreeItem>());
-
-       for (shared_ptr<TraceTreeItem> i : items) {
-               // Can't cast to Trace because it's abstract, so we need to
-               // check for any derived classes individually
-
-               shared_ptr<AnalogSignal> a = dynamic_pointer_cast<AnalogSignal>(i);
-               if (a)
-                       a->set_coloured_bg(state);
-
-               shared_ptr<LogicSignal> l = dynamic_pointer_cast<LogicSignal>(i);
-               if (l)
-                       l->set_coloured_bg(state);
+       (void)state;
 
-#ifdef ENABLE_DECODE
-               shared_ptr<DecodeTrace> d = dynamic_pointer_cast<DecodeTrace>(i);
-               if (d)
-                       d->set_coloured_bg(state);
-#endif
-       }
+       viewport_->update();
+}
 
+void View::enable_coloured_bg(bool state)
+{
+       coloured_bg_ = state;
        viewport_->update();
 }
 
+bool View::coloured_bg() const
+{
+       return coloured_bg_;
+}
+
 bool View::cursors_shown() const
 {
        return show_cursors_;
@@ -666,12 +650,6 @@ void View::restack_all_trace_tree_items()
        for (auto &o : sorted_owners)
                o->restack_items();
 
-       // Re-assign background colors
-       bool next_bgcolour_state = false;
-
-       for (auto &o : sorted_owners)
-               next_bgcolour_state = o->reassign_bgcolour_states(next_bgcolour_state);
-
        // Animate the items to their destination
        for (const auto &i : items)
                i->animate_to_layout_v_offset();
@@ -837,11 +815,6 @@ void View::set_scroll_default()
        else
                // Put the first trace at the top, letting the bottom ones overflow
                set_v_offset(extents.first);
-
-       // If we're not sure whether setting the defaults worked as
-       // the window wasn't set up entirely yet, we want to be called
-       // again later to make sure
-       scroll_needs_defaults_ = !size_finalized_;
 }
 
 void View::update_layout()
@@ -957,6 +930,26 @@ bool View::eventFilter(QObject *object, QEvent *event)
        } else if (type == QEvent::Leave) {
                hover_point_ = QPoint(-1, -1);
                hover_point_changed();
+       } else if (type == QEvent::Show) {
+
+               // This is somewhat of a hack, unfortunately. We cannot use
+               // set_v_offset() from within restore_settings() as the view
+               // at that point is neither visible nor properly sized.
+               // This is the least intrusive workaround I could come up
+               // with: set the vertical offset (or scroll defaults) when
+               // the view is shown, which happens after all widgets were
+               // resized to their final sizes.
+               update_layout();
+
+               if (scroll_needs_defaults_) {
+                       set_scroll_default();
+                       scroll_needs_defaults_ = false;
+               }
+
+               if (saved_v_offset_) {
+                       set_v_offset(saved_v_offset_);
+                       saved_v_offset_ = 0;
+               }
        }
 
        return QObject::eventFilter(object, event);
@@ -965,27 +958,6 @@ bool View::eventFilter(QObject *object, QEvent *event)
 void View::resizeEvent(QResizeEvent*)
 {
        update_layout();
-
-       // This is somewhat of a hack, unfortunately. We cannot use
-       // set_v_offset() from within restore_settings() as the view
-       // at that point is neither visible nor properly sized.
-       // This is the least intrusive workaround I could come up
-       // with: set the vertical offset (or scroll defaults) when
-       // the view is visible and resized to its final size.
-       // Resize events that are sent when the view is not visible
-       // must be ignored as they have wrong sizes, potentially
-       // preventing the v offset from being set successfully.
-
-       if (isVisible())
-               size_finalized_ = true;
-
-       if (size_finalized_ && saved_v_offset_) {
-               set_v_offset(saved_v_offset_);
-               saved_v_offset_ = 0;
-       }
-
-       if (size_finalized_ && scroll_needs_defaults_)
-               set_scroll_default();
 }
 
 void View::row_item_appearance_changed(bool label, bool content)
@@ -1009,6 +981,7 @@ void View::extents_changed(bool horz, bool vert)
        sticky_events_ |=
                (horz ? TraceTreeItemHExtentsChanged : 0) |
                (vert ? TraceTreeItemVExtentsChanged : 0);
+
        lazy_event_handler_.start();
 }
 
@@ -1252,19 +1225,6 @@ void View::capture_state_updated(int state)
        }
 }
 
-void View::data_updated()
-{
-       if (always_zoom_to_fit_ || sticky_scrolling_) {
-               if (!delayed_view_updater_.isActive())
-                       delayed_view_updater_.start();
-       } else {
-               determine_time_unit();
-               update_scroll();
-               ruler_->update();
-               viewport_->update();
-       }
-}
-
 void View::perform_delayed_view_update()
 {
        if (always_zoom_to_fit_) {