]> sigrok.org Git - pulseview.git/blobdiff - pv/mainwindow.cpp
Sampling bar now commits the sample rate into the device instance
[pulseview.git] / pv / mainwindow.cpp
index a94871fa4ca2c6927f5dceb396957a33f6936e26..99e545681e71a3a71042dd30c56818606629e24d 100644 (file)
@@ -18,9 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-extern "C" {
 #include <sigrokdecode.h>
-}
 
 #include <QAction>
 #include <QApplication>
@@ -37,7 +35,6 @@ extern "C" {
 #include "dialogs/about.h"
 #include "view/view.h"
 
-extern "C" {
 /* __STDC_FORMAT_MACROS is required for PRIu64 and friends (in C++). */
 #define __STDC_FORMAT_MACROS
 #include <inttypes.h>
@@ -45,14 +42,21 @@ extern "C" {
 #include <stdarg.h>
 #include <glib.h>
 #include <libsigrok/libsigrok.h>
-}
+
 
 namespace pv {
 
-MainWindow::MainWindow(QWidget *parent) :
+MainWindow::MainWindow(const char *open_file_name,
+       QWidget *parent) :
        QMainWindow(parent)
 {
        setup_ui();
+       if (open_file_name) {
+               const QString s(QString::fromUtf8(open_file_name));
+               QMetaObject::invokeMethod(this, "load_file",
+                       Qt::QueuedConnection,
+                       Q_ARG(QString, s));
+       }
 }
 
 void MainWindow::setup_ui()
@@ -77,44 +81,76 @@ void MainWindow::setup_ui()
        _view = new pv::view::View(_session, this);
        _vertical_layout->addWidget(_view);
 
-       // Setup the UI actions
-       _action_about = new QAction(this);
-       _action_about->setObjectName(QString::fromUtf8("actionAbout"));
-
-       _action_view_zoom_in = new QAction(this);
-       _action_view_zoom_in->setIcon(QIcon::fromTheme("zoom-in",
-               QIcon(":/icons/zoom-in.png")));
-       _action_view_zoom_in->setObjectName(QString::fromUtf8("actionViewZoomIn"));
-
-       _action_view_zoom_out = new QAction(this);
-       _action_view_zoom_out->setIcon(QIcon::fromTheme("zoom-out",
-               QIcon(":/icons/zoom-out.png")));
-       _action_view_zoom_out->setObjectName(QString::fromUtf8("actionViewZoomOut"));
+       // Setup the menu bar
+       _menu_bar = new QMenuBar(this);
+       _menu_bar->setGeometry(QRect(0, 0, 400, 25));
 
-       _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->setObjectName(QString::fromUtf8("actionViewShowCursors"));
+       // File Menu
+       _menu_file = new QMenu(_menu_bar);
+       _menu_file->setTitle(QApplication::translate(
+               "MainWindow", "&File", 0, QApplication::UnicodeUTF8));
 
        _action_open = new QAction(this);
+       _action_open->setText(QApplication::translate(
+               "MainWindow", "&Open...", 0, QApplication::UnicodeUTF8));
        _action_open->setIcon(QIcon::fromTheme("document-open",
                QIcon(":/icons/document-open.png")));
        _action_open->setObjectName(QString::fromUtf8("actionOpen"));
+       _menu_file->addAction(_action_open);
 
-       // Setup the menu bar
-       _menu_bar = new QMenuBar(this);
-       _menu_bar->setGeometry(QRect(0, 0, 400, 25));
+       _menu_file->addSeparator();
 
-       _menu_file = new QMenu(_menu_bar);
-       _menu_file->addAction(_action_open);
+       _action_quit = new QAction(this);
+       _action_quit->setText(QApplication::translate(
+               "MainWindow", "&Quit", 0, QApplication::UnicodeUTF8));
+       _action_quit->setIcon(QIcon::fromTheme("application-exit",
+               QIcon(":/icons/application-exit.png")));
+       _action_quit->setObjectName(QString::fromUtf8("actionQuit"));
+       _menu_file->addAction(_action_quit);
 
+       // View Menu
        _menu_view = new QMenu(_menu_bar);
+       _menu_view->setTitle(QApplication::translate(
+               "MainWindow", "&View", 0, QApplication::UnicodeUTF8));
+
+       _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",
+               QIcon(":/icons/zoom-in.png")));
+       _action_view_zoom_in->setObjectName(
+               QString::fromUtf8("actionViewZoomIn"));
        _menu_view->addAction(_action_view_zoom_in);
+
+       _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",
+               QIcon(":/icons/zoom-out.png")));
+       _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->setObjectName(
+               QString::fromUtf8("actionViewShowCursors"));
+       _action_view_show_cursors->setText(QApplication::translate(
+               "MainWindow", "Show &Cursors", 0, QApplication::UnicodeUTF8));
        _menu_view->addAction(_action_view_show_cursors);
 
+       // Help Menu
        _menu_help = new QMenu(_menu_bar);
+       _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(
+               "MainWindow", "&About...", 0, QApplication::UnicodeUTF8));
        _menu_help->addAction(_action_about);
 
        _menu_bar->addAction(_menu_file->menuAction());
@@ -137,35 +173,31 @@ void MainWindow::setup_ui()
                SLOT(run_stop()));
        addToolBar(_sampling_bar);
 
-       // Setup the status bar
-       _status_bar = new QStatusBar(this);
-       setStatusBar(_status_bar);
-
        setWindowTitle(QApplication::translate("MainWindow", "PulseView", 0,
                QApplication::UnicodeUTF8));
 
-       _action_open->setText(QApplication::translate("MainWindow", "&Open...", 0, QApplication::UnicodeUTF8));
-       _action_view_zoom_in->setText(QApplication::translate("MainWindow", "Zoom &In", 0, QApplication::UnicodeUTF8));
-       _action_view_zoom_out->setText(QApplication::translate("MainWindow", "Zoom &Out", 0, QApplication::UnicodeUTF8));
-       _action_view_show_cursors->setText(QApplication::translate("MainWindow", "Show &Cursors", 0, QApplication::UnicodeUTF8));
-       _action_about->setText(QApplication::translate("MainWindow", "&About...", 0, QApplication::UnicodeUTF8));
-
-       _menu_file->setTitle(QApplication::translate("MainWindow", "&File", 0, QApplication::UnicodeUTF8));
-       _menu_view->setTitle(QApplication::translate("MainWindow", "&View", 0, QApplication::UnicodeUTF8));
-       _menu_help->setTitle(QApplication::translate("MainWindow", "&Help", 0, QApplication::UnicodeUTF8));
-
        // Setup _session events
        connect(&_session, SIGNAL(capture_state_changed(int)), this,
                SLOT(capture_state_changed(int)));
 
 }
 
+void MainWindow::load_file(QString file_name)
+{
+       _session.load_file(file_name.toStdString());
+}
+
 void MainWindow::on_actionOpen_triggered()
 {
-       QString file_name = QFileDialog::getOpenFileName(
+       const QString file_name = QFileDialog::getOpenFileName(
                this, tr("Open File"), "",
                tr("Sigrok Sessions (*.sr)"));
-       _session.load_file(file_name.toStdString());
+       load_file(file_name);
+}
+
+void MainWindow::on_actionQuit_triggered()
+{
+       close();
 }
 
 void MainWindow::on_actionViewZoomIn_triggered()
@@ -196,8 +228,7 @@ void MainWindow::run_stop()
        case SigSession::Stopped:
                _session.start_capture(
                        _sampling_bar->get_selected_device(),
-                       _sampling_bar->get_record_length(),
-                       _sampling_bar->get_sample_rate());
+                       _sampling_bar->get_record_length());
                break;
 
        case SigSession::Running: