]> sigrok.org Git - pulseview.git/blobdiff - pv/mainwindow.cpp
Fix #592 completely by showing the actual error message
[pulseview.git] / pv / mainwindow.cpp
index ac5372a6f46d295468699ca95460cbab647720ef..8b32046a6e8d3db5aa3ccdfce967bf7022fc3a25 100644 (file)
@@ -46,6 +46,7 @@
 
 #include "devicemanager.hpp"
 #include "devices/hardwaredevice.hpp"
+#include "devices/inputfile.hpp"
 #include "devices/sessionfile.hpp"
 #include "dialogs/about.hpp"
 #include "dialogs/connect.hpp"
@@ -55,6 +56,7 @@
 #include "view/logicsignal.hpp"
 #include "view/view.hpp"
 #include "widgets/exportmenu.hpp"
+#include "widgets/importmenu.hpp"
 #ifdef ENABLE_DECODE
 #include "widgets/decodermenu.hpp"
 #endif
 #include <glib.h>
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
+using std::cerr;
+using std::endl;
 using std::list;
 using std::map;
+using std::pair;
 using std::shared_ptr;
 using std::string;
 using std::vector;
@@ -76,6 +81,7 @@ using boost::algorithm::join;
 
 using sigrok::Error;
 using sigrok::OutputFormat;
+using sigrok::InputFormat;
 
 namespace pv {
 
@@ -87,7 +93,7 @@ const char *MainWindow::SettingOpenDirectory = "MainWindow/OpenDirectory";
 const char *MainWindow::SettingSaveDirectory = "MainWindow/SaveDirectory";
 
 MainWindow::MainWindow(DeviceManager &device_manager,
-       const char *open_file_name,
+       string open_file_name, string open_file_format,
        QWidget *parent) :
        QMainWindow(parent),
        device_manager_(device_manager),
@@ -100,6 +106,7 @@ MainWindow::MainWindow(DeviceManager &device_manager,
        action_view_zoom_out_(new QAction(this)),
        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_show_cursors_(new QAction(this)),
        action_about_(new QAction(this))
 #ifdef ENABLE_DECODE
@@ -108,12 +115,10 @@ MainWindow::MainWindow(DeviceManager &device_manager,
 {
        setup_ui();
        restore_ui_settings();
-       if (open_file_name) {
-               const QString s(QString::fromUtf8(open_file_name));
-               QMetaObject::invokeMethod(this, "load_file",
-                       Qt::QueuedConnection,
-                       Q_ARG(QString, s));
-       }
+       if (open_file_name.empty())
+               select_init_device();
+       else
+               load_init_file(open_file_name, open_file_format);
 }
 
 QAction* MainWindow::action_open() const
@@ -156,6 +161,11 @@ QAction* MainWindow::action_view_zoom_one_to_one() const
        return action_view_zoom_one_to_one_;
 }
 
+QAction* MainWindow::action_view_sticky_scrolling() const
+{
+       return action_view_sticky_scrolling_;
+}
+
 QAction* MainWindow::action_view_show_cursors() const
 {
        return action_view_show_cursors_;
@@ -191,7 +201,10 @@ void MainWindow::run_stop()
 void MainWindow::select_device(shared_ptr<devices::Device> device)
 {
        try {
-               session_.set_device(device);
+               if (device)
+                       session_.set_device(device);
+               else
+                       session_.set_default_device();
        } catch(const QString &e) {
                QMessageBox msg(this);
                msg.setText(e);
@@ -251,6 +264,47 @@ void MainWindow::export_file(shared_ptr<OutputFormat> format)
        dlg->run();
 }
 
+void MainWindow::import_file(shared_ptr<InputFormat> format)
+{
+       assert(format);
+
+       QSettings settings;
+       const QString dir = settings.value(SettingOpenDirectory).toString();
+
+       // Construct the filter
+       const vector<string> exts = format->extensions();
+       const QString filter = exts.empty() ? "" :
+               tr("%1 files (*.%2)").arg(
+                       QString::fromStdString(format->description())).arg(
+                       QString::fromStdString(join(exts, ", *.")));
+
+       // Show the file dialog
+       const QString file_name = QFileDialog::getOpenFileName(
+               this, tr("Import File"), dir, tr(
+                       "%1 files (*.*);;All Files (*.*)").arg(
+                       QString::fromStdString(format->description())));
+
+       if (file_name.isEmpty())
+               return;
+
+       // Show the options dialog
+       map<string, Glib::VariantBase> options;
+       if (!format->options().empty()) {
+               dialogs::InputOutputOptions dlg(
+                       tr("Import %1").arg(QString::fromStdString(
+                               format->description())),
+                       format->options(), this);
+               if (!dlg.exec())
+                       return;
+               options = dlg.options();
+       }
+
+       load_file(file_name, format, options);
+
+       const QString abs_path = QFileInfo(file_name).absolutePath();
+       settings.setValue(SettingOpenDirectory, abs_path);
+}
+
 void MainWindow::setup_ui()
 {
        setObjectName(QString::fromUtf8("MainWindow"));
@@ -303,6 +357,14 @@ void MainWindow::setup_ui()
                this, SLOT(export_file(std::shared_ptr<sigrok::OutputFormat>)));
        menu_file->addAction(menu_file_export->menuAction());
 
+       widgets::ImportMenu *menu_file_import = new widgets::ImportMenu(this,
+               device_manager_.context());
+       menu_file_import->setTitle(tr("&Import"));
+       connect(menu_file_import,
+               SIGNAL(format_selected(std::shared_ptr<sigrok::InputFormat>)),
+               this, SLOT(import_file(std::shared_ptr<sigrok::InputFormat>)));
+       menu_file->addAction(menu_file_import->menuAction());
+
        menu_file->addSeparator();
 
        action_connect_->setText(tr("&Connect to Device..."));
@@ -339,6 +401,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")));
@@ -355,6 +418,18 @@ void MainWindow::setup_ui()
                QString::fromUtf8("actionViewZoomOneToOne"));
        menu_view->addAction(action_view_zoom_one_to_one_);
 
+       menu_file->addSeparator();
+
+       action_view_sticky_scrolling_->setCheckable(true);
+       action_view_sticky_scrolling_->setChecked(true);
+       action_view_sticky_scrolling_->setShortcut(QKeySequence(Qt::Key_S));
+       action_view_sticky_scrolling_->setObjectName(
+               QString::fromUtf8("actionViewStickyScrolling"));
+       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_show_cursors_->setCheckable(true);
@@ -397,6 +472,10 @@ void MainWindow::setup_ui()
        setMenuBar(menu_bar);
        QMetaObject::connectSlotsByName(this);
 
+       // Also add all actions to the main window for always-enabled hotkeys
+       for (QAction* action : menu_bar->actions())
+               this->addAction(action);
+
        // Setup the toolbar
        main_bar_ = new toolbars::MainBar(session_, *this);
 
@@ -413,8 +492,67 @@ void MainWindow::setup_ui()
                SLOT(capture_state_changed(int)));
        connect(&session_, SIGNAL(device_selected()), this,
                SLOT(device_selected()));
+
+       // 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() {
+       QSettings settings;
+       map<string, string> dev_info;
+       list<string> key_list;
+
+       // Re-select last used device if possible.
+       settings.beginGroup("Device");
+       key_list.push_back("vendor");
+       key_list.push_back("model");
+       key_list.push_back("version");
+       key_list.push_back("serial_num");
+       key_list.push_back("connection_id");
+
+       for (string key : key_list) {
+               const QString k = QString::fromStdString(key);
+               if (!settings.contains(k))
+                       continue;
+
+               const string value = settings.value(k).toString().toStdString();
+               if (!value.empty())
+                       dev_info.insert(std::make_pair(key, value));
+       }
+
+       const shared_ptr<devices::HardwareDevice> device =
+               device_manager_.find_device_from_info(dev_info);
+       select_device(device);
+       update_device_list();
+
+       settings.endGroup();
+}
+
+void MainWindow::load_init_file(const std::string &file_name,
+       const std::string &format) {
+       shared_ptr<InputFormat> input_format;
+
+       if (!format.empty()) {
+               const map<string, shared_ptr<InputFormat> > formats =
+                       device_manager_.context()->input_formats();
+               const auto iter = find_if(formats.begin(), formats.end(),
+                       [&](const pair<string, shared_ptr<InputFormat> > f) {
+                               return f.first == format; });
+               if (iter == formats.end()) {
+                       cerr << "Unexpected input format: " << format << endl;
+                       return;
+               }
+
+               input_format = (*iter).second;
+       }
+
+       load_file(QString::fromStdString(file_name), input_format);
 }
 
+
 void MainWindow::save_ui_settings()
 {
        QSettings settings;
@@ -455,10 +593,6 @@ void MainWindow::restore_ui_settings()
 {
        QSettings settings;
 
-       map<string, string> dev_info;
-       list<string> key_list;
-       string value;
-
        settings.beginGroup("MainWindow");
 
        if (settings.contains("geometry")) {
@@ -468,33 +602,6 @@ void MainWindow::restore_ui_settings()
                resize(1000, 720);
 
        settings.endGroup();
-
-       // Re-select last used device if possible.
-       settings.beginGroup("Device");
-       key_list.push_back("vendor");
-       key_list.push_back("model");
-       key_list.push_back("version");
-       key_list.push_back("serial_num");
-       key_list.push_back("connection_id");
-
-       for (string key : key_list) {
-               if (!settings.contains(QString::fromUtf8(key.c_str())))
-                       continue;
-
-               value = settings.value(QString::fromUtf8(key.c_str())).toString().toStdString();
-
-               if (value.size() > 0)
-                       dev_info.insert(std::make_pair(key, value));
-       }
-
-       const shared_ptr<devices::HardwareDevice> device =
-               device_manager_.find_device_from_info(dev_info);
-       if (device) {
-               select_device(device);
-               update_device_list();
-       }
-
-       settings.endGroup();
 }
 
 void MainWindow::session_error(
@@ -510,32 +617,25 @@ void MainWindow::update_device_list()
        main_bar_->update_device_list();
 }
 
-void MainWindow::closeEvent(QCloseEvent *event)
-{
-       save_ui_settings();
-       event->accept();
-}
-
-void MainWindow::keyReleaseEvent(QKeyEvent *event)
-{
-       if (event->key() == Qt::Key_Alt) {
-               menuBar()->setHidden(!menuBar()->isHidden());
-               menuBar()->setFocus();
-       }
-       QMainWindow::keyReleaseEvent(event);
-}
-
-void MainWindow::load_file(QString file_name)
+void MainWindow::load_file(QString file_name,
+       std::shared_ptr<sigrok::InputFormat> format,
+       const std::map<std::string, Glib::VariantBase> &options)
 {
        const QString errorMessage(
                QString("Failed to load file %1").arg(file_name));
-       const QString infoMessage;
 
        try {
-               session_.set_device(
-                       shared_ptr<devices::Device>(new devices::SessionFile(
-                               device_manager_.context(),
-                               file_name.toStdString())));
+               if (format)
+                       session_.set_device(shared_ptr<devices::Device>(
+                               new devices::InputFile(
+                                       device_manager_.context(),
+                                       file_name.toStdString(),
+                                       format, options)));
+               else
+                       session_.set_device(shared_ptr<devices::Device>(
+                               new devices::SessionFile(
+                                       device_manager_.context(),
+                                       file_name.toStdString())));
        } catch(Error e) {
                show_session_error(tr("Failed to load ") + file_name, e.what());
                session_.set_default_device();
@@ -545,10 +645,25 @@ 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); });
 }
 
+void MainWindow::closeEvent(QCloseEvent *event)
+{
+       save_ui_settings();
+       event->accept();
+}
+
+void MainWindow::keyReleaseEvent(QKeyEvent *event)
+{
+       if (event->key() == Qt::Key_Alt) {
+               menuBar()->setHidden(!menuBar()->isHidden());
+               menuBar()->setFocus();
+       }
+       QMainWindow::keyReleaseEvent(event);
+}
+
 void MainWindow::show_session_error(
        const QString text, const QString info_text)
 {
@@ -616,7 +731,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()
@@ -624,12 +739,17 @@ void MainWindow::on_actionViewZoomOneToOne_triggered()
        view_->zoom_one_to_one();
 }
 
+void MainWindow::on_actionViewStickyScrolling_triggered()
+{
+       view_->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
+}
+
 void MainWindow::on_actionViewShowCursors_triggered()
 {
        assert(view_);
 
        const bool show = !view_->cursors_shown();
-       if(show)
+       if (show)
                view_->centre_cursors();
 
        view_->show_cursors(show);
@@ -641,6 +761,16 @@ void MainWindow::on_actionAbout_triggered()
        dlg.exec();
 }
 
+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