X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fstandardbar.cpp;h=65f9ae3e684d57434667ed4c48666a6cc3cf30bf;hb=341d9a7975be53bb44af8d2deeba9b4a5e086929;hp=d773a5c1367df44113d9392ef8e44a2e4a53a38a;hpb=4e86ec7042631d4b54876cba89c01a73abaf7213;p=pulseview.git

diff --git a/pv/views/trace/standardbar.cpp b/pv/views/trace/standardbar.cpp
index d773a5c..65f9ae3 100644
--- a/pv/views/trace/standardbar.cpp
+++ b/pv/views/trace/standardbar.cpp
@@ -89,9 +89,18 @@ StandardBar::StandardBar(Session &session, QWidget *parent,
 	segment_selector_->hide();
 	connect(&session_, SIGNAL(new_segment(int)),
 		this, SLOT(on_new_segment(int)));
+
 	connect(segment_selector_, SIGNAL(valueChanged(int)),
+		this, SLOT(on_segment_selected(int)));
+	connect(view_, SIGNAL(segment_changed(int)),
+		this, SLOT(on_segment_changed(int)));
+
+	connect(this, SIGNAL(segment_selected(int)),
 		view_, SLOT(on_segment_changed(int)));
 
+	connect(view_, SIGNAL(segment_display_mode_changed(bool)),
+		this, SLOT(on_segment_display_mode_changed(bool)));
+
 	connect(view_, SIGNAL(always_zoom_to_fit_changed(bool)),
 		this, SLOT(on_always_zoom_to_fit_changed(bool)));
 
@@ -125,6 +134,8 @@ void StandardBar::show_multi_segment_ui(const bool state)
 {
 	for (QAction* action : multi_segment_actions_)
 		action->setVisible(state);
+
+	on_segment_display_mode_changed(view_->segment_is_selectable());
 }
 
 QAction* StandardBar::action_view_zoom_in() const
@@ -190,11 +201,37 @@ void StandardBar::on_new_segment(int new_segment_id)
 {
 	if (new_segment_id > 1) {
 		show_multi_segment_ui(true);
-		segment_selector_->setMaximum(new_segment_id);
+		segment_selector_->setMaximum(new_segment_id + 1);
 	} else
 		show_multi_segment_ui(false);
 }
 
+void StandardBar::on_segment_changed(int segment_id)
+{
+	// This is called when the current segment was changed
+	// by other parts of the UI, e.g. the view itself
+
+	// We need to adjust the value by 1 because internally, segments
+	// start at 0 while they start with 1 for the spinbox
+	segment_selector_->setValue(segment_id + 1);
+
+	segment_selected(segment_id);
+}
+
+void StandardBar::on_segment_selected(int ui_segment_id)
+{
+	// This is called when the user selected a segment using the spin box
+
+	// We need to adjust the value by 1 because internally, segments
+	// start at 0 while they start with 1 for the spinbox
+	segment_selected(ui_segment_id - 1);
+}
+
+void StandardBar::on_segment_display_mode_changed(bool segment_selectable)
+{
+	segment_selector_->setReadOnly(!segment_selectable);
+}
+
 } // namespace trace
 } // namespace views
 } // namespace pv