X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fview.cpp;h=c7944179ad5a7185de2dc3c0bf2a30c69ef09860;hp=7e47140c6bf2f3d4335df419e8cea74dd8976ecf;hb=5f9b7de5c8c71801141d35497786bf57f75e3ca4;hpb=47e9e7bbc3a4e91a960f4cbb1db48c5aff6dcace

diff --git a/pv/view/view.cpp b/pv/view/view.cpp
index 7e47140c..c7944179 100644
--- a/pv/view/view.cpp
+++ b/pv/view/view.cpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifdef ENABLE_DECODE
@@ -28,15 +27,18 @@
 #include <cassert>
 #include <climits>
 #include <cmath>
+#include <iostream>
 #include <iterator>
-#include <mutex>
 #include <unordered_set>
 
-#include <boost/thread/locks.hpp>
+#include <boost/archive/text_iarchive.hpp>
+#include <boost/archive/text_oarchive.hpp>
+#include <boost/serialization/serialization.hpp>
 
 #include <QApplication>
 #include <QEvent>
 #include <QFontMetrics>
+#include <QHBoxLayout>
 #include <QMouseEvent>
 #include <QScrollBar>
 
@@ -52,19 +54,17 @@
 #include "view.hpp"
 #include "viewport.hpp"
 
-#include "pv/session.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 boost::shared_lock;
-using boost::shared_mutex;
-
 using pv::data::SignalData;
 using pv::data::Segment;
 using pv::util::TimeUnit;
@@ -72,11 +72,9 @@ using pv::util::Timestamp;
 
 using std::back_inserter;
 using std::copy_if;
-using std::deque;
+using std::count_if;
 using std::dynamic_pointer_cast;
 using std::inserter;
-using std::list;
-using std::lock_guard;
 using std::max;
 using std::make_pair;
 using std::make_shared;
@@ -85,28 +83,57 @@ using std::pair;
 using std::set;
 using std::set_difference;
 using std::shared_ptr;
+using std::stringstream;
 using std::unordered_map;
 using std::unordered_set;
 using std::vector;
-using std::weak_ptr;
 
 namespace pv {
-namespace view {
+namespace views {
+namespace TraceView {
 
 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};
 
-View::View(Session &session, QWidget *parent) :
-	QAbstractScrollArea(parent),
-	session_(session),
+
+CustomAbstractScrollArea::CustomAbstractScrollArea(QWidget *parent) :
+	QAbstractScrollArea(parent)
+{
+}
+
+void CustomAbstractScrollArea::setViewportMargins(int left, int top, int right, int bottom)
+{
+	QAbstractScrollArea::setViewportMargins(left, top, right, bottom);
+}
+
+bool CustomAbstractScrollArea::viewportEvent(QEvent *event)
+{
+	switch (event->type()) {
+	case QEvent::Paint:
+	case QEvent::MouseButtonPress:
+	case QEvent::MouseButtonRelease:
+	case QEvent::MouseButtonDblClick:
+	case QEvent::MouseMove:
+	case QEvent::Wheel:
+	case QEvent::TouchBegin:
+	case QEvent::TouchUpdate:
+	case QEvent::TouchEnd:
+		return false;
+	default:
+		return QAbstractScrollArea::viewportEvent(event);
+	}
+}
+
+View::View(Session &session, bool is_main_view, QWidget *parent) :
+	ViewBase(session, is_main_view, parent),
 	viewport_(new Viewport(*this)),
 	ruler_(new Ruler(*this)),
 	header_(new Header(*this)),
+	scrollarea_(this),
 	scale_(1e-3),
 	offset_(0),
 	updating_scroll_(false),
@@ -120,22 +147,18 @@ View::View(Session &session, QWidget *parent) :
 	cursors_(new CursorPair(*this)),
 	next_flag_text_('A'),
 	trigger_markers_(),
-	hover_point_(-1, -1)
+	hover_point_(-1, -1),
+	scroll_needs_defaults_(false),
+	saved_v_offset_(0)
 {
-	connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
+	GlobalSettings settings;
+	coloured_bg_ = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
+
+	connect(scrollarea_.horizontalScrollBar(), SIGNAL(valueChanged(int)),
 		this, SLOT(h_scroll_value_changed(int)));
-	connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
+	connect(scrollarea_.verticalScrollBar(), SIGNAL(valueChanged(int)),
 		this, SLOT(v_scroll_value_changed()));
 
-	connect(&session_, SIGNAL(signals_changed()),
-		this, SLOT(signals_changed()));
-	connect(&session_, SIGNAL(capture_state_changed(int)),
-		this, SLOT(capture_state_updated(int)));
-	connect(&session_, SIGNAL(data_received()),
-		this, SLOT(data_updated()));
-	connect(&session_, SIGNAL(frame_ended()),
-		this, SLOT(data_updated()));
-
 	connect(header_, SIGNAL(selection_changed()),
 		ruler_, SLOT(clear_selection()));
 	connect(ruler_, SIGNAL(selection_changed()),
@@ -153,12 +176,13 @@ View::View(Session &session, 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);
+	layout->setContentsMargins(0, 0, 0, 0);
+	layout->addWidget(&scrollarea_);
 
-	setViewport(viewport_);
+	scrollarea_.setViewport(viewport_);
 
 	viewport_->installEventFilter(this);
 	ruler_->installEventFilter(this);
@@ -186,21 +210,47 @@ const Session& View::session() const
 	return session_;
 }
 
-std::unordered_set< std::shared_ptr<view::Signal> > View::signals() const
+unordered_set< shared_ptr<Signal> > View::signals() const
 {
 	return signals_;
 }
 
 void View::clear_signals()
 {
+	ViewBase::clear_signalbases();
 	signals_.clear();
 }
 
-void View::add_signal(const shared_ptr<view::Signal> signal)
+void View::add_signal(const shared_ptr<Signal> signal)
 {
+	ViewBase::add_signalbase(signal->base());
 	signals_.insert(signal);
 }
 
+#ifdef ENABLE_DECODE
+void View::clear_decode_signals()
+{
+	decode_traces_.clear();
+}
+
+void View::add_decode_signal(shared_ptr<data::SignalBase> signalbase)
+{
+	shared_ptr<DecodeTrace> d(
+		new DecodeTrace(session_, signalbase, decode_traces_.size()));
+	decode_traces_.push_back(d);
+}
+
+void View::remove_decode_signal(shared_ptr<data::SignalBase> signalbase)
+{
+	for (auto i = decode_traces_.begin(); i != decode_traces_.end(); i++)
+		if ((*i)->base() == signalbase) {
+			decode_traces_.erase(i);
+			signals_changed();
+			return;
+		}
+}
+#endif
+
 View* View::view()
 {
 	return this;
@@ -221,6 +271,57 @@ const Viewport* View::viewport() const
 	return viewport_;
 }
 
+void View::save_settings(QSettings &settings) const
+{
+	settings.setValue("scale", scale_);
+	settings.setValue("v_offset",
+		scrollarea_.verticalScrollBar()->sliderPosition());
+
+	stringstream ss;
+	boost::archive::text_oarchive oa(ss);
+	oa << boost::serialization::make_nvp("offset", offset_);
+	settings.setValue("offset", QString::fromStdString(ss.str()));
+
+	for (shared_ptr<Signal> signal : signals_) {
+		settings.beginGroup(signal->base()->internal_name());
+		signal->save_settings(settings);
+		settings.endGroup();
+	}
+}
+
+void View::restore_settings(QSettings &settings)
+{
+	// Note: It is assumed that this function is only called once,
+	// immediately after restoring a previous session.
+
+	if (settings.contains("scale"))
+		set_scale(settings.value("scale").toDouble());
+
+	if (settings.contains("offset")) {
+		util::Timestamp offset;
+		stringstream ss;
+		ss << settings.value("offset").toString().toStdString();
+
+		boost::archive::text_iarchive ia(ss);
+		ia >> boost::serialization::make_nvp("offset", offset);
+
+		set_offset(offset);
+	}
+
+	for (shared_ptr<Signal> signal : signals_) {
+		settings.beginGroup(signal->base()->internal_name());
+		signal->restore_settings(settings);
+		settings.endGroup();
+	}
+
+	if (settings.contains("v_offset")) {
+		saved_v_offset_ = settings.value("v_offset").toInt();
+		set_v_offset(saved_v_offset_);
+		scroll_needs_defaults_ = false;
+		// Note: see eventFilter() for additional information
+	}
+}
+
 vector< shared_ptr<TimeItem> > View::time_items() const
 {
 	const vector<shared_ptr<Flag>> f(flags());
@@ -263,12 +364,12 @@ void View::set_offset(const pv::util::Timestamp& offset)
 
 int View::owner_visual_v_offset() const
 {
-	return -verticalScrollBar()->sliderPosition();
+	return -scrollarea_.verticalScrollBar()->sliderPosition();
 }
 
 void View::set_v_offset(int offset)
 {
-	verticalScrollBar()->setSliderPosition(offset);
+	scrollarea_.verticalScrollBar()->setSliderPosition(offset);
 	header_->update();
 	viewport_->update();
 }
@@ -337,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)
@@ -426,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;
@@ -449,38 +549,31 @@ pair<Timestamp, Timestamp> View::get_time_extents() const
 	return make_pair(*left_time, *right_time);
 }
 
-void View::enable_sticky_scrolling(bool state)
+void View::enable_show_sampling_points(bool state)
 {
-	sticky_scrolling_ = state;
+	(void)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_;
@@ -502,15 +595,15 @@ void View::centre_cursors()
 	viewport_->update();
 }
 
-std::shared_ptr<CursorPair> View::cursors() const
+shared_ptr<CursorPair> View::cursors() const
 {
 	return cursors_;
 }
 
 void View::add_flag(const Timestamp& time)
 {
-	flags_.push_back(shared_ptr<Flag>(new Flag(*this, time,
-		QString("%1").arg(next_flag_text_))));
+	flags_.push_back(make_shared<Flag>(*this, time,
+		QString("%1").arg(next_flag_text_)));
 
 	next_flag_text_ = (next_flag_text_ >= 'Z') ? 'A' :
 		(next_flag_text_ + 1);
@@ -518,15 +611,15 @@ void View::add_flag(const Timestamp& time)
 	time_item_appearance_changed(true, true);
 }
 
-void View::remove_flag(std::shared_ptr<Flag> flag)
+void View::remove_flag(shared_ptr<Flag> flag)
 {
 	flags_.remove(flag);
 	time_item_appearance_changed(true, true);
 }
 
-vector< std::shared_ptr<Flag> > View::flags() const
+vector< shared_ptr<Flag> > View::flags() const
 {
-	vector< std::shared_ptr<Flag> > flags(flags_.begin(), flags_.end());
+	vector< shared_ptr<Flag> > flags(flags_.begin(), flags_.end());
 	stable_sort(flags.begin(), flags.end(),
 		[](const shared_ptr<Flag> &a, const shared_ptr<Flag> &b) {
 			return a->time() < b->time();
@@ -557,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 = 0;
-
-	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();
@@ -570,8 +657,7 @@ void View::restack_all_trace_tree_items()
 
 void View::trigger_event(util::Timestamp location)
 {
-	trigger_markers_.push_back(shared_ptr<TriggerMarker>(
-		new TriggerMarker(*this, location)));
+	trigger_markers_.push_back(make_shared<TriggerMarker>(*this, location));
 }
 
 void View::get_scroll_layout(double &length, Timestamp &offset) const
@@ -641,7 +727,7 @@ void View::calculate_tick_spacing()
 
 		// Precision is the number of fractional digits required, not
 		// taking the prefix into account (and it must never be negative)
-		tick_precision = std::max(ceil(log10(1 / tick_period)).convert_to<int>(), 0);
+		tick_precision = max(ceil(log10(1 / tick_period)).convert_to<int>(), 0);
 
 		tick_period_width = (tick_period / scale_).convert_to<double>();
 
@@ -663,6 +749,8 @@ void View::calculate_tick_spacing()
 void View::update_scroll()
 {
 	assert(viewport_);
+	QScrollBar *hscrollbar = scrollarea_.horizontalScrollBar();
+	QScrollBar *vscrollbar = scrollarea_.verticalScrollBar();
 
 	const QSize areaSize = viewport_->size();
 
@@ -674,40 +762,40 @@ void View::update_scroll()
 
 	int major_tick_distance = (tick_period_ / scale_).convert_to<int>();
 
-	horizontalScrollBar()->setPageStep(areaSize.width() / 2);
-	horizontalScrollBar()->setSingleStep(major_tick_distance);
+	hscrollbar->setPageStep(areaSize.width() / 2);
+	hscrollbar->setSingleStep(major_tick_distance);
 
 	updating_scroll_ = true;
 
 	if (length < MaxScrollValue) {
-		horizontalScrollBar()->setRange(0, length);
-		horizontalScrollBar()->setSliderPosition(offset.convert_to<double>());
+		hscrollbar->setRange(0, length);
+		hscrollbar->setSliderPosition(offset.convert_to<double>());
 	} else {
-		horizontalScrollBar()->setRange(0, MaxScrollValue);
-		horizontalScrollBar()->setSliderPosition(
+		hscrollbar->setRange(0, MaxScrollValue);
+		hscrollbar->setSliderPosition(
 			(offset_ * MaxScrollValue / (scale_ * length)).convert_to<double>());
 	}
 
 	updating_scroll_ = false;
 
 	// Set the vertical scrollbar
-	verticalScrollBar()->setPageStep(areaSize.height());
-	verticalScrollBar()->setSingleStep(areaSize.height() / 8);
+	vscrollbar->setPageStep(areaSize.height());
+	vscrollbar->setSingleStep(areaSize.height() / 8);
 
 	const pair<int, int> extents = v_extents();
 
 	// Don't change the scrollbar range if there are no traces
 	if (extents.first != extents.second)
-		verticalScrollBar()->setRange(extents.first - areaSize.height(),
+		vscrollbar->setRange(extents.first - areaSize.height(),
 			extents.second);
 
-	if (scroll_needs_defaults)
+	if (scroll_needs_defaults_)
 		set_scroll_default();
 }
 
 void View::reset_scroll()
 {
-	verticalScrollBar()->setRange(0, 0);
+	scrollarea_.verticalScrollBar()->setRange(0, 0);
 }
 
 void View::set_scroll_default()
@@ -716,15 +804,6 @@ void View::set_scroll_default()
 
 	const QSize areaSize = viewport_->size();
 
-	// Special case: when starting up and the window isn't visible yet,
-	// areaSize is [0, 0]. In this case we want to be called again later
-	if (areaSize.height() == 0) {
-		scroll_needs_defaults = true;
-		return;
-	} else {
-		scroll_needs_defaults = false;
-	}
-
 	const pair<int, int> extents = v_extents();
 	const int trace_height = extents.second - extents.first;
 
@@ -740,8 +819,8 @@ void View::set_scroll_default()
 
 void View::update_layout()
 {
-	setViewportMargins(
-		header_->sizeHint().width() - pv::view::Header::BaselineOffset,
+	scrollarea_.setViewportMargins(
+		header_->sizeHint().width() - Header::BaselineOffset,
 		ruler_->sizeHint().height(), 0, 0);
 	ruler_->setGeometry(viewport_->x(), 0,
 		viewport_->width(), ruler_->extended_size_hint().height());
@@ -775,7 +854,7 @@ TraceTreeItemOwner* View::find_prevalent_trace_group(
 	size_t max_prevalence = 0;
 	TraceTreeItemOwner *prevalent_owner = nullptr;
 	for (TraceTreeItemOwner *owner : owners) {
-		const size_t prevalence = std::count_if(
+		const size_t prevalence = count_if(
 			owner_list.begin(), owner_list.end(),
 			[&](TraceTreeItemOwner *o) { return o == owner; });
 		if (prevalence > max_prevalence) {
@@ -851,27 +930,29 @@ 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();
 
-	return QObject::eventFilter(object, event);
-}
+		if (scroll_needs_defaults_) {
+			set_scroll_default();
+			scroll_needs_defaults_ = false;
+		}
 
-bool View::viewportEvent(QEvent *event)
-{
-	switch (event->type()) {
-	case QEvent::Paint:
-	case QEvent::MouseButtonPress:
-	case QEvent::MouseButtonRelease:
-	case QEvent::MouseButtonDblClick:
-	case QEvent::MouseMove:
-	case QEvent::Wheel:
-	case QEvent::TouchBegin:
-	case QEvent::TouchUpdate:
-	case QEvent::TouchEnd:
-		return false;
-	default:
-		return QAbstractScrollArea::viewportEvent(event);
+		if (saved_v_offset_) {
+			set_v_offset(saved_v_offset_);
+			saved_v_offset_ = 0;
+		}
 	}
+
+	return QObject::eventFilter(object, event);
 }
 
 void View::resizeEvent(QResizeEvent*)
@@ -900,6 +981,7 @@ void View::extents_changed(bool horz, bool vert)
 	sticky_events_ |=
 		(horz ? TraceTreeItemHExtentsChanged : 0) |
 		(vert ? TraceTreeItemVExtentsChanged : 0);
+
 	lazy_event_handler_.start();
 }
 
@@ -915,7 +997,7 @@ void View::h_scroll_value_changed(int value)
 		sticky_scrolling_changed(false);
 	}
 
-	const int range = horizontalScrollBar()->maximum();
+	const int range = scrollarea_.horizontalScrollBar()->maximum();
 	if (range < MaxScrollValue)
 		set_offset(scale_ * value);
 	else {
@@ -945,7 +1027,8 @@ void View::signals_changed()
 	// Do we need to set the vertical scrollbar to its default position later?
 	// We do if there are no traces, i.e. the scroll bar has no range set
 	bool reset_scrollbar =
-		verticalScrollBar()->minimum() == verticalScrollBar()->maximum();
+		(scrollarea_.verticalScrollBar()->minimum() ==
+			scrollarea_.verticalScrollBar()->maximum());
 
 	if (!session_.device()) {
 		reset_scroll();
@@ -967,9 +1050,7 @@ void View::signals_changed()
 	set< shared_ptr<Trace> > traces(signals_.begin(), signals_.end());
 
 #ifdef ENABLE_DECODE
-	const vector< shared_ptr<DecodeTrace> > decode_traces(
-		session().get_decode_signals());
-	traces.insert(decode_traces.begin(), decode_traces.end());
+	traces.insert(decode_traces_.begin(), decode_traces_.end());
 #endif
 
 	set< shared_ptr<Trace> > add_traces;
@@ -1083,11 +1164,11 @@ void View::signals_changed()
 		}
 
 	// Add and position the pending top levels items
+	int offset = v_extents().second;
 	for (auto item : new_top_level_items) {
 		add_child_item(item);
 
 		// Position the item after the last item or at the top if there is none
-		int offset = v_extents().second;
 		const pair<int, int> extents = item->v_extents();
 
 		if (item->enabled())
@@ -1114,6 +1195,19 @@ void View::capture_state_updated(int state)
 		set_time_unit(util::TimeUnit::Samples);
 
 		trigger_markers_.clear();
+
+		// Activate "always zoom to fit" if the setting is enabled and we're
+		// the main view of this session (other trace views may be used for
+		// zooming and we don't want to mess them up)
+		GlobalSettings settings;
+		bool state = settings.value(GlobalSettings::Key_View_AlwaysZoomToFit).toBool();
+		if (is_main_view_ && state) {
+			always_zoom_to_fit_ = true;
+			always_zoom_to_fit_changed(always_zoom_to_fit_);
+		}
+
+		// Enable sticky scrolling if the setting is enabled
+		sticky_scrolling_ = settings.value(GlobalSettings::Key_View_StickyScrolling).toBool();
 	}
 
 	if (state == Session::Stopped) {
@@ -1123,31 +1217,19 @@ void View::capture_state_updated(int state)
 
 		// Reset "always zoom to fit", the acquisition has stopped
 		if (always_zoom_to_fit_) {
+			// Perform a final zoom-to-fit before disabling
+			zoom_fit(always_zoom_to_fit_);
 			always_zoom_to_fit_ = false;
-			always_zoom_to_fit_changed(false);
+			always_zoom_to_fit_changed(always_zoom_to_fit_);
 		}
 	}
 }
 
-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_)
+	if (always_zoom_to_fit_) {
 		zoom_fit(true);
-
-	if (sticky_scrolling_) {
+	} else if (sticky_scrolling_) {
 		// Make right side of the view sticky
 		double length = 0;
 		Timestamp offset;
@@ -1186,5 +1268,6 @@ void View::on_hover_point_changed()
 		r->hover_point_changed();
 }
 
-} // namespace view
+} // namespace TraceView
+} // namespace views
 } // namespace pv