]> sigrok.org Git - pulseview.git/blobdiff - pv/mainwindow.cpp
Add menu option for coloured/alternating trace background colors
[pulseview.git] / pv / mainwindow.cpp
index c3f8fdb8bad914e19fd010a153fb1294c6b67df0..272dac234374c9f4e69e825100520e81010644d4 100644 (file)
@@ -110,12 +110,15 @@ MainWindow::MainWindow(DeviceManager &device_manager,
        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_coloured_bg_(new QAction(this)),
        action_view_show_cursors_(new QAction(this)),
        action_about_(new QAction(this))
 #ifdef ENABLE_DECODE
        , menu_decoders_add_(new pv::widgets::DecoderMenu(this, true))
 #endif
 {
+       qRegisterMetaType<util::Timestamp>("util::Timestamp");
+
        setup_ui();
        restore_ui_settings();
        if (open_file_name.empty())
@@ -193,12 +196,11 @@ QMenu* MainWindow::menu_decoder_add() const
 
 void MainWindow::run_stop()
 {
-       switch(session_.get_capture_state()) {
+       switch (session_.get_capture_state()) {
        case Session::Stopped:
                session_.start_capture([&](QString message) {
                        session_error("Capture failed", message); });
                break;
-
        case Session::AwaitingTrigger:
        case Session::Running:
                session_.stop_capture();
@@ -213,7 +215,7 @@ void MainWindow::select_device(shared_ptr<devices::Device> device)
                        session_.set_device(device);
                else
                        session_.set_default_device();
-       } catch(const QString &e) {
+       } catch (const QString &e) {
                QMessageBox msg(this);
                msg.setText(e);
                msg.setInformativeText(tr("Failed to Select Device"));
@@ -223,7 +225,8 @@ void MainWindow::select_device(shared_ptr<devices::Device> device)
        }
 }
 
-void MainWindow::export_file(shared_ptr<OutputFormat> format)
+void MainWindow::export_file(shared_ptr<OutputFormat> format,
+       bool selection_only)
 {
        using pv::dialogs::StoreProgress;
 
@@ -233,6 +236,30 @@ void MainWindow::export_file(shared_ptr<OutputFormat> format)
        QSettings settings;
        const QString dir = settings.value(SettingSaveDirectory).toString();
 
+       std::pair<uint64_t, uint64_t> sample_range;
+
+       // Selection only? Verify that the cursors are active and fetch their values
+       if (selection_only) {
+               if (!view_->cursors()->enabled()) {
+                       show_session_error(tr("Missing Cursors"), tr("You need to set the " \
+                                       "cursors before you can save the data enclosed by them " \
+                                       "to a session file (e.g. using ALT-V - Show Cursors)."));
+                       return;
+               }
+
+               const double samplerate = session_.get_samplerate();
+
+               const pv::util::Timestamp& start_time = view_->cursors()->first()->time();
+               const pv::util::Timestamp& end_time = view_->cursors()->second()->time();
+
+               const uint64_t start_sample = start_time.convert_to<double>() * samplerate;
+               const uint64_t end_sample = end_time.convert_to<double>() * samplerate;
+
+               sample_range = std::make_pair(start_sample, end_sample);
+       } else {
+               sample_range = std::make_pair(0, 0);
+       }
+
        // Construct the filter
        const vector<string> exts = format->extensions();
        QString filter = tr("%1 files ").arg(
@@ -267,8 +294,6 @@ void MainWindow::export_file(shared_ptr<OutputFormat> format)
                options = dlg.options();
        }
 
-       const std::pair<uint64_t, uint64_t> sample_range = std::make_pair(0, 0);
-
        StoreProgress *dlg = new StoreProgress(file_name, format, options,
                sample_range, session_, this);
        dlg->run();
@@ -435,7 +460,7 @@ void MainWindow::setup_ui()
                QString::fromUtf8("actionViewZoomOneToOne"));
        menu_view->addAction(action_view_zoom_one_to_one_);
 
-       menu_file->addSeparator();
+       menu_view->addSeparator();
 
        action_view_sticky_scrolling_->setCheckable(true);
        action_view_sticky_scrolling_->setChecked(true);
@@ -449,6 +474,16 @@ void MainWindow::setup_ui()
 
        menu_view->addSeparator();
 
+       action_view_coloured_bg_->setCheckable(true);
+       action_view_coloured_bg_->setChecked(true);
+       action_view_coloured_bg_->setShortcut(QKeySequence(Qt::Key_S));
+       action_view_coloured_bg_->setObjectName(
+               QString::fromUtf8("actionViewColouredBg"));
+       action_view_coloured_bg_->setText(tr("Use &coloured backgrounds"));
+       menu_view->addAction(action_view_coloured_bg_);
+
+       menu_view->addSeparator();
+
        action_view_show_cursors_->setCheckable(true);
        action_view_show_cursors_->setChecked(view_->cursors_shown());
        action_view_show_cursors_->setIcon(QIcon::fromTheme("show-cursors",
@@ -509,15 +544,19 @@ void MainWindow::setup_ui()
                SLOT(capture_state_changed(int)));
        connect(&session_, SIGNAL(device_selected()), this,
                SLOT(device_selected()));
+       connect(&session_, SIGNAL(trigger_event(util::Timestamp)), view_,
+               SLOT(trigger_event(util::Timestamp)));
 
        // 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() {
+void MainWindow::select_init_device()
+{
        QSettings settings;
        map<string, string> dev_info;
        list<string> key_list;
@@ -549,7 +588,8 @@ void MainWindow::select_init_device() {
 }
 
 void MainWindow::load_init_file(const std::string &file_name,
-       const std::string &format) {
+       const std::string &format)
+{
        shared_ptr<InputFormat> input_format;
 
        if (!format.empty()) {
@@ -594,7 +634,6 @@ void MainWindow::save_ui_settings()
                        session_.device());
 
                for (string key : key_list) {
-
                        if (dev_info.count(key))
                                settings.setValue(QString::fromUtf8(key.c_str()),
                                                QString::fromUtf8(dev_info.at(key).c_str()));
@@ -653,7 +692,7 @@ void MainWindow::load_file(QString file_name,
                                new devices::SessionFile(
                                        device_manager_.context(),
                                        file_name.toStdString())));
-       } catch(Error e) {
+       } catch (Error e) {
                show_session_error(tr("Failed to load ") + file_name, e.what());
                session_.set_default_device();
                update_device_list();
@@ -666,75 +705,6 @@ void MainWindow::load_file(QString file_name,
                session_error(errorMessage, infoMessage); });
 }
 
-void MainWindow::save_selection_to_file()
-{
-       // Stop any currently running capture session
-       session_.stop_capture();
-
-       // Verify that the cursors are active and fetch their values
-       if (!view_->cursors()->enabled()) {
-               show_session_error(tr("Missing Cursors"), tr("You need to set the " \
-                               "cursors before you can save the data enclosed by them " \
-                               "to a session file (e.g. using ALT-V - Show Cursors)."));
-               return;
-       }
-
-       const double samplerate = session_.get_samplerate();
-
-       const pv::util::Timestamp& start_time = view_->cursors()->first()->time();
-       const pv::util::Timestamp& end_time = view_->cursors()->second()->time();
-
-       const uint64_t start_sample = start_time.convert_to<double>() * samplerate;
-    const uint64_t end_sample = end_time.convert_to<double>() * samplerate;
-
-       const std::pair<uint64_t, uint64_t> sample_range =
-                       std::make_pair(start_sample, end_sample);
-
-       // Ask for output file name
-       QSettings settings;
-       const QString dir = settings.value(SettingSaveDirectory).toString();
-
-       shared_ptr<OutputFormat> format =
-                       device_manager_.context()->output_formats()["srzip"];
-
-       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"));
-
-       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();
-       }
-
-       // Save
-       pv::dialogs::StoreProgress *dlg = new pv::dialogs::StoreProgress(file_name,
-               format, options, sample_range, session_, this);
-       dlg->run();
-}
-
 void MainWindow::closeEvent(QCloseEvent *event)
 {
        save_ui_settings();
@@ -787,7 +757,7 @@ void MainWindow::on_actionSaveAs_triggered()
 
 void MainWindow::on_actionSaveSelectionAs_triggered()
 {
-       save_selection_to_file();
+       export_file(device_manager_.context()->output_formats()["srzip"], true);
 }
 
 void MainWindow::on_actionConnect_triggered()
@@ -835,6 +805,10 @@ void MainWindow::on_actionViewStickyScrolling_triggered()
        view_->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
 }
 
+void MainWindow::on_actionViewColouredBg_triggered()
+{
+}
+
 void MainWindow::on_actionViewShowCursors_triggered()
 {
        assert(view_);