X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fstandardbar.cpp;h=6363e2ec6fcc9717e92dfc3a327713836d5b93eb;hb=7daebd054e65a244dce36933cbf173b8d7532a09;hp=fa04c8e2318bf40e63f896abc8b345509e7ecbc2;hpb=7f9654641c096b303fc30b710335e235b9738ce9;p=pulseview.git

diff --git a/pv/views/trace/standardbar.cpp b/pv/views/trace/standardbar.cpp
index fa04c8e2..6363e2ec 100644
--- a/pv/views/trace/standardbar.cpp
+++ b/pv/views/trace/standardbar.cpp
@@ -86,8 +86,15 @@ StandardBar::StandardBar(Session &session, QWidget *parent,
 	action_view_show_cursors_->setText(tr("Show &Cursors"));
 
 	segment_selector_->setMinimum(1);
-	connect(&session_, SIGNAL(frame_ended()),
-		this, SLOT(on_segment_added()));
+	segment_selector_->hide();
+	connect(&session_, SIGNAL(new_segment(int)),
+		this, SLOT(on_new_segment(int)));
+	connect(segment_selector_, SIGNAL(valueChanged(int)),
+		view_, SLOT(on_segment_changed(int)));
+	connect(view_, SIGNAL(segment_changed(int)),
+		this, 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)));
@@ -122,6 +129,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
@@ -183,17 +192,27 @@ void StandardBar::on_always_zoom_to_fit_changed(bool state)
 	action_view_zoom_fit_->setChecked(state);
 }
 
-void StandardBar::on_segment_added()
+void StandardBar::on_new_segment(int new_segment_id)
 {
-	const int segment_count = session_.get_segment_count();
-
-	if (segment_count > 1) {
+	if (new_segment_id > 1) {
 		show_multi_segment_ui(true);
-		segment_selector_->setMaximum(segment_count);
+		segment_selector_->setMaximum(new_segment_id);
 	} 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
+	segment_selector_->setValue(segment_id);
+}
+
+void StandardBar::on_segment_display_mode_changed(bool segment_selectable)
+{
+	segment_selector_->setReadOnly(!segment_selectable);
+}
+
 } // namespace trace
 } // namespace views
 } // namespace pv