Added pv::dialogs::InputOutputOptions

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 21b66b534f59119b492b6be69bb049c094389768..81112aba805ffa688fbef84bc91708c38ab569b6 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -45,10 +45,12 @@
 #include "devicemanager.hpp"
 #include "dialogs/about.hpp"
 #include "dialogs/connect.hpp"
+#include "dialogs/inputoutputoptions.hpp"
 #include "dialogs/storeprogress.hpp"
 #include "toolbars/mainbar.hpp"
 #include "view/logicsignal.hpp"
 #include "view/view.hpp"
+#include "widgets/exportmenu.hpp"
 #ifdef ENABLE_DECODE
 #include "widgets/decodermenu.hpp"
 #endif
@@ -58,7 +60,7 @@
 #include <stdint.h>
 #include <stdarg.h>
 #include <glib.h>
-#include <libsigrok/libsigrok.hpp>
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
 using std::list;
 using std::map;
@@ -68,6 +70,7 @@ using std::string;
 using sigrok::Device;
 using sigrok::Error;
 using sigrok::HardwareDevice;
+using sigrok::OutputFormat;
 
 namespace pv {
 
@@ -190,14 +193,51 @@ void MainWindow::select_device(shared_ptr<Device> device)
        }
 }
 
+void MainWindow::export_file(shared_ptr<OutputFormat> format)
+{
+       using pv::dialogs::StoreProgress;
+
+       // Stop any currently running capture session
+       session_.stop_capture();
+
+       QSettings settings;
+       const QString dir = settings.value(SettingSaveDirectory).toString();
+
+       // Show the file dialog
+       const QString file_name = QFileDialog::getSaveFileName(
+               this, tr("Save File"), dir, tr("%1 files (*.*)").arg(
+                       QString::fromStdString(format->description())));
+
+       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();
+       }
+
+       StoreProgress *dlg = new StoreProgress(file_name, format, options,
+               session_, this);
+       dlg->run();
+}
+
 void MainWindow::setup_ui()
 {
        setObjectName(QString::fromUtf8("MainWindow"));
 
        // Set the window icon
        QIcon icon;
-       icon.addFile(QString::fromUtf8(":/icons/sigrok-logo-notext.png"),
-               QSize(), QIcon::Normal, QIcon::Off);
+       icon.addFile(QString(":/icons/sigrok-logo-notext.svg"));
        setWindowIcon(icon);
 
        // Setup the central widget
@@ -235,6 +275,16 @@ void MainWindow::setup_ui()
 
        menu_file->addSeparator();
 
+       widgets::ExportMenu *menu_file_export = new widgets::ExportMenu(this,
+               device_manager_.context());
+       menu_file_export->setTitle(tr("&Export"));
+       connect(menu_file_export,
+               SIGNAL(format_selected(std::shared_ptr<sigrok::OutputFormat>)),
+               this, SLOT(export_file(std::shared_ptr<sigrok::OutputFormat>)));
+       menu_file->addAction(menu_file_export->menuAction());
+
+       menu_file->addSeparator();
+
        action_connect_->setText(tr("&Connect to Device..."));
        action_connect_->setObjectName(QString::fromUtf8("actionConnect"));
        menu_file->addAction(action_connect_);
@@ -327,7 +377,7 @@ void MainWindow::setup_ui()
        setMenuBar(menu_bar);
        QMetaObject::connectSlotsByName(this);
 
-       // Setup the sampling bar
+       // Setup the toolbar
        main_bar_ = new toolbars::MainBar(session_, *this);
 
        // Populate the device list and select the initially selected device
@@ -464,7 +514,7 @@ void MainWindow::load_file(QString file_name)
        const QString infoMessage;
 
        try {
-               session_.set_file(file_name.toStdString());
+               session_.set_session_file(file_name.toStdString());
        } catch(Error e) {
                show_session_error(tr("Failed to load ") + file_name, e.what());
                session_.set_default_device();
@@ -510,26 +560,7 @@ void MainWindow::on_actionOpen_triggered()
 
 void MainWindow::on_actionSaveAs_triggered()
 {
-       using pv::dialogs::StoreProgress;
-
-       // Stop any currently running capture session
-       session_.stop_capture();
-
-       QSettings settings;
-       const QString dir = settings.value(SettingSaveDirectory).toString();
-
-       // Show the dialog
-       const QString file_name = QFileDialog::getSaveFileName(
-               this, tr("Save File"), dir, tr("Sigrok Sessions (*.sr)"));
-
-       if (file_name.isEmpty())
-               return;
-
-       const QString abs_path = QFileInfo(file_name).absolutePath();
-       settings.setValue(SettingSaveDirectory, abs_path);
-
-       StoreProgress *dlg = new StoreProgress(file_name, session_, this);
-       dlg->run();
+       export_file(device_manager_.context()->output_formats()["srzip"]);
 }
 
 void MainWindow::on_actionConnect_triggered()