X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=9a3f197d4c2174edd3a9b814b9b340d1fc695fce;hp=eaaea089964c9ba32c245e6d8641c6c592997a02;hb=ae1b6126c9a4e40ad2832e2b2e776f3a4a62e195;hpb=eb8269e3b5eebdd77e6a82d42bcfdfbc3f7613a9 diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index eaaea089..9a3f197d 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -21,11 +21,11 @@ #include #endif -#include #include -#include -#include +#include #include +#include +#include #include #include @@ -34,27 +34,27 @@ #include #include #include -#include #include +#include #include "mainwindow.hpp" #include "devicemanager.hpp" -#include "globalsettings.hpp" -#include "util.hpp" #include "devices/hardwaredevice.hpp" -#include "dialogs/about.hpp" #include "dialogs/settings.hpp" +#include "globalsettings.hpp" #include "toolbars/mainbar.hpp" +#include "util.hpp" #include "view/view.hpp" #include "views/trace/standardbar.hpp" #include +using std::bind; using std::dynamic_pointer_cast; -using std::list; using std::make_shared; using std::map; +using std::placeholders::_1; using std::shared_ptr; using std::string; @@ -66,19 +66,15 @@ class ViewItem; using toolbars::MainBar; -using std::bind; -using std::placeholders::_1; - const QString MainWindow::WindowTitle = tr("PulseView"); MainWindow::MainWindow(DeviceManager &device_manager, string open_file_name, string open_file_format, - QWidget *parent) : + bool restore_sessions, QWidget *parent) : QMainWindow(parent), device_manager_(device_manager), session_selector_(this), session_state_mapper_(this), - action_about_(new QAction(this)), icon_red_(":/icons/status-red.svg"), icon_green_(":/icons/status-green.svg"), icon_grey_(":/icons/status-grey.svg") @@ -89,8 +85,14 @@ MainWindow::MainWindow(DeviceManager &device_manager, GlobalSettings::register_change_handler(GlobalSettings::Key_View_ColouredBG, bind(&MainWindow::on_settingViewColouredBg_changed, this, _1)); + 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)); + setup_ui(); - restore_ui_settings(); + restore_ui_settings(restore_sessions); if (!open_file_name.empty()) { shared_ptr session = add_session(); @@ -124,11 +126,6 @@ MainWindow::~MainWindow() remove_session(sessions_.front()); } -QAction* MainWindow::action_about() const -{ - return action_about_; -} - shared_ptr MainWindow::get_active_view() const { // If there's only one view, use it... @@ -140,10 +137,10 @@ shared_ptr MainWindow::get_active_view() const QDockWidget *dock = nullptr; while (w) { - dock = qobject_cast(w); - if (dock) - break; - w = w->parent(); + dock = qobject_cast(w); + if (dock) + break; + w = w->parent(); } // Get the view contained in the dock widget @@ -191,6 +188,7 @@ shared_ptr MainWindow::add_view(const QString &title, dock_main->setCentralWidget(v.get()); dock->setWidget(dock_main); + dock->setContextMenuPolicy(Qt::PreventContextMenu); dock->setFeatures(QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable); @@ -209,8 +207,9 @@ shared_ptr MainWindow::add_view(const QString &title, views::TraceView::View *tv = qobject_cast(v.get()); - tv->enable_sticky_scrolling(true); tv->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool()); + tv->enable_show_sampling_points(settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool()); + tv->enable_show_analog_minor_grid(settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool()); if (!main_bar) { /* Initial view, create the main bar */ @@ -304,8 +303,18 @@ shared_ptr MainWindow::add_session() void MainWindow::remove_session(shared_ptr 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 view : session->views()) remove_view(view); @@ -317,6 +326,7 @@ void MainWindow::remove_session(shared_ptr 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 s) { return s == session; }); @@ -351,12 +361,15 @@ void MainWindow::setup_ui() view_sticky_scrolling_shortcut_ = new QShortcut(QKeySequence(Qt::Key_S), this, SLOT(on_view_sticky_scrolling_shortcut())); view_sticky_scrolling_shortcut_->setAutoRepeat(false); + view_show_sampling_points_shortcut_ = new QShortcut(QKeySequence(Qt::Key_Period), this, SLOT(on_view_show_sampling_points_shortcut())); + view_show_sampling_points_shortcut_->setAutoRepeat(false); + + view_show_analog_minor_grid_shortcut_ = new QShortcut(QKeySequence(Qt::Key_G), this, SLOT(on_view_show_analog_minor_grid_shortcut())); + view_show_analog_minor_grid_shortcut_->setAutoRepeat(false); + view_coloured_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_coloured_bg_shortcut())); view_coloured_bg_shortcut_->setAutoRepeat(false); - action_about_->setObjectName(QString::fromUtf8("actionAbout")); - action_about_->setToolTip(tr("&About...")); - // Set up the tab area new_session_button_ = new QToolButton(); new_session_button_->setIcon(QIcon::fromTheme("document-new", @@ -373,8 +386,8 @@ void MainWindow::setup_ui() run_stop_shortcut_->setAutoRepeat(false); settings_button_ = new QToolButton(); - settings_button_->setIcon(QIcon::fromTheme("configure", - QIcon(":/icons/configure.png"))); + settings_button_->setIcon(QIcon::fromTheme("preferences-system", + QIcon(":/icons/preferences-system.png"))); settings_button_->setToolTip(tr("Settings")); settings_button_->setAutoRaise(true); @@ -453,10 +466,9 @@ void MainWindow::save_ui_settings() settings.setValue("sessions", id); } -void MainWindow::restore_ui_settings() +void MainWindow::restore_ui_settings(bool restore_sessions) { QSettings settings; - int i, session_count; settings.beginGroup("MainWindow"); @@ -468,17 +480,21 @@ void MainWindow::restore_ui_settings() settings.endGroup(); - session_count = settings.value("sessions", 0).toInt(); + if (restore_sessions) { + int i, session_count; - for (i = 0; i < session_count; i++) { - settings.beginGroup("Session" + QString::number(i)); - shared_ptr session = add_session(); - session->restore_settings(settings); - 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 = add_session(); + session->restore_settings(settings); + settings.endGroup(); + } } } -std::shared_ptr MainWindow::get_tab_session(int index) const +shared_ptr MainWindow::get_tab_session(int index) const { // Find the session that belongs to the tab's main window for (auto entry : session_windows_) @@ -543,7 +559,7 @@ void MainWindow::on_add_view(const QString &title, views::ViewType type, Session *session) { // We get a pointer and need a reference - for (std::shared_ptr s : sessions_) + for (shared_ptr s : sessions_) if (s.get() == session) add_view(title, type, *s); } @@ -611,7 +627,7 @@ void MainWindow::on_run_stop_clicked() void MainWindow::on_settings_clicked() { - dialogs::Settings dlg; + dialogs::Settings dlg(device_manager_); dlg.exec(); } @@ -663,7 +679,7 @@ void MainWindow::on_capture_state_changed(QObject *obj) void MainWindow::on_new_view(Session *session) { // We get a pointer and need a reference - for (std::shared_ptr s : sessions_) + for (shared_ptr s : sessions_) if (s.get() == session) add_view(session->name(), views::ViewTypeTrace, *s); } @@ -719,7 +735,8 @@ void MainWindow::on_tab_close_requested(int index) { shared_ptr 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?"), @@ -727,21 +744,36 @@ void MainWindow::on_tab_close_requested(int index) remove_session(session); } +void MainWindow::on_view_coloured_bg_shortcut() +{ + GlobalSettings settings; + + bool state = settings.value(GlobalSettings::Key_View_ColouredBG).toBool(); + settings.setValue(GlobalSettings::Key_View_ColouredBG, !state); +} + void MainWindow::on_view_sticky_scrolling_shortcut() { - shared_ptr viewbase = get_active_view(); - views::TraceView::View* view = - qobject_cast(viewbase.get()); - if (view) - view->toggle_sticky_scrolling(); + GlobalSettings settings; + + bool state = settings.value(GlobalSettings::Key_View_StickyScrolling).toBool(); + settings.setValue(GlobalSettings::Key_View_StickyScrolling, !state); } -void MainWindow::on_view_coloured_bg_shortcut() +void MainWindow::on_view_show_sampling_points_shortcut() { GlobalSettings settings; - bool state = settings.value(GlobalSettings::Key_View_ColouredBG).toBool(); - settings.setValue(GlobalSettings::Key_View_ColouredBG, !state); + bool state = settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool(); + settings.setValue(GlobalSettings::Key_View_ShowSamplingPoints, !state); +} + +void MainWindow::on_view_show_analog_minor_grid_shortcut() +{ + GlobalSettings settings; + + bool state = settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool(); + settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, !state); } void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value) @@ -759,10 +791,34 @@ void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value) } } -void MainWindow::on_actionAbout_triggered() +void MainWindow::on_settingViewShowSamplingPoints_changed(const QVariant new_value) { - dialogs::About dlg(device_manager_.context(), this); - dlg.exec(); + bool state = new_value.toBool(); + + for (auto entry : view_docks_) { + shared_ptr viewbase = entry.second; + + // Only trace views have this setting + views::TraceView::View* view = + qobject_cast(viewbase.get()); + if (view) + view->enable_show_sampling_points(state); + } +} + +void MainWindow::on_settingViewShowAnalogMinorGrid_changed(const QVariant new_value) +{ + bool state = new_value.toBool(); + + for (auto entry : view_docks_) { + shared_ptr viewbase = entry.second; + + // Only trace views have this setting + views::TraceView::View* view = + qobject_cast(viewbase.get()); + if (view) + view->enable_show_analog_minor_grid(state); + } } void MainWindow::on_close_current_tab()