Drop unneeded /* ENABLE_DECODE */ comments.

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 0fef1bdabf1ec525c897f0a72f4e0f6860504d24..f907f09cce33f118b0c830dbc0ee564f50a76501 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -27,6 +27,8 @@
 #include <algorithm>
 #include <iterator>
 
+#include <boost/algorithm/string/join.hpp>
+
 #include <QAction>
 #include <QApplication>
 #include <QButtonGroup>
@@ -45,10 +47,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
@@ -64,10 +68,14 @@ using std::list;
 using std::map;
 using std::shared_ptr;
 using std::string;
+using std::vector;
+
+using boost::algorithm::join;
 
 using sigrok::Device;
 using sigrok::Error;
 using sigrok::HardwareDevice;
+using sigrok::OutputFormat;
 
 namespace pv {
 
@@ -93,8 +101,10 @@ MainWindow::MainWindow(DeviceManager &device_manager,
        action_view_zoom_fit_(new QAction(this)),
        action_view_zoom_one_to_one_(new QAction(this)),
        action_view_show_cursors_(new QAction(this)),
-       action_about_(new QAction(this)),
-       menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
+       action_about_(new QAction(this))
+#ifdef ENABLE_DECODE
+       , menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
+#endif
 {
        setup_ui();
        restore_ui_settings();
@@ -156,10 +166,12 @@ QAction* MainWindow::action_about() const
        return action_about_;
 }
 
+#ifdef ENABLE_DECODE
 QMenu* MainWindow::menu_decoder_add() const
 {
        return menu_decoders_add_;
 }
+#endif
 
 void MainWindow::run_stop()
 {
@@ -190,6 +202,55 @@ 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();
+
+       // Construct the filter
+       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"));
+
+       // Show the file dialog
+       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();
+       }
+
+       StoreProgress *dlg = new StoreProgress(file_name, format, options,
+               session_, this);
+       dlg->run();
+}
+
 void MainWindow::setup_ui()
 {
        setObjectName(QString::fromUtf8("MainWindow"));
@@ -234,6 +295,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_);
@@ -326,7 +397,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
@@ -509,26 +580,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()