X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fstandardbar.cpp;h=35b87be51b904869c7720276675477805e53a6eb;hp=1a77edaa7594f7546a6d582114e44b78435f84e0;hb=e4e5a958507a2c4e2643f21e3c735021da97e577;hpb=3432032fbc693b58a0c65427c025b9553c419237 diff --git a/pv/views/trace/standardbar.cpp b/pv/views/trace/standardbar.cpp index 1a77edaa..35b87be5 100644 --- a/pv/views/trace/standardbar.cpp +++ b/pv/views/trace/standardbar.cpp @@ -22,11 +22,11 @@ #include #include "standardbar.hpp" +#include "view.hpp" #include -#include -using pv::views::TraceView::View; +using pv::views::trace::View; namespace pv { namespace views { @@ -42,7 +42,12 @@ 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_display_mode_selector_(new QToolButton(this)), + action_sdm_last_(new QAction(this)), + action_sdm_last_complete_(new QAction(this)), + action_sdm_single_(new QAction(this)), + segment_selector_(new QSpinBox(this)) { setObjectName(QString::fromUtf8("StandardBar")); @@ -78,16 +83,59 @@ 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")); + action_sdm_last_->setIcon(QIcon(":/icons/view-displaymode-last_segment.svg")); + action_sdm_last_->setText(tr("Display last segment only")); + connect(action_sdm_last_, SIGNAL(triggered(bool)), + this, SLOT(on_actionSDMLast_triggered())); + + action_sdm_last_complete_->setIcon(QIcon(":/icons/view-displaymode-last_complete_segment.svg")); + action_sdm_last_complete_->setText(tr("Display last complete segment only")); + connect(action_sdm_last_complete_, SIGNAL(triggered(bool)), + this, SLOT(on_actionSDMLastComplete_triggered())); + + action_sdm_single_->setIcon(QIcon(":/icons/view-displaymode-single_segment.svg")); + action_sdm_single_->setText(tr("Display a single segment")); + connect(action_view_show_cursors_, SIGNAL(triggered(bool)), + this, SLOT(on_actionSDMSingle_triggered())); + + segment_display_mode_selector_->addAction(action_sdm_last_); + segment_display_mode_selector_->addAction(action_sdm_last_complete_); + segment_display_mode_selector_->addAction(action_sdm_single_); + segment_display_mode_selector_->setPopupMode(QToolButton::InstantPopup); + segment_display_mode_selector_->hide(); + + 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(int, bool)), + this, SLOT(on_segment_display_mode_changed(int, bool))); + connect(view_, SIGNAL(always_zoom_to_fit_changed(bool)), this, SLOT(on_always_zoom_to_fit_changed(bool))); + connect(view_, SIGNAL(cursor_state_changed(bool)), + this, SLOT(on_cursor_state_changed(bool))); + if (add_default_widgets) add_toolbar_widgets(); } @@ -106,6 +154,22 @@ 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_display_mode_selector_)); + 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_display_mode(), + view_->segment_is_selectable()); } QAction* StandardBar::action_view_zoom_in() const @@ -155,18 +219,104 @@ void StandardBar::on_actionViewZoomOneToOne_triggered() void StandardBar::on_actionViewShowCursors_triggered() { - const bool show = !view_->cursors_shown(); + const bool show = action_view_show_cursors_->isChecked(); + if (show) view_->centre_cursors(); view_->show_cursors(show); } +void StandardBar::on_actionSDMLast_triggered() +{ + view_->set_segment_display_mode(Trace::ShowLastSegmentOnly); +} + +void StandardBar::on_actionSDMLastComplete_triggered() +{ + view_->set_segment_display_mode(Trace::ShowLastCompleteSegmentOnly); +} + +void StandardBar::on_actionSDMSingle_triggered() +{ + view_->set_segment_display_mode(Trace::ShowSingleSegmentOnly); +} + 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) +{ + // We need to adjust the value by 1 because internally, segments + // start at 0 while they start with 1 for the spinbox + const uint32_t ui_segment_id = segment_id + 1; + + // This is called when the current segment was changed + // by other parts of the UI, e.g. the view itself + + // Make sure our value isn't limited by a too low maximum + // Note: this can happen if on_segment_changed() is called before + // on_new_segment() + if ((uint32_t)segment_selector_->maximum() < ui_segment_id) + segment_selector_->setMaximum(ui_segment_id); + + segment_selector_->setValue(ui_segment_id); +} + +void StandardBar::on_segment_selected(int ui_segment_id) +{ + // We need to adjust the value by 1 because internally, segments + // start at 0 while they start with 1 for the spinbox + const uint32_t segment_id = ui_segment_id - 1; + + // This is called when the user selected a segment using the spin box + // or when the value of the spinbox was assigned a new value. Since we + // only care about the former, we filter out the latter: + if (segment_id == view_->current_segment()) + return; + + // No matter which segment display mode we were in, we now show a single segment + if (view_->segment_display_mode() != Trace::ShowSingleSegmentOnly) + on_actionSDMSingle_triggered(); + + segment_selected(segment_id); +} + +void StandardBar::on_segment_display_mode_changed(int mode, bool segment_selectable) +{ + segment_selector_->setReadOnly(!segment_selectable); + + switch ((Trace::SegmentDisplayMode)mode) { + case Trace::ShowLastSegmentOnly: + segment_display_mode_selector_->setDefaultAction(action_sdm_last_); + break; + case Trace::ShowLastCompleteSegmentOnly: + segment_display_mode_selector_->setDefaultAction(action_sdm_last_complete_); + break; + case Trace::ShowSingleSegmentOnly: + segment_display_mode_selector_->setDefaultAction(action_sdm_single_); + break; + default: + break; + } +} + +void StandardBar::on_cursor_state_changed(bool show) +{ + action_view_show_cursors_->setChecked(show); +} + } // namespace trace } // namespace views } // namespace pv