X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fstandardbar.cpp;h=9d4d0e4add5fca735778b0d9fd2bbf2feeeada4a;hb=558ad6ceb934ab7406d286c1a4ae08da4aba1448;hp=e2d6f3e2b540c7d201208329f6a3958b6ec7b29d;hpb=526c8c00a61aa5f6ac7e3ee56991db957b45828d;p=pulseview.git

diff --git a/pv/views/trace/standardbar.cpp b/pv/views/trace/standardbar.cpp
index e2d6f3e..9d4d0e4 100644
--- a/pv/views/trace/standardbar.cpp
+++ b/pv/views/trace/standardbar.cpp
@@ -87,11 +87,23 @@ StandardBar::StandardBar(Session &session, QWidget *parent,
 
 	segment_selector_->setMinimum(1);
 	segment_selector_->hide();
-	connect(&session_, SIGNAL(frame_ended()),
-		this, SLOT(on_segment_added()));
+	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)));
 
@@ -125,6 +137,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
@@ -186,17 +200,41 @@ 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 > 0) {
 		show_multi_segment_ui(true);
-		segment_selector_->setMaximum(segment_count);
+		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