X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.cpp;h=ce78100f83383da5df9393ef28222cf02e577795;hb=1d150cd6ea6d9c465d607377bba435a065f104cd;hp=6218c2efae76d05dbedbee741bb870a014086bfd;hpb=ad908057e13224eee9f983685e0ccc7db1ded0e9;p=pulseview.git

diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index 6218c2ef..ce78100f 100644
--- a/pv/views/trace/view.cpp
+++ b/pv/views/trace/view.cpp
@@ -73,7 +73,6 @@ using pv::util::Timestamp;
 using std::back_inserter;
 using std::copy_if;
 using std::count_if;
-using std::dynamic_pointer_cast;
 using std::inserter;
 using std::max;
 using std::make_pair;
@@ -142,7 +141,10 @@ View::View(Session &session, bool is_main_view, QWidget *parent) :
 	trigger_markers_(),
 	hover_point_(-1, -1),
 	scroll_needs_defaults_(true),
-	saved_v_offset_(0)
+	saved_v_offset_(0),
+	scale_at_acq_start_(0),
+	offset_at_acq_start_(0),
+	suppress_zoom_to_fit_after_acq_(false)
 {
 	QVBoxLayout *root_layout = new QVBoxLayout(this);
 	root_layout->setContentsMargins(0, 0, 0, 0);
@@ -210,9 +212,6 @@ View::View(Session &session, bool is_main_view, QWidget *parent) :
 	connect(splitter_, SIGNAL(splitterMoved(int, int)),
 		this, SLOT(on_splitter_moved()));
 
-	connect(this, SIGNAL(hover_point_changed()),
-		this, SLOT(on_hover_point_changed()));
-
 	connect(&lazy_event_handler_, SIGNAL(timeout()),
 		this, SLOT(process_sticky_events()));
 	lazy_event_handler_.setSingleShot(true);
@@ -356,6 +355,10 @@ void View::restore_settings(QSettings &settings)
 	}
 
 	settings_restored_ = true;
+	suppress_zoom_to_fit_after_acq_ = true;
+
+	// Update the ruler so that it uses the new scale
+	calculate_tick_spacing();
 }
 
 vector< shared_ptr<TimeItem> > View::time_items() const
@@ -1002,11 +1005,11 @@ bool View::eventFilter(QObject *object, QEvent *event)
 		else
 			hover_point_ = QPoint(-1, -1);
 
-		hover_point_changed();
+		update_hover_point();
 
 	} else if (type == QEvent::Leave) {
 		hover_point_ = QPoint(-1, -1);
-		hover_point_changed();
+		update_hover_point();
 	} else if (type == QEvent::Show) {
 
 		// This is somewhat of a hack, unfortunately. We cannot use
@@ -1044,6 +1047,16 @@ void View::resizeEvent(QResizeEvent* event)
 	update_layout();
 }
 
+void View::update_hover_point()
+{
+	const vector<shared_ptr<TraceTreeItem>> trace_tree_items(
+		list_by_type<TraceTreeItem>());
+	for (shared_ptr<TraceTreeItem> r : trace_tree_items)
+		r->hover_point_changed(hover_point_);
+
+	hover_point_changed(hover_point_);
+}
+
 void View::row_item_appearance_changed(bool label, bool content)
 {
 	if (label)
@@ -1299,16 +1312,20 @@ void View::signals_changed()
 
 void View::capture_state_updated(int state)
 {
+	GlobalSettings settings;
+
 	if (state == Session::Running) {
 		set_time_unit(util::TimeUnit::Samples);
 
 		trigger_markers_.clear();
 
+		scale_at_acq_start_ = scale_;
+		offset_at_acq_start_ = offset_;
+
 		// 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();
+		bool state = settings.value(GlobalSettings::Key_View_ZoomToFitDuringAcq).toBool();
 		if (is_main_view_ && state) {
 			always_zoom_to_fit_ = true;
 			always_zoom_to_fit_changed(always_zoom_to_fit_);
@@ -1330,6 +1347,19 @@ void View::capture_state_updated(int state)
 			always_zoom_to_fit_ = false;
 			always_zoom_to_fit_changed(always_zoom_to_fit_);
 		}
+
+		bool zoom_to_fit_after_acq =
+			settings.value(GlobalSettings::Key_View_ZoomToFitAfterAcq).toBool();
+
+		// Only perform zoom-to-fit if the user hasn't altered the viewport and
+		// we didn't restore settings in the meanwhile
+		if (zoom_to_fit_after_acq &&
+			!suppress_zoom_to_fit_after_acq_ &&
+			(scale_ == scale_at_acq_start_) &&
+			(offset_ == offset_at_acq_start_))
+			zoom_fit(false);  // We're stopped, so the GUI state doesn't matter
+
+		suppress_zoom_to_fit_after_acq_ = false;
 	}
 }
 
@@ -1368,14 +1398,6 @@ void View::process_sticky_events()
 	sticky_events_ = 0;
 }
 
-void View::on_hover_point_changed()
-{
-	const vector<shared_ptr<TraceTreeItem>> trace_tree_items(
-		list_by_type<TraceTreeItem>());
-	for (shared_ptr<TraceTreeItem> r : trace_tree_items)
-		r->hover_point_changed();
-}
-
 } // namespace trace
 } // namespace views
 } // namespace pv