X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fstandardbar.cpp;h=382e9f31a347ec05de5ad468c5276110edd8142a;hp=9d4d0e4add5fca735778b0d9fd2bbf2feeeada4a;hb=89914a8657612761ff962ee973721a4872cda8d7;hpb=c6e0990ea76a4c8097fb3ad89627aec34eb912c4 diff --git a/pv/views/trace/standardbar.cpp b/pv/views/trace/standardbar.cpp index 9d4d0e4..382e9f3 100644 --- a/pv/views/trace/standardbar.cpp +++ b/pv/views/trace/standardbar.cpp @@ -43,6 +43,10 @@ StandardBar::StandardBar(Session &session, QWidget *parent, action_view_zoom_fit_(new QAction(this)), action_view_zoom_one_to_one_(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")); @@ -85,8 +89,30 @@ StandardBar::StandardBar(Session &session, QWidget *parent, 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))); @@ -101,8 +127,8 @@ StandardBar::StandardBar(Session &session, QWidget *parent, 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(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))); @@ -126,6 +152,7 @@ void StandardBar::add_toolbar_widgets() 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(); @@ -138,7 +165,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()); + on_segment_display_mode_changed(view_->segment_display_mode(), + view_->segment_is_selectable()); } QAction* StandardBar::action_view_zoom_in() const @@ -195,6 +223,21 @@ void StandardBar::on_actionViewShowCursors_triggered() 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); @@ -211,28 +254,58 @@ void StandardBar::on_new_segment(int new_segment_id) 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 - // 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); + // 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_selected(segment_id); + segment_selector_->setValue(ui_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); + 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(bool segment_selectable) +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; + } } } // namespace trace