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),
- current_segment_(0)
+ is_main_view_(is_main_view)
{
(void)parent;
delayed_view_updater_.setInterval(1000 / MaxViewAutoUpdateRate);
}
+void ViewBase::reset_view_state()
+{
+ ruler_shift_ = 0;
+ current_segment_ = 0;
+}
+
Session& ViewBase::session()
{
return session_;
void ViewBase::clear_signalbases()
{
- for (shared_ptr<data::SignalBase> signalbase : signalbases_) {
+ for (const 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();
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
(void)settings;
}
-void ViewBase::trigger_event(util::Timestamp location)
+void ViewBase::trigger_event(int segment_id, util::Timestamp location)
{
+ (void)segment_id;
(void)location;
}
{
}
-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())