MainWindow: Fix typo

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 8006b65d8d992296245793bcc26269fedcc7c349..4088c26d1c86b430f3f811df8269c07b6be65616 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -116,6 +116,8 @@ MainWindow::MainWindow(DeviceManager &device_manager,
        , 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 +195,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 +214,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"));
@@ -251,9 +252,9 @@ void MainWindow::export_file(shared_ptr<OutputFormat> format,
                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 uint64_t end_sample = end_time.convert_to<double>() * samplerate;
 
-           sample_range = std::make_pair(start_sample, end_sample);
+               sample_range = std::make_pair(start_sample, end_sample);
        } else {
                sample_range = std::make_pair(0, 0);
        }
@@ -458,7 +459,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);
@@ -532,15 +533,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;
@@ -572,7 +577,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()) {
@@ -617,7 +623,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()));
@@ -676,7 +681,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();