X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Fviewbase.cpp;h=4449d1905f921dbce64c087765fc4c7450a5c48c;hp=11ff7a273b6af3a2892fdfcf6c7287f2f99d12c6;hb=79926d3fcc446c00fd892d008978390053634415;hpb=7f894d958eb5221161f0c6f2abbb57d43bb6aae7

diff --git a/pv/views/viewbase.cpp b/pv/views/viewbase.cpp
index 11ff7a2..4449d19 100644
--- a/pv/views/viewbase.cpp
+++ b/pv/views/viewbase.cpp
@@ -36,10 +36,10 @@ 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
+	QWidget(parent),
 	session_(session),
-	is_main_view_(is_main_view),
-	ruler_shift_(0),
-	current_segment_(0)
+	is_main_view_(is_main_view)
 {
 	(void)parent;
 
@@ -56,6 +56,11 @@ ViewBase::ViewBase(Session &session, bool is_main_view, QWidget *parent) :
 	delayed_view_updater_.setInterval(1000 / MaxViewAutoUpdateRate);
 }
 
+void ViewBase::reset_view_state()
+{
+	current_segment_ = 0;
+}
+
 Session& ViewBase::session()
 {
 	return session_;
@@ -77,7 +82,7 @@ unordered_set< shared_ptr<data::SignalBase> > ViewBase::signalbases() const
 
 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(uint64_t, uint64_t, uint64_t)),