X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fstandardbar.cpp;h=d773a5c1367df44113d9392ef8e44a2e4a53a38a;hp=fa02d1677d7cad4de0473571ddb20058d4bcc9c1;hb=4e86ec7042631d4b54876cba89c01a73abaf7213;hpb=1573bf16ba50d1c023ad3a9ce596f0ab6eaeacff

diff --git a/pv/views/trace/standardbar.cpp b/pv/views/trace/standardbar.cpp
index fa02d167..d773a5c1 100644
--- a/pv/views/trace/standardbar.cpp
+++ b/pv/views/trace/standardbar.cpp
@@ -26,7 +26,7 @@
 
 #include <pv/mainwindow.hpp>
 
-using pv::views::TraceView::View;
+using pv::views::trace::View;
 
 namespace pv {
 namespace views {
@@ -42,7 +42,8 @@ StandardBar::StandardBar(Session &session, QWidget *parent,
 	action_view_zoom_out_(new QAction(this)),
 	action_view_zoom_fit_(new QAction(this)),
 	action_view_zoom_one_to_one_(new QAction(this)),
-	action_view_show_cursors_(new QAction(this))
+	action_view_show_cursors_(new QAction(this)),
+	segment_selector_(new QSpinBox(this))
 {
 	setObjectName(QString::fromUtf8("StandardBar"));
 
@@ -84,6 +85,13 @@ StandardBar::StandardBar(Session &session, QWidget *parent,
 		this, SLOT(on_actionViewShowCursors_triggered()));
 	action_view_show_cursors_->setText(tr("Show &Cursors"));
 
+	segment_selector_->setMinimum(1);
+	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(always_zoom_to_fit_changed(bool)),
 		this, SLOT(on_always_zoom_to_fit_changed(bool)));
 
@@ -105,6 +113,18 @@ void StandardBar::add_toolbar_widgets()
 	addAction(action_view_zoom_one_to_one_);
 	addSeparator();
 	addAction(action_view_show_cursors_);
+	multi_segment_actions_.push_back(addSeparator());
+	multi_segment_actions_.push_back(addWidget(segment_selector_));
+	addSeparator();
+
+	// Hide the multi-segment UI until we know that there are multiple segments
+	show_multi_segment_ui(false);
+}
+
+void StandardBar::show_multi_segment_ui(const bool state)
+{
+	for (QAction* action : multi_segment_actions_)
+		action->setVisible(state);
 }
 
 QAction* StandardBar::action_view_zoom_in() const
@@ -166,6 +186,15 @@ void StandardBar::on_always_zoom_to_fit_changed(bool state)
 	action_view_zoom_fit_->setChecked(state);
 }
 
+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);
+	} else
+		show_multi_segment_ui(false);
+}
+
 } // namespace trace
 } // namespace views
 } // namespace pv