X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fview.cpp;h=f63401e61ed496f114ea0173cb985ea204c034f3;hb=572c3bb71a824b15442ed63c600e77517c6ae411;hp=bda056acbdec6c4a3a6521d22075507651b1dfde;hpb=873e80357d9622678069fcfe83b010717a68284c;p=pulseview.git

diff --git a/pv/views/trace/view.cpp b/pv/views/trace/view.cpp
index bda056a..f63401e 100644
--- a/pv/views/trace/view.cpp
+++ b/pv/views/trace/view.cpp
@@ -253,6 +253,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 +269,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 +362,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
@@ -890,6 +899,14 @@ bool View::header_was_shrunk() const
 
 void View::expand_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;
@@ -1084,15 +1101,14 @@ void View::extents_changed(bool horz, bool vert)
 	lazy_event_handler_.start();
 }
 
+void View::on_signal_name_changed()
+{
+	if (!header_was_shrunk())
+		expand_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();
 }
@@ -1360,6 +1376,16 @@ void View::capture_state_updated(int state)
 	}
 }
 
+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_) {