X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fviews%2Ftrace%2Fdecodetrace.cpp;h=65a2bf6c6a72f3e773b837e1941565bd7378012a;hp=dd964b5a7cc578cc208ac1e7a413f1b046fa9cb3;hb=a47b5a3fb9912f1d6e3fcc63d59ee6cc1b5338e2;hpb=5a914348e8c95f92fd7c1c5988d563c5fb472aa2 diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp index dd964b5a..65a2bf6c 100644 --- a/pv/views/trace/decodetrace.cpp +++ b/pv/views/trace/decodetrace.cpp @@ -21,7 +21,7 @@ extern "C" { #include } -#include +#include #include #include @@ -60,6 +60,7 @@ using std::abs; using std::make_pair; using std::max; using std::min; +using std::numeric_limits; using std::out_of_range; using std::pair; using std::shared_ptr; @@ -172,7 +173,7 @@ void DecodeTrace::paint_mid(QPainter &p, ViewItemPaintParams &pp) // Iterate through the rows int y = get_visual_y(); - pair sample_range = get_sample_range(pp.left(), pp.right()); + pair sample_range = get_view_sample_range(pp.left(), pp.right()); // Just because the view says we see a certain sample range it // doesn't mean we have this many decoded samples, too, so crop @@ -327,27 +328,61 @@ QMenu* DecodeTrace::create_header_context_menu(QWidget *parent) QMenu* DecodeTrace::create_view_context_menu(QWidget *parent, QPoint &click_pos) { + // Get entries from default menu before adding our own + QMenu *const menu = new QMenu(parent); + + QMenu* default_menu = Trace::create_view_context_menu(parent, click_pos); + if (default_menu) { + for (QAction *action : default_menu->actions()) { // clazy:exclude=range-loop + menu->addAction(action); + if (action->parent() == default_menu) + action->setParent(menu); + } + delete default_menu; + + // Add separator if needed + if (menu->actions().length() > 0) + menu->addSeparator(); + } + try { selected_row_ = &visible_rows_[get_row_at_point(click_pos)]; } catch (out_of_range&) { selected_row_ = nullptr; } + // Default sample range is "from here" const pair sample_range = - get_sample_range(click_pos.x(), click_pos.x() + 1); - selected_samplepos_ = sample_range.first; + get_view_sample_range(click_pos.x(), click_pos.x() + 1); + selected_sample_range_ = make_pair(sample_range.first, numeric_limits::max()); + + if (decode_signal_->is_paused()) { + QAction *const resume = + new QAction(tr("Resume decoding"), this); + resume->setIcon(QIcon::fromTheme("media-playback-start", + QIcon(":/icons/media-playback-start.png"))); + connect(resume, SIGNAL(triggered()), this, SLOT(on_pause_decode())); + menu->addAction(resume); + } else { + QAction *const pause = + new QAction(tr("Pause decoding"), this); + pause->setIcon(QIcon::fromTheme("media-playback-pause", + QIcon(":/icons/media-playback-pause.png"))); + connect(pause, SIGNAL(triggered()), this, SLOT(on_pause_decode())); + menu->addAction(pause); + } - QMenu *const menu = new QMenu(parent); + menu->addSeparator(); QAction *const export_all_rows = - new QAction(tr("Export all annotations"), this); + new QAction(tr("Export all annotations"), this); export_all_rows->setIcon(QIcon::fromTheme("document-save-as", QIcon(":/icons/document-save-as.png"))); connect(export_all_rows, SIGNAL(triggered()), this, SLOT(on_export_all_rows())); menu->addAction(export_all_rows); QAction *const export_row = - new QAction(tr("Export all annotations for this row"), this); + new QAction(tr("Export all annotations for this row"), this); export_row->setIcon(QIcon::fromTheme("document-save-as", QIcon(":/icons/document-save-as.png"))); connect(export_row, SIGNAL(triggered()), this, SLOT(on_export_row())); @@ -369,6 +404,30 @@ QMenu* DecodeTrace::create_view_context_menu(QWidget *parent, QPoint &click_pos) connect(export_row_from_here, SIGNAL(triggered()), this, SLOT(on_export_row_from_here())); menu->addAction(export_row_from_here); + menu->addSeparator(); + + QAction *const export_all_rows_with_cursor = + new QAction(tr("Export all annotations within cursor range"), this); + export_all_rows_with_cursor->setIcon(QIcon::fromTheme("document-save-as", + QIcon(":/icons/document-save-as.png"))); + connect(export_all_rows_with_cursor, SIGNAL(triggered()), this, SLOT(on_export_all_rows_with_cursor())); + menu->addAction(export_all_rows_with_cursor); + + QAction *const export_row_with_cursor = + new QAction(tr("Export annotations for this row within cursor range"), this); + export_row_with_cursor->setIcon(QIcon::fromTheme("document-save-as", + QIcon(":/icons/document-save-as.png"))); + connect(export_row_with_cursor, SIGNAL(triggered()), this, SLOT(on_export_row_with_cursor())); + menu->addAction(export_row_with_cursor); + + const View *view = owner_->view(); + assert(view); + + if (!view->cursors()->enabled()) { + export_all_rows_with_cursor->setEnabled(false); + export_row_with_cursor->setEnabled(false); + } + return menu; } @@ -675,7 +734,7 @@ pair DecodeTrace::get_pixels_offset_samples_per_pixel() const return make_pair(pixels_offset, samplerate * scale); } -pair DecodeTrace::get_sample_range( +pair DecodeTrace::get_view_sample_range( int x_start, int x_end) const { double samples_per_pixel, pixels_offset; @@ -745,7 +804,7 @@ const QString DecodeTrace::get_annotation_at_point(const QPoint &point) return QString(); const pair sample_range = - get_sample_range(point.x(), point.x() + 1); + get_view_sample_range(point.x(), point.x() + 1); const int row = get_row_at_point(point); if (row < 0) return QString(); @@ -840,7 +899,7 @@ void DecodeTrace::create_decoder_form(int index, const vector channels = decode_signal_->get_channels(); // Add the channels - for (DecodeChannel ch : channels) { + for (const DecodeChannel& ch : channels) { // Ignore channels not part of the decoder we create the form for if (ch.decoder_ != dec) continue; @@ -977,8 +1036,7 @@ void DecodeTrace::export_annotations(vector *annotations) const } QMessageBox msg(owner_->view()); - msg.setText(tr("Error")); - msg.setInformativeText(tr("File %1 could not be written to.").arg(file_name)); + msg.setText(tr("Error") + "\n\n" + tr("File %1 could not be written to.").arg(file_name)); msg.setStandardButtons(QMessageBox::Ok); msg.setIcon(QMessageBox::Warning); msg.exec(); @@ -1011,6 +1069,14 @@ void DecodeTrace::on_decode_finished() owner_->row_item_appearance_changed(false, true); } +void DecodeTrace::on_pause_decode() +{ + if (decode_signal_->is_paused()) + decode_signal_->resume_decode(); + else + decode_signal_->pause_decode(); +} + void DecodeTrace::delete_pressed() { on_delete(); @@ -1092,13 +1158,65 @@ void DecodeTrace::on_show_hide_decoder(int index) void DecodeTrace::on_export_row() { - selected_samplepos_ = 0; + selected_sample_range_ = make_pair(0, numeric_limits::max()); on_export_row_from_here(); } void DecodeTrace::on_export_all_rows() { - selected_samplepos_ = 0; + selected_sample_range_ = make_pair(0, numeric_limits::max()); + on_export_all_rows_from_here(); +} + +void DecodeTrace::on_export_row_with_cursor() +{ + const View *view = owner_->view(); + assert(view); + + if (!view->cursors()->enabled()) + return; + + const double samplerate = session_.get_samplerate(); + + const pv::util::Timestamp& start_time = view->cursors()->first()->time(); + const pv::util::Timestamp& end_time = view->cursors()->second()->time(); + + const uint64_t start_sample = (uint64_t)max( + 0.0, start_time.convert_to() * samplerate); + const uint64_t end_sample = (uint64_t)max( + 0.0, end_time.convert_to() * samplerate); + + // Are both cursors negative and thus were clamped to 0? + if ((start_sample == 0) && (end_sample == 0)) + return; + + selected_sample_range_ = make_pair(start_sample, end_sample); + on_export_row_from_here(); +} + +void DecodeTrace::on_export_all_rows_with_cursor() +{ + const View *view = owner_->view(); + assert(view); + + if (!view->cursors()->enabled()) + return; + + const double samplerate = session_.get_samplerate(); + + const pv::util::Timestamp& start_time = view->cursors()->first()->time(); + const pv::util::Timestamp& end_time = view->cursors()->second()->time(); + + const uint64_t start_sample = (uint64_t)max( + 0.0, start_time.convert_to() * samplerate); + const uint64_t end_sample = (uint64_t)max( + 0.0, end_time.convert_to() * samplerate); + + // Are both cursors negative and thus were clamped to 0? + if ((start_sample == 0) && (end_sample == 0)) + return; + + selected_sample_range_ = make_pair(start_sample, end_sample); on_export_all_rows_from_here(); } @@ -1112,7 +1230,7 @@ void DecodeTrace::on_export_row_from_here() vector *annotations = new vector(); decode_signal_->get_annotation_subset(*annotations, *selected_row_, - current_segment_, selected_samplepos_, ULLONG_MAX); + current_segment_, selected_sample_range_.first, selected_sample_range_.second); if (annotations->empty()) return; @@ -1128,7 +1246,7 @@ void DecodeTrace::on_export_all_rows_from_here() vector *annotations = new vector(); decode_signal_->get_annotation_subset(*annotations, current_segment_, - selected_samplepos_, ULLONG_MAX); + selected_sample_range_.first, selected_sample_range_.second); if (!annotations->empty()) export_annotations(annotations);