From fd03a2797f0352892a8068a0d27da3c420c73973 Mon Sep 17 00:00:00 2001 From: Soeren Apel Date: Mon, 24 Aug 2015 21:23:32 +0200 Subject: [PATCH] Fix wrong ruler scale after loading a file --- pv/view/view.cpp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/pv/view/view.cpp b/pv/view/view.cpp index fdb9354b..d32a23da 100644 --- a/pv/view/view.cpp +++ b/pv/view/view.cpp @@ -925,14 +925,20 @@ void View::signals_changed() void View::capture_state_updated(int state) { - // Reset "always zoom to fit" when we change to the stopped state - if (always_zoom_to_fit_ && (state == Session::Stopped)) { - always_zoom_to_fit_ = false; - always_zoom_to_fit_changed(false); - } - if (state == Session::Running) time_unit_ = util::Samples; + + if (state == Session::Stopped) { + // After acquisition has stopped we need to re-calculate the ticks once + // as it's otherwise done when the user pans or zooms, which is too late + calculate_tick_spacing(); + + // Reset "always zoom to fit", the acquisition has stopped + if (always_zoom_to_fit_) { + always_zoom_to_fit_ = false; + always_zoom_to_fit_changed(false); + } + } } void View::data_updated() -- 2.30.2