Fix #1132 by passing segment IDs, not segment instances

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

diff --git a/pv/views/viewbase.cpp b/pv/views/viewbase.cpp
index caed41eecb56daf0d3b58b1102e90d091c1f7ecb..11ff7a273b6af3a2892fdfcf6c7287f2f99d12c6 100644 (file)
--- a/pv/views/viewbase.cpp
+++ b/pv/views/viewbase.cpp
@@ -80,8 +80,8 @@ void ViewBase::clear_signalbases()
        for (shared_ptr<data::SignalBase> signalbase : signalbases_) {
                disconnect(signalbase.get(), SIGNAL(samples_cleared()),
                        this, SLOT(on_data_updated()));
        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();
        }
 
        signalbases_.clear();


@@ -93,8 +93,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_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
 }
 
 #ifdef ENABLE_DECODE


@@ -152,15 +152,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;
 
        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())
                return;
 
        if (!delayed_view_updater_.isActive())