X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fstandardbar.cpp;h=6363e2ec6fcc9717e92dfc3a327713836d5b93eb;hb=7daebd054e65a244dce36933cbf173b8d7532a09;hp=1a77edaa7594f7546a6d582114e44b78435f84e0;hpb=3432032fbc693b58a0c65427c025b9553c419237;p=pulseview.git

diff --git a/pv/views/trace/standardbar.cpp b/pv/views/trace/standardbar.cpp
index 1a77eda..6363e2e 100644
--- a/pv/views/trace/standardbar.cpp
+++ b/pv/views/trace/standardbar.cpp
@@ -22,11 +22,11 @@
 #include <QMessageBox>
 
 #include "standardbar.hpp"
+#include "view.hpp"
 
 #include <pv/mainwindow.hpp>
-#include <pv/view/view.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"));
 
@@ -78,13 +79,23 @@ StandardBar::StandardBar(Session &session, QWidget *parent,
 		this, SLOT(on_actionViewZoomOneToOne_triggered()));
 
 	action_view_show_cursors_->setCheckable(true);
-	action_view_show_cursors_->setIcon(QIcon::fromTheme("show-cursors",
-		QIcon(":/icons/show-cursors.svg")));
+	action_view_show_cursors_->setIcon(QIcon(":/icons/show-cursors.svg"));
 	action_view_show_cursors_->setShortcut(QKeySequence(Qt::Key_C));
 	connect(action_view_show_cursors_, SIGNAL(triggered(bool)),
 		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(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)));
 
@@ -106,6 +117,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
@@ -167,6 +192,27 @@ 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);
+}
+
+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