MainWindow: Try to use any available device aside from demo

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index dad9d680241ad4d59f4352c6dd80863d13b73cbd..65071330da07e1d24c5955448ad44efe3f929383 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -110,6 +110,7 @@ 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
@@ -176,6 +177,11 @@ QAction* MainWindow::action_view_sticky_scrolling() const
        return action_view_sticky_scrolling_;
 }
 
+QAction* MainWindow::action_view_coloured_bg() const
+{
+       return action_view_coloured_bg_;
+}
+
 QAction* MainWindow::action_view_show_cursors() const
 {
        return action_view_show_cursors_;
@@ -195,12 +201,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();
@@ -215,7 +220,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"));
@@ -460,7 +465,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);
@@ -474,6 +479,18 @@ 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_B));
+       action_view_coloured_bg_->setObjectName(
+               QString::fromUtf8("actionViewColouredBg"));
+       action_view_coloured_bg_->setText(tr("Use &coloured backgrounds"));
+       menu_view->addAction(action_view_coloured_bg_);
+
+       view_->enable_coloured_bg(action_view_coloured_bg_->isChecked());
+
+       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",
@@ -545,12 +562,14 @@ void MainWindow::setup_ui()
 
 }
 
-void MainWindow::select_init_device() {
+void MainWindow::select_init_device()
+{
        QSettings settings;
        map<string, string> dev_info;
        list<string> key_list;
+       shared_ptr<devices::HardwareDevice> device;
 
-       // Re-select last used device if possible.
+       // Re-select last used device if possible but only if it's not demo
        settings.beginGroup("Device");
        key_list.push_back("vendor");
        key_list.push_back("model");
@@ -568,8 +587,24 @@ void MainWindow::select_init_device() {
                        dev_info.insert(std::make_pair(key, value));
        }
 
-       const shared_ptr<devices::HardwareDevice> device =
-               device_manager_.find_device_from_info(dev_info);
+       if (dev_info.count("model") > 0)
+               if (dev_info.at("model").find("Demo device") == std::string::npos)
+                       device = device_manager_.find_device_from_info(dev_info);
+
+       // When we can't find a device similar to the one we used last
+       // time and there is at least one device aside from demo, use it
+       if (!device) {
+               for (shared_ptr<devices::HardwareDevice> dev : device_manager_.devices()) {
+                       dev_info = device_manager_.get_device_info(dev);
+
+                       if (dev_info.count("model") > 0)
+                               if (dev_info.at("model").find("Demo device") == std::string::npos) {
+                                       device = dev;
+                                       break;
+                               }
+               }
+       }
+
        select_device(device);
        update_device_list();
 
@@ -577,7 +612,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()) {
@@ -622,7 +658,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()));
@@ -681,7 +716,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();
@@ -794,6 +829,11 @@ void MainWindow::on_actionViewStickyScrolling_triggered()
        view_->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
 }
 
+void MainWindow::on_actionViewColouredBg_triggered()
+{
+       view_->enable_coloured_bg(action_view_coloured_bg_->isChecked());
+}
+
 void MainWindow::on_actionViewShowCursors_triggered()
 {
        assert(view_);