]> sigrok.org Git - pulseview.git/blobdiff - pv/mainwindow.cpp
Fix #1128 by showing firmware and PD search paths in settings dialog
[pulseview.git] / pv / mainwindow.cpp
index 86a015533f824cb8483e7ef7b456d080266d9ebc..4ab78d1dc9972b1e2433fd34c830b240a3624c5e 100644 (file)
 #include "globalsettings.hpp"
 #include "toolbars/mainbar.hpp"
 #include "util.hpp"
-#include "view/view.hpp"
+#include "views/trace/view.hpp"
 #include "views/trace/standardbar.hpp"
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
-using std::bind;
 using std::dynamic_pointer_cast;
 using std::make_shared;
-using std::map;
-using std::placeholders::_1;
 using std::shared_ptr;
 using std::string;
 
@@ -68,9 +65,7 @@ using toolbars::MainBar;
 
 const QString MainWindow::WindowTitle = tr("PulseView");
 
-MainWindow::MainWindow(DeviceManager &device_manager,
-       string open_file_name, string open_file_format,
-       QWidget *parent) :
+MainWindow::MainWindow(DeviceManager &device_manager, QWidget *parent) :
        QMainWindow(parent),
        device_manager_(device_manager),
        session_selector_(this),
@@ -82,46 +77,19 @@ MainWindow::MainWindow(DeviceManager &device_manager,
        qRegisterMetaType<util::Timestamp>("util::Timestamp");
        qRegisterMetaType<uint64_t>("uint64_t");
 
-       GlobalSettings::register_change_handler(GlobalSettings::Key_View_ColouredBG,
-               bind(&MainWindow::on_settingViewColouredBg_changed, this, _1));
+       GlobalSettings::add_change_handler(this);
 
-       GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowSamplingPoints,
-               bind(&MainWindow::on_settingViewShowSamplingPoints_changed, this, _1));
-
-       GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowAnalogMinorGrid,
-               bind(&MainWindow::on_settingViewShowAnalogMinorGrid_changed, this, _1));
+       GlobalSettings settings;
+       settings.set_defaults_where_needed();
 
        setup_ui();
        restore_ui_settings();
-
-       if (!open_file_name.empty()) {
-               shared_ptr<Session> session = add_session();
-               session->load_init_file(open_file_name, open_file_format);
-       }
-
-       // Add empty default session if there aren't any sessions
-       if (sessions_.size() == 0) {
-               shared_ptr<Session> session = add_session();
-
-               map<string, string> dev_info;
-               shared_ptr<devices::HardwareDevice> other_device, demo_device;
-
-               // Use any available device that's not demo
-               for (shared_ptr<devices::HardwareDevice> dev : device_manager_.devices()) {
-                       if (dev->hardware_device()->driver()->name() == "demo") {
-                               demo_device = dev;
-                       } else {
-                               other_device = dev;
-                       }
-               }
-
-               // ...and if there isn't any, just use demo then
-               session->select_device(other_device ? other_device : demo_device);
-       }
 }
 
 MainWindow::~MainWindow()
 {
+       GlobalSettings::remove_change_handler(this);
+
        while (!sessions_.empty())
                remove_session(sessions_.front());
 }
@@ -176,7 +144,7 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
 
        if (type == views::ViewTypeTrace)
                // This view will be the main view if there's no main bar yet
-               v = make_shared<views::TraceView::View>(session,
+               v = make_shared<views::trace::View>(session,
                        (main_bar ? false : true), dock_main);
 
        if (!v)
@@ -199,13 +167,13 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
        connect(close_btn, SIGNAL(clicked(bool)),
                this, SLOT(on_view_close_clicked()));
 
-       connect(&session, SIGNAL(trigger_event(util::Timestamp)),
+       connect(&session, SIGNAL(trigger_event(int, util::Timestamp)),
                qobject_cast<views::ViewBase*>(v.get()),
-               SLOT(trigger_event(util::Timestamp)));
+               SLOT(trigger_event(int, util::Timestamp)));
 
        if (type == views::ViewTypeTrace) {
-               views::TraceView::View *tv =
-                       qobject_cast<views::TraceView::View*>(v.get());
+               views::trace::View *tv =
+                       qobject_cast<views::trace::View*>(v.get());
 
                tv->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
                tv->enable_show_sampling_points(settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool());
@@ -303,8 +271,18 @@ shared_ptr<Session> MainWindow::add_session()
 
 void MainWindow::remove_session(shared_ptr<Session> session)
 {
+       // Determine the height of the button before it collapses
        int h = new_session_button_->height();
 
+       // Stop capture while the session still exists so that the UI can be
+       // updated in case we're currently running. If so, this will schedule a
+       // call to our on_capture_state_changed() slot for the next run of the
+       // event loop. We need to have this executed immediately or else it will
+       // be dismissed since the session object will be deleted by the time we
+       // leave this method and the event loop gets a chance to run again.
+       session->stop_capture();
+       QApplication::processEvents();
+
        for (shared_ptr<views::ViewBase> view : session->views())
                remove_view(view);
 
@@ -316,6 +294,7 @@ void MainWindow::remove_session(shared_ptr<Session> session)
        if (last_focused_session_ == session)
                last_focused_session_.reset();
 
+       // Remove the session from our list of sessions (which also destroys it)
        sessions_.remove_if([&](shared_ptr<Session> s) {
                return s == session; });
 
@@ -336,6 +315,96 @@ void MainWindow::remove_session(shared_ptr<Session> session)
        }
 }
 
+void MainWindow::add_session_with_file(string open_file_name,
+       string open_file_format)
+{
+       shared_ptr<Session> session = add_session();
+       session->load_init_file(open_file_name, open_file_format);
+}
+
+void MainWindow::add_default_session()
+{
+       // Only add the default session if there would be no session otherwise
+       if (sessions_.size() > 0)
+               return;
+
+       shared_ptr<Session> session = add_session();
+
+       // Check the list of available devices. Prefer the one that was
+       // found with user supplied scan specs (if applicable). Then try
+       // one of the auto detected devices that are not the demo device.
+       // Pick demo in the absence of "genuine" hardware devices.
+       shared_ptr<devices::HardwareDevice> user_device, other_device, demo_device;
+       for (shared_ptr<devices::HardwareDevice> dev : device_manager_.devices()) {
+               if (dev == device_manager_.user_spec_device()) {
+                       user_device = dev;
+               } else if (dev->hardware_device()->driver()->name() == "demo") {
+                       demo_device = dev;
+               } else {
+                       other_device = dev;
+               }
+       }
+       if (user_device)
+               session->select_device(user_device);
+       else if (other_device)
+               session->select_device(other_device);
+       else
+               session->select_device(demo_device);
+}
+
+void MainWindow::save_sessions()
+{
+       QSettings settings;
+       int id = 0;
+
+       for (shared_ptr<Session> session : sessions_) {
+               // Ignore sessions using the demo device or no device at all
+               if (session->device()) {
+                       shared_ptr<devices::HardwareDevice> device =
+                               dynamic_pointer_cast< devices::HardwareDevice >
+                               (session->device());
+
+                       if (device &&
+                               device->hardware_device()->driver()->name() == "demo")
+                               continue;
+
+                       settings.beginGroup("Session" + QString::number(id++));
+                       settings.remove("");  // Remove all keys in this group
+                       session->save_settings(settings);
+                       settings.endGroup();
+               }
+       }
+
+       settings.setValue("sessions", id);
+}
+
+void MainWindow::restore_sessions()
+{
+       QSettings settings;
+       int i, session_count;
+
+       session_count = settings.value("sessions", 0).toInt();
+
+       for (i = 0; i < session_count; i++) {
+               settings.beginGroup("Session" + QString::number(i));
+               shared_ptr<Session> session = add_session();
+               session->restore_settings(settings);
+               settings.endGroup();
+       }
+}
+
+void MainWindow::on_setting_changed(const QString &key, const QVariant &value)
+{
+       if (key == GlobalSettings::Key_View_ColouredBG)
+               on_settingViewColouredBg_changed(value);
+
+       if (key == GlobalSettings::Key_View_ShowSamplingPoints)
+               on_settingViewShowSamplingPoints_changed(value);
+
+       if (key == GlobalSettings::Key_View_ShowAnalogMinorGrid)
+               on_settingViewShowAnalogMinorGrid_changed(value);
+}
+
 void MainWindow::setup_ui()
 {
        setObjectName(QString::fromUtf8("MainWindow"));
@@ -344,7 +413,7 @@ void MainWindow::setup_ui()
 
        // Set the window icon
        QIcon icon;
-       icon.addFile(QString(":/icons/sigrok-logo-notext.png"));
+       icon.addFile(QString(":/icons/pulseview.png"));
        setWindowIcon(icon);
 
        view_sticky_scrolling_shortcut_ = new QShortcut(QKeySequence(Qt::Key_S), this, SLOT(on_view_sticky_scrolling_shortcut()));
@@ -427,38 +496,16 @@ void MainWindow::setup_ui()
 void MainWindow::save_ui_settings()
 {
        QSettings settings;
-       int id = 0;
 
        settings.beginGroup("MainWindow");
        settings.setValue("state", saveState());
        settings.setValue("geometry", saveGeometry());
        settings.endGroup();
-
-       for (shared_ptr<Session> session : sessions_) {
-               // Ignore sessions using the demo device or no device at all
-               if (session->device()) {
-                       shared_ptr<devices::HardwareDevice> device =
-                               dynamic_pointer_cast< devices::HardwareDevice >
-                               (session->device());
-
-                       if (device &&
-                               device->hardware_device()->driver()->name() == "demo")
-                               continue;
-
-                       settings.beginGroup("Session" + QString::number(id++));
-                       settings.remove("");  // Remove all keys in this group
-                       session->save_settings(settings);
-                       settings.endGroup();
-               }
-       }
-
-       settings.setValue("sessions", id);
 }
 
 void MainWindow::restore_ui_settings()
 {
        QSettings settings;
-       int i, session_count;
 
        settings.beginGroup("MainWindow");
 
@@ -469,15 +516,6 @@ void MainWindow::restore_ui_settings()
                resize(1000, 720);
 
        settings.endGroup();
-
-       session_count = settings.value("sessions", 0).toInt();
-
-       for (i = 0; i < session_count; i++) {
-               settings.beginGroup("Session" + QString::number(i));
-               shared_ptr<Session> session = add_session();
-               session->restore_settings(settings);
-               settings.endGroup();
-       }
 }
 
 shared_ptr<Session> MainWindow::get_tab_session(int index) const
@@ -504,6 +542,7 @@ void MainWindow::closeEvent(QCloseEvent *event)
                event->ignore();
        } else {
                save_ui_settings();
+               save_sessions();
                event->accept();
        }
 }
@@ -721,7 +760,8 @@ void MainWindow::on_tab_close_requested(int index)
 {
        shared_ptr<Session> session = get_tab_session(index);
 
-       assert(session);
+       if (!session)
+               return;
 
        if (session->data_saved() || (QMessageBox::question(this, tr("Confirmation"),
                tr("This session contains unsaved data. Close it anyway?"),
@@ -769,8 +809,8 @@ void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
                shared_ptr<views::ViewBase> viewbase = entry.second;
 
                // Only trace views have this setting
-               views::TraceView::View* view =
-                               qobject_cast<views::TraceView::View*>(viewbase.get());
+               views::trace::View* view =
+                               qobject_cast<views::trace::View*>(viewbase.get());
                if (view)
                        view->enable_coloured_bg(state);
        }
@@ -784,8 +824,8 @@ void MainWindow::on_settingViewShowSamplingPoints_changed(const QVariant new_val
                shared_ptr<views::ViewBase> viewbase = entry.second;
 
                // Only trace views have this setting
-               views::TraceView::View* view =
-                               qobject_cast<views::TraceView::View*>(viewbase.get());
+               views::trace::View* view =
+                               qobject_cast<views::trace::View*>(viewbase.get());
                if (view)
                        view->enable_show_sampling_points(state);
        }
@@ -799,8 +839,8 @@ void MainWindow::on_settingViewShowAnalogMinorGrid_changed(const QVariant new_va
                shared_ptr<views::ViewBase> viewbase = entry.second;
 
                // Only trace views have this setting
-               views::TraceView::View* view =
-                               qobject_cast<views::TraceView::View*>(viewbase.get());
+               views::trace::View* view =
+                               qobject_cast<views::trace::View*>(viewbase.get());
                if (view)
                        view->enable_show_analog_minor_grid(state);
        }