X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=272dac234374c9f4e69e825100520e81010644d4;hp=6d28194bb87cbed491e00a3aa2bc21436e8976b3;hb=0fb9d6454c286869d71621b69515802903735057;hpb=c7b03d9daa9574bd633fbac2d5976716f58027f5 diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 6d28194b..272dac23 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -45,6 +45,8 @@ #include "mainwindow.hpp" #include "devicemanager.hpp" +#include "util.hpp" +#include "data/segment.hpp" #include "devices/hardwaredevice.hpp" #include "devices/inputfile.hpp" #include "devices/sessionfile.hpp" @@ -100,6 +102,7 @@ MainWindow::MainWindow(DeviceManager &device_manager, session_(device_manager), action_open_(new QAction(this)), action_save_as_(new QAction(this)), + action_save_selection_as_(new QAction(this)), action_connect_(new QAction(this)), action_quit_(new QAction(this)), action_view_zoom_in_(new QAction(this)), @@ -107,12 +110,15 @@ MainWindow::MainWindow(DeviceManager &device_manager, action_view_zoom_fit_(new QAction(this)), action_view_zoom_one_to_one_(new QAction(this)), action_view_sticky_scrolling_(new QAction(this)), + action_view_coloured_bg_(new QAction(this)), action_view_show_cursors_(new QAction(this)), action_about_(new QAction(this)) #ifdef ENABLE_DECODE , menu_decoders_add_(new pv::widgets::DecoderMenu(this, true)) #endif { + qRegisterMetaType("util::Timestamp"); + setup_ui(); restore_ui_settings(); if (open_file_name.empty()) @@ -131,6 +137,11 @@ QAction* MainWindow::action_save_as() const return action_save_as_; } +QAction* MainWindow::action_save_selection_as() const +{ + return action_save_selection_as_; +} + QAction* MainWindow::action_connect() const { return action_connect_; @@ -185,12 +196,11 @@ QMenu* MainWindow::menu_decoder_add() const void MainWindow::run_stop() { - switch(session_.get_capture_state()) { + switch (session_.get_capture_state()) { case Session::Stopped: session_.start_capture([&](QString message) { session_error("Capture failed", message); }); break; - case Session::AwaitingTrigger: case Session::Running: session_.stop_capture(); @@ -205,7 +215,7 @@ void MainWindow::select_device(shared_ptr device) session_.set_device(device); else session_.set_default_device(); - } catch(const QString &e) { + } catch (const QString &e) { QMessageBox msg(this); msg.setText(e); msg.setInformativeText(tr("Failed to Select Device")); @@ -215,7 +225,8 @@ void MainWindow::select_device(shared_ptr device) } } -void MainWindow::export_file(shared_ptr format) +void MainWindow::export_file(shared_ptr format, + bool selection_only) { using pv::dialogs::StoreProgress; @@ -225,6 +236,30 @@ void MainWindow::export_file(shared_ptr format) QSettings settings; const QString dir = settings.value(SettingSaveDirectory).toString(); + std::pair sample_range; + + // Selection only? Verify that the cursors are active and fetch their values + if (selection_only) { + if (!view_->cursors()->enabled()) { + show_session_error(tr("Missing Cursors"), tr("You need to set the " \ + "cursors before you can save the data enclosed by them " \ + "to a session file (e.g. using ALT-V - Show Cursors).")); + 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 = start_time.convert_to() * samplerate; + const uint64_t end_sample = end_time.convert_to() * samplerate; + + sample_range = std::make_pair(start_sample, end_sample); + } else { + sample_range = std::make_pair(0, 0); + } + // Construct the filter const vector exts = format->extensions(); QString filter = tr("%1 files ").arg( @@ -260,7 +295,7 @@ void MainWindow::export_file(shared_ptr format) } StoreProgress *dlg = new StoreProgress(file_name, format, options, - session_, this); + sample_range, session_, this); dlg->run(); } @@ -347,6 +382,13 @@ void MainWindow::setup_ui() action_save_as_->setObjectName(QString::fromUtf8("actionSaveAs")); menu_file->addAction(action_save_as_); + action_save_selection_as_->setText(tr("Save Selected &Range As...")); + action_save_selection_as_->setIcon(QIcon::fromTheme("document-save-as", + QIcon(":/icons/document-save-as.png"))); + action_save_selection_as_->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R)); + action_save_selection_as_->setObjectName(QString::fromUtf8("actionSaveSelectionAs")); + menu_file->addAction(action_save_selection_as_); + menu_file->addSeparator(); widgets::ExportMenu *menu_file_export = new widgets::ExportMenu(this, @@ -401,6 +443,7 @@ void MainWindow::setup_ui() QString::fromUtf8("actionViewZoomOut")); menu_view->addAction(action_view_zoom_out_); + action_view_zoom_fit_->setCheckable(true); action_view_zoom_fit_->setText(tr("Zoom to &Fit")); action_view_zoom_fit_->setIcon(QIcon::fromTheme("zoom-fit", QIcon(":/icons/zoom-fit.png"))); @@ -417,20 +460,30 @@ void MainWindow::setup_ui() QString::fromUtf8("actionViewZoomOneToOne")); menu_view->addAction(action_view_zoom_one_to_one_); - menu_file->addSeparator(); + menu_view->addSeparator(); action_view_sticky_scrolling_->setCheckable(true); action_view_sticky_scrolling_->setChecked(true); - action_view_sticky_scrolling_->setShortcut(QKeySequence(Qt::Key_R)); + action_view_sticky_scrolling_->setShortcut(QKeySequence(Qt::Key_S)); action_view_sticky_scrolling_->setObjectName( QString::fromUtf8("actionViewStickyScrolling")); - action_view_sticky_scrolling_->setText(tr("Sticky Sc&rolling")); + action_view_sticky_scrolling_->setText(tr("&Sticky Scrolling")); menu_view->addAction(action_view_sticky_scrolling_); view_->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked()); menu_view->addSeparator(); + action_view_coloured_bg_->setCheckable(true); + action_view_coloured_bg_->setChecked(true); + action_view_coloured_bg_->setShortcut(QKeySequence(Qt::Key_S)); + action_view_coloured_bg_->setObjectName( + QString::fromUtf8("actionViewColouredBg")); + action_view_coloured_bg_->setText(tr("Use &coloured backgrounds")); + menu_view->addAction(action_view_coloured_bg_); + + menu_view->addSeparator(); + action_view_show_cursors_->setCheckable(true); action_view_show_cursors_->setChecked(view_->cursors_shown()); action_view_show_cursors_->setIcon(QIcon::fromTheme("show-cursors", @@ -491,14 +544,19 @@ void MainWindow::setup_ui() SLOT(capture_state_changed(int))); connect(&session_, SIGNAL(device_selected()), this, SLOT(device_selected())); + connect(&session_, SIGNAL(trigger_event(util::Timestamp)), view_, + SLOT(trigger_event(util::Timestamp))); // Setup view_ events connect(view_, SIGNAL(sticky_scrolling_changed(bool)), this, SLOT(sticky_scrolling_changed(bool))); + connect(view_, SIGNAL(always_zoom_to_fit_changed(bool)), this, + SLOT(always_zoom_to_fit_changed(bool))); } -void MainWindow::select_init_device() { +void MainWindow::select_init_device() +{ QSettings settings; map dev_info; list key_list; @@ -530,7 +588,8 @@ void MainWindow::select_init_device() { } void MainWindow::load_init_file(const std::string &file_name, - const std::string &format) { + const std::string &format) +{ shared_ptr input_format; if (!format.empty()) { @@ -575,7 +634,6 @@ void MainWindow::save_ui_settings() session_.device()); for (string key : key_list) { - if (dev_info.count(key)) settings.setValue(QString::fromUtf8(key.c_str()), QString::fromUtf8(dev_info.at(key).c_str())); @@ -621,7 +679,6 @@ void MainWindow::load_file(QString file_name, { const QString errorMessage( QString("Failed to load file %1").arg(file_name)); - const QString infoMessage; try { if (format) @@ -635,7 +692,7 @@ void MainWindow::load_file(QString file_name, new devices::SessionFile( device_manager_.context(), file_name.toStdString()))); - } catch(Error e) { + } catch (Error e) { show_session_error(tr("Failed to load ") + file_name, e.what()); session_.set_default_device(); update_device_list(); @@ -644,7 +701,7 @@ void MainWindow::load_file(QString file_name, update_device_list(); - session_.start_capture([&, errorMessage, infoMessage](QString) { + session_.start_capture([&, errorMessage](QString infoMessage) { session_error(errorMessage, infoMessage); }); } @@ -698,6 +755,11 @@ void MainWindow::on_actionSaveAs_triggered() export_file(device_manager_.context()->output_formats()["srzip"]); } +void MainWindow::on_actionSaveSelectionAs_triggered() +{ + export_file(device_manager_.context()->output_formats()["srzip"], true); +} + void MainWindow::on_actionConnect_triggered() { // Stop any currently running capture session @@ -730,7 +792,7 @@ void MainWindow::on_actionViewZoomOut_triggered() void MainWindow::on_actionViewZoomFit_triggered() { - view_->zoom_fit(); + view_->zoom_fit(action_view_zoom_fit_->isChecked()); } void MainWindow::on_actionViewZoomOneToOne_triggered() @@ -743,12 +805,16 @@ void MainWindow::on_actionViewStickyScrolling_triggered() view_->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked()); } +void MainWindow::on_actionViewColouredBg_triggered() +{ +} + void MainWindow::on_actionViewShowCursors_triggered() { assert(view_); const bool show = !view_->cursors_shown(); - if(show) + if (show) view_->centre_cursors(); view_->show_cursors(show); @@ -765,6 +831,11 @@ void MainWindow::sticky_scrolling_changed(bool state) action_view_sticky_scrolling_->setChecked(state); } +void MainWindow::always_zoom_to_fit_changed(bool state) +{ + action_view_zoom_fit_->setChecked(state); +} + void MainWindow::add_decoder(srd_decoder *decoder) { #ifdef ENABLE_DECODE