X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.cpp;h=07919c28ac937d13b4767f5ccea297e2df5543df;hp=bda056acbdec6c4a3a6521d22075507651b1dfde;hb=4e86ec7042631d4b54876cba89c01a73abaf7213;hpb=873e80357d9622678069fcfe83b010717a68284c

diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index bda056ac..07919c28 100644
--- a/pv/views/trace/view.cpp
+++ b/pv/views/trace/view.cpp
@@ -129,6 +129,7 @@ View::View(Session &session, bool is_main_view, QWidget *parent) :
 	offset_(0),
 	updating_scroll_(false),
 	settings_restored_(false),
+	header_was_shrunk_(false),
 	sticky_scrolling_(false), // Default setting is set in MainWindow::setup_ui()
 	always_zoom_to_fit_(false),
 	tick_period_(0),
@@ -253,6 +254,9 @@ void View::add_signal(const shared_ptr<Signal> signal)
 {
 	ViewBase::add_signalbase(signal->base());
 	signals_.insert(signal);
+
+	connect(signal->base().get(), SIGNAL(name_changed(const QString&)),
+		this, SLOT(on_signal_name_changed()));
 }
 
 #ifdef ENABLE_DECODE
@@ -266,6 +270,9 @@ void View::add_decode_signal(shared_ptr<data::DecodeSignal> signal)
 	shared_ptr<DecodeTrace> d(
 		new DecodeTrace(session_, signal, decode_traces_.size()));
 	decode_traces_.push_back(d);
+
+	connect(signal.get(), SIGNAL(name_changed(const QString&)),
+		this, SLOT(on_signal_name_changed()));
 }
 
 void View::remove_decode_signal(shared_ptr<data::DecodeSignal> signal)
@@ -356,6 +363,9 @@ 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
@@ -877,7 +887,7 @@ void View::set_scroll_default()
 		set_v_offset(extents.first);
 }
 
-bool View::header_was_shrunk() const
+void View::determine_if_header_was_shrunk()
 {
 	const int header_pane_width = splitter_->sizes().front();
 	const int header_width = header_->extended_size_hint().width();
@@ -885,11 +895,19 @@ bool View::header_was_shrunk() const
 	// Allow for a slight margin of error so that we also accept
 	// slight differences when e.g. a label name change increased
 	// the overall width
-	return (header_pane_width < (header_width - 10));
+	header_was_shrunk_ = (header_pane_width < (header_width - 10));
 }
 
-void View::expand_header_to_fit()
+void View::resize_header_to_fit()
 {
+	// Setting the maximum width of the header widget doesn't work as
+	// expected because the splitter would allow the user to make the
+	// pane wider than that, creating empty space as a result.
+	// To make this work, we stricly enforce the maximum width by
+	// expanding the header unless the user shrunk it on purpose.
+	// As we're then setting the width of the header pane, we set the
+	// splitter to the maximum allowed position.
+
 	int splitter_area_width = 0;
 	for (int w : splitter_->sizes())
 		splitter_area_width += w;
@@ -1018,8 +1036,10 @@ bool View::eventFilter(QObject *object, QEvent *event)
 		// resized to their final sizes.
 		update_layout();
 
-		if (!settings_restored_)
-			expand_header_to_fit();
+		if (settings_restored_)
+			determine_if_header_was_shrunk();
+		else
+			resize_header_to_fit();
 
 		if (scroll_needs_defaults_) {
 			set_scroll_default();
@@ -1084,17 +1104,19 @@ void View::extents_changed(bool horz, bool vert)
 	lazy_event_handler_.start();
 }
 
+void View::on_signal_name_changed()
+{
+	if (!header_was_shrunk_)
+		resize_header_to_fit();
+}
+
 void View::on_splitter_moved()
 {
-	// Setting the maximum width of the header widget doesn't work as
-	// expected because the splitter would allow the user to make the
-	// pane wider than that, creating empty space as a result.
-	// To make this work, we stricly enforce the maximum width by
-	// expanding the header unless the user shrunk it on purpose.
-	// As we're then setting the width of the header pane, we set the
-	// splitter to the maximum allowed position.
-	if (!header_was_shrunk())
-		expand_header_to_fit();
+	// The header can only shrink when the splitter is moved manually
+	determine_if_header_was_shrunk();
+
+	if (!header_was_shrunk_)
+		resize_header_to_fit();
 }
 
 void View::h_scroll_value_changed(int value)
@@ -1135,6 +1157,7 @@ void View::signals_changed()
 
 	vector< shared_ptr<Channel> > channels;
 	shared_ptr<sigrok::Device> sr_dev;
+	bool signals_added_or_removed = false;
 
 	// 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
@@ -1266,6 +1289,7 @@ void View::signals_changed()
 		TraceTreeItemOwner *const owner = trace->owner();
 		assert(owner);
 		owner->remove_child_item(trace);
+		signals_added_or_removed = true;
 	}
 
 	// Remove any empty trace groups
@@ -1290,13 +1314,12 @@ void View::signals_changed()
 
 		if (item->enabled())
 			offset += extents.second;
+		signals_added_or_removed = true;
 	}
 
 
-	if (!new_top_level_items.empty())
-		// Expand the header pane because the header should become fully
-		// visible when new signals are added
-		expand_header_to_fit();
+	if (signals_added_or_removed && !header_was_shrunk_)
+		resize_header_to_fit();
 
 	update_layout();
 
@@ -1360,6 +1383,21 @@ void View::capture_state_updated(int state)
 	}
 }
 
+void View::on_new_segment(int new_segment_id)
+{
+	on_segment_changed(new_segment_id);
+}
+
+void View::on_segment_changed(int segment)
+{
+	current_segment_ = segment - 1;
+
+	for (shared_ptr<Signal> signal : signals_)
+		signal->set_current_segment(current_segment_);
+
+	viewport_->update();
+}
+
 void View::perform_delayed_view_update()
 {
 	if (always_zoom_to_fit_) {