X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fstandardbar.cpp;h=9d4d0e4add5fca735778b0d9fd2bbf2feeeada4a;hb=8c3397413149b87d2755494fe73186f27edab369;hp=bc2c3ba8a3cb9380710eb7462d51663a9987eca8;hpb=f23c46921d031dba4c96062164cc9f3ca3c4809c;p=pulseview.git

diff --git a/pv/views/trace/standardbar.cpp b/pv/views/trace/standardbar.cpp
index bc2c3ba8..9d4d0e4a 100644
--- a/pv/views/trace/standardbar.cpp
+++ b/pv/views/trace/standardbar.cpp
@@ -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,25 @@ 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(&session_, SIGNAL(segment_completed(int)),
+		view_, SLOT(on_segment_completed(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)));
 
@@ -105,6 +125,20 @@ 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);
+
+	on_segment_display_mode_changed(view_->segment_is_selectable());
 }
 
 QAction* StandardBar::action_view_zoom_in() const
@@ -166,6 +200,41 @@ 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 > 0) {
+		show_multi_segment_ui(true);
+		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