View: Fixes related to multi-segment display

[pulseview.git] / pv / views / trace / standardbar.cpp

diff --git a/pv/views/trace/standardbar.cpp b/pv/views/trace/standardbar.cpp
index fa04c8e2318bf40e63f896abc8b345509e7ecbc2..65f9ae3e684d57434667ed4c48666a6cc3cf30bf 100644 (file)
--- a/pv/views/trace/standardbar.cpp
+++ b/pv/views/trace/standardbar.cpp
@@ -86,8 +86,20 @@ 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)),
+               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)));
@@ -122,6 +134,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 +197,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 > 1) {
                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