Fix #540 by introducing a method to reset the view state

[pulseview.git] / pv / views / viewbase.cpp

diff --git a/pv/views/viewbase.cpp b/pv/views/viewbase.cpp
index caed41eecb56daf0d3b58b1102e90d091c1f7ecb..c463ecc2d1a8dc16792a2c25a58f45836b8caaf7 100644 (file)
--- a/pv/views/viewbase.cpp
+++ b/pv/views/viewbase.cpp
@@ -36,10 +36,9 @@ namespace views {
 const int ViewBase::MaxViewAutoUpdateRate = 25; // No more than 25 Hz
 
 ViewBase::ViewBase(Session &session, bool is_main_view, QWidget *parent) :
+       // Note: Place defaults in ViewBase::reset_view_state(), not here
        session_(session),
-       is_main_view_(is_main_view),
-       ruler_shift_(0),
-       current_segment_(0)
+       is_main_view_(is_main_view)
 {
        (void)parent;
 
@@ -56,6 +55,12 @@ ViewBase::ViewBase(Session &session, bool is_main_view, QWidget *parent) :
        delayed_view_updater_.setInterval(1000 / MaxViewAutoUpdateRate);
 }
 
+void ViewBase::reset_view_state()
+{
+       ruler_shift_ = 0;
+       current_segment_ = 0;
+}
+
 Session& ViewBase::session()
 {
        return session_;
@@ -80,8 +85,8 @@ void ViewBase::clear_signalbases()
        for (shared_ptr<data::SignalBase> signalbase : signalbases_) {
                disconnect(signalbase.get(), SIGNAL(samples_cleared()),
                        this, SLOT(on_data_updated()));
-               disconnect(signalbase.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
-                       this, SLOT(on_samples_added(QObject*, uint64_t, uint64_t)));
+               disconnect(signalbase.get(), SIGNAL(samples_added(uint64_t, uint64_t, uint64_t)),
+                       this, SLOT(on_samples_added(uint64_t, uint64_t, uint64_t)));
        }
 
        signalbases_.clear();
@@ -93,8 +98,8 @@ void ViewBase::add_signalbase(const shared_ptr<data::SignalBase> signalbase)
 
        connect(signalbase.get(), SIGNAL(samples_cleared()),
                this, SLOT(on_data_updated()));
-       connect(signalbase.get(), SIGNAL(samples_added(QObject*, uint64_t, uint64_t)),
-               this, SLOT(on_samples_added(QObject*, uint64_t, uint64_t)));
+       connect(signalbase.get(), SIGNAL(samples_added(uint64_t, uint64_t, uint64_t)),
+               this, SLOT(on_samples_added(uint64_t, uint64_t, uint64_t)));
 }
 
 #ifdef ENABLE_DECODE
@@ -152,15 +157,13 @@ void ViewBase::perform_delayed_view_update()
 {
 }
 
-void ViewBase::on_samples_added(QObject* segment, uint64_t start_sample,
+void ViewBase::on_samples_added(uint64_t segment_id, uint64_t start_sample,
        uint64_t end_sample)
 {
        (void)start_sample;
        (void)end_sample;
 
-       data::Segment* s = qobject_cast<data::Segment*>(segment);
-
-       if (s->segment_id() != current_segment_)
+       if (segment_id != current_segment_)
                return;
 
        if (!delayed_view_updater_.isActive())