Fix #685 by adding a special T marker when SR_DT_TRIGGER arrives

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 195c460a1de90f3aea20b3fb4af9745a6a34103b..dad9d680241ad4d59f4352c6dd80863d13b73cbd 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -116,6 +116,8 @@ MainWindow::MainWindow(DeviceManager &device_manager,
        , menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
 #endif
 {
+       qRegisterMetaType<util::Timestamp>("util::Timestamp");
+
        setup_ui();
        restore_ui_settings();
        if (open_file_name.empty())
@@ -134,6 +136,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_;
@@ -218,7 +225,8 @@ void MainWindow::select_device(shared_ptr<devices::Device> device)
        }
 }
 
-void MainWindow::export_file(shared_ptr<OutputFormat> format)
+void MainWindow::export_file(shared_ptr<OutputFormat> format,
+       bool selection_only)
 {
        using pv::dialogs::StoreProgress;
 
@@ -228,6 +236,30 @@ void MainWindow::export_file(shared_ptr<OutputFormat> format)
        QSettings settings;
        const QString dir = settings.value(SettingSaveDirectory).toString();
 
+       std::pair<uint64_t, uint64_t> 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<double>() * samplerate;
+               const uint64_t end_sample = end_time.convert_to<double>() * samplerate;
+
+               sample_range = std::make_pair(start_sample, end_sample);
+       } else {
+               sample_range = std::make_pair(0, 0);
+       }
+
        // Construct the filter
        const vector<string> exts = format->extensions();
        QString filter = tr("%1 files ").arg(
@@ -262,8 +294,6 @@ void MainWindow::export_file(shared_ptr<OutputFormat> format)
                options = dlg.options();
        }
 
-       const std::pair<uint64_t, uint64_t> sample_range = std::make_pair(0, 0);
-
        StoreProgress *dlg = new StoreProgress(file_name, format, options,
                sample_range, session_, this);
        dlg->run();
@@ -504,12 +534,15 @@ 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() {
@@ -661,87 +694,6 @@ void MainWindow::load_file(QString file_name,
                session_error(errorMessage, infoMessage); });
 }
 
-void MainWindow::save_selection_to_file()
-{
-       // Stop any currently running capture session
-       session_.stop_capture();
-
-       // Get sample rate
-       double samplerate = 0.0;
-
-       for (const shared_ptr<pv::data::SignalData> d : session_.get_data()) {
-               assert(d);
-               const vector< shared_ptr<pv::data::Segment> > segments =
-                       d->segments();
-               for (const shared_ptr<pv::data::Segment> &s : segments)
-                       samplerate = std::max(samplerate, s->samplerate());
-       }
-
-       if (samplerate == 0.0)
-               samplerate = 1;
-
-       // Verify that the cursors are active and fetch their values
-       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 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<double>() * samplerate;
-    const uint64_t end_sample = end_time.convert_to<double>() * samplerate;
-
-       const std::pair<uint64_t, uint64_t> sample_range =
-                       std::make_pair(start_sample, end_sample);
-
-       // Ask for output file name
-       QSettings settings;
-       const QString dir = settings.value(SettingSaveDirectory).toString();
-
-       shared_ptr<OutputFormat> format =
-                       device_manager_.context()->output_formats()["srzip"];
-
-       const vector<string> exts = format->extensions();
-       QString filter = tr("%1 files ").arg(
-               QString::fromStdString(format->description()));
-
-       if (exts.empty())
-               filter += "(*.*)";
-       else
-               filter += QString("(*.%1);;%2 (*.*)").arg(
-                       QString::fromStdString(join(exts, ", *."))).arg(
-                       tr("All Files"));
-
-       const QString file_name = QFileDialog::getSaveFileName(
-               this, tr("Save File"), dir, filter);
-
-       if (file_name.isEmpty())
-               return;
-
-       const QString abs_path = QFileInfo(file_name).absolutePath();
-       settings.setValue(SettingSaveDirectory, abs_path);
-
-       // Show the options dialog
-       map<string, Glib::VariantBase> options;
-       if (!format->options().empty()) {
-               dialogs::InputOutputOptions dlg(
-                       tr("Export %1").arg(QString::fromStdString(
-                               format->description())),
-                       format->options(), this);
-               if (!dlg.exec())
-                       return;
-               options = dlg.options();
-       }
-
-       // Save
-       pv::dialogs::StoreProgress *dlg = new pv::dialogs::StoreProgress(file_name,
-               format, options, sample_range, session_, this);
-       dlg->run();
-}
-
 void MainWindow::closeEvent(QCloseEvent *event)
 {
        save_ui_settings();
@@ -794,7 +746,7 @@ void MainWindow::on_actionSaveAs_triggered()
 
 void MainWindow::on_actionSaveSelectionAs_triggered()
 {
-       save_selection_to_file();
+       export_file(device_manager_.context()->output_formats()["srzip"], true);
 }
 
 void MainWindow::on_actionConnect_triggered()