]> sigrok.org Git - pulseview.git/blobdiff - pv/mainwindow.cpp
Reworked SamplingBar device selection logic
[pulseview.git] / pv / mainwindow.cpp
index 97abbf8eff8926bd0d6fe46c6e5624760250ce6f..0089b112a721f1585a9813134328cfd30c360ccb 100644 (file)
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#ifdef ENABLE_SIGROKDECODE
-#include <sigrokdecode.h>
+#ifdef ENABLE_DECODE
+#include <libsigrokdecode/libsigrokdecode.h>
 #endif
 
 #include <boost/bind.hpp>
 #include <boost/foreach.hpp>
 
+#include <algorithm>
+#include <iterator>
+
 #include <QAction>
 #include <QApplication>
 #include <QButtonGroup>
 #include "mainwindow.h"
 
 #include "devicemanager.h"
+#include "device/device.h"
 #include "dialogs/about.h"
 #include "dialogs/connect.h"
+#include "dialogs/storeprogress.h"
 #include "toolbars/samplingbar.h"
+#include "view/logicsignal.h"
 #include "view/view.h"
+#ifdef ENABLE_DECODE
+#include "widgets/decodermenu.h"
+#endif
 
 /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
 #define __STDC_FORMAT_MACROS
 #include <glib.h>
 #include <libsigrok/libsigrok.h>
 
-using namespace std;
+using boost::shared_ptr;
+using std::list;
 
 namespace pv {
 
+namespace view {
+class SelectableItem;
+}
+
 MainWindow::MainWindow(DeviceManager &device_manager,
        const char *open_file_name,
        QWidget *parent) :
@@ -92,114 +106,165 @@ void MainWindow::setup_ui()
        setCentralWidget(_central_widget);
 
        _view = new pv::view::View(_session, this);
+
        _vertical_layout->addWidget(_view);
 
        // Setup the menu bar
-       _menu_bar = new QMenuBar(this);
-       _menu_bar->setGeometry(QRect(0, 0, 400, 25));
+       QMenuBar *const menu_bar = new QMenuBar(this);
+       menu_bar->setGeometry(QRect(0, 0, 400, 25));
 
        // File Menu
-       _menu_file = new QMenu(_menu_bar);
-       _menu_file->setTitle(QApplication::translate(
+       QMenu *const menu_file = new QMenu;
+       menu_file->setTitle(QApplication::translate(
                "MainWindow", "&File", 0, QApplication::UnicodeUTF8));
 
-       _action_open = new QAction(this);
-       _action_open->setText(QApplication::translate(
+       QAction *const action_open = new QAction(this);
+       action_open->setText(QApplication::translate(
                "MainWindow", "&Open...", 0, QApplication::UnicodeUTF8));
-       _action_open->setIcon(QIcon::fromTheme("document-open",
+       action_open->setIcon(QIcon::fromTheme("document-open",
                QIcon(":/icons/document-open.png")));
-       _action_open->setObjectName(QString::fromUtf8("actionOpen"));
-       _menu_file->addAction(_action_open);
+       action_open->setObjectName(QString::fromUtf8("actionOpen"));
+       menu_file->addAction(action_open);
 
-       _menu_file->addSeparator();
+       QAction *const action_save_as = new QAction(this);
+       action_save_as->setText(QApplication::translate(
+               "MainWindow", "&Save As...", 0, QApplication::UnicodeUTF8));
+       action_save_as->setIcon(QIcon::fromTheme("document-save-as",
+               QIcon(":/icons/document-save-as.png")));
+       action_save_as->setObjectName(QString::fromUtf8("actionSaveAs"));
+       menu_file->addAction(action_save_as);
 
-       _action_connect = new QAction(this);
-       _action_connect->setText(QApplication::translate(
+       menu_file->addSeparator();
+
+       QAction *const action_connect = new QAction(this);
+       action_connect->setText(QApplication::translate(
                "MainWindow", "&Connect to Device...", 0,
                QApplication::UnicodeUTF8));
-       _action_connect->setObjectName(QString::fromUtf8("actionConnect"));
-       _menu_file->addAction(_action_connect);
+       action_connect->setObjectName(QString::fromUtf8("actionConnect"));
+       menu_file->addAction(action_connect);
 
-       _menu_file->addSeparator();
+       menu_file->addSeparator();
 
-       _action_quit = new QAction(this);
-       _action_quit->setText(QApplication::translate(
+       QAction *action_quit = new QAction(this);
+       action_quit->setText(QApplication::translate(
                "MainWindow", "&Quit", 0, QApplication::UnicodeUTF8));
-       _action_quit->setIcon(QIcon::fromTheme("application-exit",
+       action_quit->setIcon(QIcon::fromTheme("application-exit",
                QIcon(":/icons/application-exit.png")));
-       _action_quit->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
-       _action_quit->setObjectName(QString::fromUtf8("actionQuit"));
-       _menu_file->addAction(_action_quit);
+       action_quit->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
+       action_quit->setObjectName(QString::fromUtf8("actionQuit"));
+       menu_file->addAction(action_quit);
 
        // View Menu
-       _menu_view = new QMenu(_menu_bar);
-       _menu_view->setTitle(QApplication::translate(
+       QMenu *menu_view = new QMenu;
+       menu_view->setTitle(QApplication::translate(
                "MainWindow", "&View", 0, QApplication::UnicodeUTF8));
 
-       _action_view_zoom_in = new QAction(this);
-       _action_view_zoom_in->setText(QApplication::translate(
+       QAction *const action_view_zoom_in = new QAction(this);
+       action_view_zoom_in->setText(QApplication::translate(
                "MainWindow", "Zoom &In", 0, QApplication::UnicodeUTF8));
-       _action_view_zoom_in->setIcon(QIcon::fromTheme("zoom-in",
+       action_view_zoom_in->setIcon(QIcon::fromTheme("zoom-in",
                QIcon(":/icons/zoom-in.png")));
-       _action_view_zoom_in->setObjectName(
+       // simply using Qt::Key_Plus shows no + in the menu
+       action_view_zoom_in->setShortcut(QKeySequence::ZoomIn);
+       action_view_zoom_in->setObjectName(
                QString::fromUtf8("actionViewZoomIn"));
-       _menu_view->addAction(_action_view_zoom_in);
+       menu_view->addAction(action_view_zoom_in);
 
-       _action_view_zoom_out = new QAction(this);
-       _action_view_zoom_out->setText(QApplication::translate(
+       QAction *const action_view_zoom_out = new QAction(this);
+       action_view_zoom_out->setText(QApplication::translate(
                "MainWindow", "Zoom &Out", 0, QApplication::UnicodeUTF8));
-       _action_view_zoom_out->setIcon(QIcon::fromTheme("zoom-out",
+       action_view_zoom_out->setIcon(QIcon::fromTheme("zoom-out",
                QIcon(":/icons/zoom-out.png")));
-       _action_view_zoom_out->setObjectName(
+       action_view_zoom_out->setShortcut(QKeySequence::ZoomOut);
+       action_view_zoom_out->setObjectName(
                QString::fromUtf8("actionViewZoomOut"));
-       _menu_view->addAction(_action_view_zoom_out);
-
-       _menu_view->addSeparator();
-
-       _action_view_show_cursors = new QAction(this);
-       _action_view_show_cursors->setCheckable(true);
-       _action_view_show_cursors->setChecked(_view->cursors_shown());
-       _action_view_show_cursors->setShortcut(QKeySequence(Qt::Key_C));
-       _action_view_show_cursors->setObjectName(
+       menu_view->addAction(action_view_zoom_out);
+
+       QAction *const action_view_zoom_fit = new QAction(this);
+       action_view_zoom_fit->setText(QApplication::translate(
+               "MainWindow", "Zoom to &Fit", 0, QApplication::UnicodeUTF8));
+       action_view_zoom_fit->setIcon(QIcon::fromTheme("zoom-fit",
+               QIcon(":/icons/zoom-fit.png")));
+       action_view_zoom_fit->setShortcut(QKeySequence(Qt::Key_F));
+       action_view_zoom_fit->setObjectName(
+               QString::fromUtf8("actionViewZoomFit"));
+       menu_view->addAction(action_view_zoom_fit);
+
+       QAction *const action_view_zoom_one_to_one = new QAction(this);
+       action_view_zoom_one_to_one->setText(QApplication::translate(
+               "MainWindow", "Zoom to &One-to-One", 0,
+                       QApplication::UnicodeUTF8));
+       action_view_zoom_one_to_one->setIcon(QIcon::fromTheme("zoom-original",
+               QIcon(":/icons/zoom-original.png")));
+       action_view_zoom_one_to_one->setShortcut(QKeySequence(Qt::Key_O));
+       action_view_zoom_one_to_one->setObjectName(
+               QString::fromUtf8("actionViewZoomOneToOne"));
+       menu_view->addAction(action_view_zoom_one_to_one);
+
+       menu_view->addSeparator();
+
+       QAction *action_view_show_cursors = new QAction(this);
+       action_view_show_cursors->setCheckable(true);
+       action_view_show_cursors->setChecked(_view->cursors_shown());
+       action_view_show_cursors->setShortcut(QKeySequence(Qt::Key_C));
+       action_view_show_cursors->setObjectName(
                QString::fromUtf8("actionViewShowCursors"));
-       _action_view_show_cursors->setText(QApplication::translate(
+       action_view_show_cursors->setText(QApplication::translate(
                "MainWindow", "Show &Cursors", 0, QApplication::UnicodeUTF8));
-       _menu_view->addAction(_action_view_show_cursors);
+       menu_view->addAction(action_view_show_cursors);
+
+       // Decoders Menu
+#ifdef ENABLE_DECODE
+       QMenu *const menu_decoders = new QMenu;
+       menu_decoders->setTitle(QApplication::translate(
+               "MainWindow", "&Decoders", 0, QApplication::UnicodeUTF8));
+
+       pv::widgets::DecoderMenu *const menu_decoders_add =
+               new pv::widgets::DecoderMenu(menu_decoders, true);
+       menu_decoders_add->setTitle(QApplication::translate(
+               "MainWindow", "&Add", 0, QApplication::UnicodeUTF8));
+       connect(menu_decoders_add, SIGNAL(decoder_selected(srd_decoder*)),
+               this, SLOT(add_decoder(srd_decoder*)));
+
+       menu_decoders->addMenu(menu_decoders_add);
+#endif
 
        // Help Menu
-       _menu_help = new QMenu(_menu_bar);
-       _menu_help->setTitle(QApplication::translate(
+       QMenu *const menu_help = new QMenu;
+       menu_help->setTitle(QApplication::translate(
                "MainWindow", "&Help", 0, QApplication::UnicodeUTF8));
 
-       _action_about = new QAction(this);
-       _action_about->setObjectName(QString::fromUtf8("actionAbout"));
-       _action_about->setText(QApplication::translate(
+       QAction *const action_about = new QAction(this);
+       action_about->setObjectName(QString::fromUtf8("actionAbout"));
+       action_about->setText(QApplication::translate(
                "MainWindow", "&About...", 0, QApplication::UnicodeUTF8));
-       _menu_help->addAction(_action_about);
+       menu_help->addAction(action_about);
 
-       _menu_bar->addAction(_menu_file->menuAction());
-       _menu_bar->addAction(_menu_view->menuAction());
-       _menu_bar->addAction(_menu_help->menuAction());
+       menu_bar->addAction(menu_file->menuAction());
+       menu_bar->addAction(menu_view->menuAction());
+#ifdef ENABLE_DECODE
+       menu_bar->addAction(menu_decoders->menuAction());
+#endif
+       menu_bar->addAction(menu_help->menuAction());
 
-       setMenuBar(_menu_bar);
+       setMenuBar(menu_bar);
        QMetaObject::connectSlotsByName(this);
 
        // Setup the toolbar
-       _toolbar = new QToolBar(tr("Main Toolbar"), this);
-       _toolbar->addAction(_action_open);
-       _toolbar->addSeparator();
-       _toolbar->addAction(_action_view_zoom_in);
-       _toolbar->addAction(_action_view_zoom_out);
-       addToolBar(_toolbar);
+       QToolBar *const toolbar = new QToolBar(tr("Main Toolbar"), this);
+       toolbar->addAction(action_open);
+       toolbar->addSeparator();
+       toolbar->addAction(action_view_zoom_in);
+       toolbar->addAction(action_view_zoom_out);
+       toolbar->addAction(action_view_zoom_fit);
+       addToolBar(toolbar);
 
        // Setup the sampling bar
-       _sampling_bar = new toolbars::SamplingBar(this);
+       _sampling_bar = new toolbars::SamplingBar(_session, this);
 
        // Populate the device list and select the initially selected device
        update_device_list();
 
-       connect(_sampling_bar, SIGNAL(device_selected()), this,
-               SLOT(device_selected()));
        connect(_sampling_bar, SIGNAL(run_stop()), this,
                SLOT(run_stop()));
        addToolBar(_sampling_bar);
@@ -222,28 +287,21 @@ void MainWindow::session_error(
                Q_ARG(QString, info_text));
 }
 
-void MainWindow::update_device_list(struct sr_dev_inst *selected_device)
+void MainWindow::update_device_list()
 {
        assert(_sampling_bar);
 
-       const list<sr_dev_inst*> &devices = _device_manager.devices();
-       _sampling_bar->set_device_list(devices);
-
-       if (!selected_device && !devices.empty()) {
-               // Fall back to the first device in the list.
-               selected_device = devices.front();
+       shared_ptr<pv::device::DevInst> selected_device = _session.get_device();
+       list< shared_ptr<device::DevInst> > devices;
+       std::copy(_device_manager.devices().begin(),
+               _device_manager.devices().end(), std::back_inserter(devices));
 
-               // Try and find the demo device and select that by default
-               BOOST_FOREACH (struct sr_dev_inst *sdi, devices)
-                       if (strcmp(sdi->driver->name, "demo") == 0) {
-                               selected_device = sdi;
-                       }
-       }
+       if (std::find(devices.begin(), devices.end(), selected_device) ==
+               devices.end())
+               devices.push_back(selected_device);
+       assert(selected_device);
 
-       if (selected_device) {
-               _sampling_bar->set_selected_device(selected_device);
-               _session.set_device(selected_device);
-       }
+       _sampling_bar->set_device_list(devices, selected_device);
 }
 
 void MainWindow::load_file(QString file_name)
@@ -251,9 +309,20 @@ void MainWindow::load_file(QString file_name)
        const QString errorMessage(
                QString("Failed to load file %1").arg(file_name));
        const QString infoMessage;
-       _session.load_file(file_name.toStdString(),
-               boost::bind(&MainWindow::session_error, this,
-                       errorMessage, infoMessage));
+
+       try {
+               _session.set_file(file_name.toStdString());
+       } catch(QString e) {
+               show_session_error(tr("Failed to load ") + file_name, e);
+               _session.set_default_device();
+               update_device_list();
+               return;
+       }
+
+       update_device_list();
+
+       _session.start_capture(boost::bind(&MainWindow::session_error, this,
+               errorMessage, infoMessage));
 }
 
 void MainWindow::show_session_error(
@@ -269,13 +338,33 @@ void MainWindow::show_session_error(
 
 void MainWindow::on_actionOpen_triggered()
 {
+       // Show the dialog
        const QString file_name = QFileDialog::getOpenFileName(
-               this, tr("Open File"), "",
-               tr("Sigrok Sessions (*.sr)"));
+               this, tr("Open File"), "", tr(
+                       "Sigrok Sessions (*.sr);;"
+                       "All Files (*.*)"));
        if (!file_name.isEmpty())
                load_file(file_name);
 }
 
+void MainWindow::on_actionSaveAs_triggered()
+{
+       using pv::dialogs::StoreProgress;
+
+       // Stop any currently running capture session
+       _session.stop_capture();
+
+       // Show the dialog
+       const QString file_name = QFileDialog::getSaveFileName(
+               this, tr("Save File"), "", tr("Sigrok Sessions (*.sr)"));
+
+       if (file_name.isEmpty())
+               return;
+
+       StoreProgress *dlg = new StoreProgress(file_name, _session, this);
+       dlg->run();
+}
+
 void MainWindow::on_actionConnect_triggered()
 {
        // Stop any currently running capture session
@@ -285,10 +374,10 @@ void MainWindow::on_actionConnect_triggered()
 
        // If the user selected a device, select it in the device list. Select the
        // current device otherwise.
-       struct sr_dev_inst *const sdi = dlg.exec() ?
-               dlg.get_selected_device() : _session.get_device();
+       if (dlg.exec())
+               _session.set_device(dlg.get_selected_device());
 
-       update_device_list(sdi);
+       update_device_list();
 }
 
 void MainWindow::on_actionQuit_triggered()
@@ -306,6 +395,16 @@ void MainWindow::on_actionViewZoomOut_triggered()
        _view->zoom(-1);
 }
 
+void MainWindow::on_actionViewZoomFit_triggered()
+{
+       _view->zoom_fit();
+}
+
+void MainWindow::on_actionViewZoomOneToOne_triggered()
+{
+       _view->zoom_one_to_one();
+}
+
 void MainWindow::on_actionViewShowCursors_triggered()
 {
        assert(_view);
@@ -323,20 +422,26 @@ void MainWindow::on_actionAbout_triggered()
        dlg.exec();
 }
 
-void MainWindow::device_selected()
+void MainWindow::add_decoder(srd_decoder *decoder)
 {
-       _session.set_device(_sampling_bar->get_selected_device());
+#ifdef ENABLE_DECODE
+       assert(decoder);
+       _session.add_decoder(decoder);
+#else
+       (void)decoder;
+#endif
 }
 
 void MainWindow::run_stop()
 {
        switch(_session.get_capture_state()) {
        case SigSession::Stopped:
-               _session.start_capture(_sampling_bar->get_record_length(),
-                       boost::bind(&MainWindow::session_error, this,
+               _session.start_capture(
+                               boost::bind(&MainWindow::session_error, this,
                                QString("Capture failed"), _1));
                break;
 
+       case SigSession::AwaitingTrigger:
        case SigSession::Running:
                _session.stop_capture();
                break;
@@ -345,7 +450,7 @@ void MainWindow::run_stop()
 
 void MainWindow::capture_state_changed(int state)
 {
-       _sampling_bar->set_sampling(state != SigSession::Stopped);
+       _sampling_bar->set_capture_state((pv::SigSession::capture_state)state);
 }
 
 } // namespace pv