X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=86a015533f824cb8483e7ef7b456d080266d9ebc;hp=662d68af2f29bdba5ceff5f68931855d18708026;hb=33094993339188a3baef302fb09eff6bf6bb6779;hpb=763945bb95fb3f5871d8b8241c8d9db2f0f66d4c diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 662d68af..86a01553 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -17,13 +17,14 @@ * along with this program; if not, see . */ -#include - #ifdef ENABLE_DECODE #include #endif #include +#include +#include +#include #include #include @@ -33,27 +34,27 @@ #include #include #include -#include #include +#include #include "mainwindow.hpp" #include "devicemanager.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 -#include #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; @@ -74,9 +75,6 @@ MainWindow::MainWindow(DeviceManager &device_manager, device_manager_(device_manager), session_selector_(this), session_state_mapper_(this), - action_view_sticky_scrolling_(new QAction(this)), - action_view_coloured_bg_(new QAction(this)), - action_about_(new QAction(this)), icon_red_(":/icons/status-red.svg"), icon_green_(":/icons/status-green.svg"), icon_grey_(":/icons/status-grey.svg") @@ -84,6 +82,15 @@ MainWindow::MainWindow(DeviceManager &device_manager, qRegisterMetaType("util::Timestamp"); qRegisterMetaType("uint64_t"); + 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(); @@ -119,21 +126,6 @@ MainWindow::~MainWindow() remove_session(sessions_.front()); } -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_about() const -{ - return action_about_; -} - shared_ptr MainWindow::get_active_view() const { // If there's only one view, use it... @@ -142,13 +134,13 @@ shared_ptr MainWindow::get_active_view() const // ...otherwise find the dock widget the widget with focus is contained in QObject *w = QApplication::focusWidget(); - QDockWidget *dock = 0; + 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 @@ -162,6 +154,9 @@ shared_ptr MainWindow::get_active_view() const shared_ptr MainWindow::add_view(const QString &title, views::ViewType type, Session &session) { + GlobalSettings settings; + shared_ptr v; + QMainWindow *main_window = nullptr; for (auto entry : session_windows_) if (entry.first.get() == &session) @@ -169,72 +164,80 @@ shared_ptr MainWindow::add_view(const QString &title, assert(main_window); - if (type == views::ViewTypeTrace) { - QDockWidget* dock = new QDockWidget(title, main_window); - dock->setObjectName(title); - main_window->addDockWidget(Qt::TopDockWidgetArea, dock); - - // Insert a QMainWindow into the dock widget to allow for a tool bar - QMainWindow *dock_main = new QMainWindow(dock); - dock_main->setWindowFlags(Qt::Widget); // Remove Qt::Window flag - - shared_ptr v = - make_shared(session, dock_main); - view_docks_[dock] = v; - session.register_view(v); + shared_ptr main_bar = session.main_bar(); - dock_main->setCentralWidget(v.get()); - dock->setWidget(dock_main); + QDockWidget* dock = new QDockWidget(title, main_window); + dock->setObjectName(title); + main_window->addDockWidget(Qt::TopDockWidgetArea, dock); - dock->setFeatures(QDockWidget::DockWidgetMovable | - QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable); + // Insert a QMainWindow into the dock widget to allow for a tool bar + QMainWindow *dock_main = new QMainWindow(dock); + dock_main->setWindowFlags(Qt::Widget); // Remove Qt::Window flag - QAbstractButton *close_btn = - dock->findChildren - ("qt_dockwidget_closebutton").front(); + if (type == views::ViewTypeTrace) + // This view will be the main view if there's no main bar yet + v = make_shared(session, + (main_bar ? false : true), dock_main); - connect(close_btn, SIGNAL(clicked(bool)), - this, SLOT(on_view_close_clicked())); + if (!v) + return nullptr; - if (type == views::ViewTypeTrace) { - connect(&session, SIGNAL(trigger_event(util::Timestamp)), - qobject_cast(v.get()), - SLOT(trigger_event(util::Timestamp))); + view_docks_[dock] = v; + session.register_view(v); - v->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked()); - v->enable_coloured_bg(action_view_coloured_bg_->isChecked()); + dock_main->setCentralWidget(v.get()); + dock->setWidget(dock_main); - shared_ptr main_bar = session.main_bar(); - if (!main_bar) { - /* Initial view, create the main bar */ - main_bar = make_shared(session, this, v.get()); - dock_main->addToolBar(main_bar.get()); - session.set_main_bar(main_bar); + dock->setContextMenuPolicy(Qt::PreventContextMenu); + dock->setFeatures(QDockWidget::DockWidgetMovable | + QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable); - connect(main_bar.get(), SIGNAL(new_view(Session*)), - this, SLOT(on_new_view(Session*))); + QAbstractButton *close_btn = + dock->findChildren + ("qt_dockwidget_closebutton").front(); - main_bar->action_view_show_cursors()->setChecked(v->cursors_shown()); + connect(close_btn, SIGNAL(clicked(bool)), + this, SLOT(on_view_close_clicked())); - /* For the main view we need to prevent the dock widget from - * closing itself when its close button is clicked. This is - * so we can confirm with the user first. Regular views don't - * need this */ - close_btn->disconnect(SIGNAL(clicked()), dock, SLOT(close())); - } else { - /* Additional view, create a standard bar */ - pv::views::trace::StandardBar *standard_bar = - new pv::views::trace::StandardBar(session, this, v.get()); - dock_main->addToolBar(standard_bar); + connect(&session, SIGNAL(trigger_event(util::Timestamp)), + qobject_cast(v.get()), + SLOT(trigger_event(util::Timestamp))); - standard_bar->action_view_show_cursors()->setChecked(v->cursors_shown()); - } + if (type == views::ViewTypeTrace) { + views::TraceView::View *tv = + qobject_cast(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()); + tv->enable_show_analog_minor_grid(settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool()); + + if (!main_bar) { + /* Initial view, create the main bar */ + main_bar = make_shared(session, this, tv); + dock_main->addToolBar(main_bar.get()); + session.set_main_bar(main_bar); + + connect(main_bar.get(), SIGNAL(new_view(Session*)), + this, SLOT(on_new_view(Session*))); + + main_bar->action_view_show_cursors()->setChecked(tv->cursors_shown()); + + /* For the main view we need to prevent the dock widget from + * closing itself when its close button is clicked. This is + * so we can confirm with the user first. Regular views don't + * need this */ + close_btn->disconnect(SIGNAL(clicked()), dock, SLOT(close())); + } else { + /* Additional view, create a standard bar */ + pv::views::trace::StandardBar *standard_bar = + new pv::views::trace::StandardBar(session, this, tv); + dock_main->addToolBar(standard_bar); + + standard_bar->action_view_show_cursors()->setChecked(tv->cursors_shown()); } - - return v; } - return nullptr; + return v; } void MainWindow::remove_view(shared_ptr view) @@ -253,7 +256,7 @@ void MainWindow::remove_view(shared_ptr view) // call deleteLater() on it, which causes a double free // since the shared_ptr in view_docks_ doesn't know // that Qt keeps a pointer to the view around - view->setParent(0); + view->setParent(nullptr); // Delete the view's dock widget and all widgets inside it entry.first->deleteLater(); @@ -268,7 +271,7 @@ void MainWindow::remove_view(shared_ptr view) shared_ptr MainWindow::add_session() { static int last_session_id = 1; - QString name = tr("Untitled-%1").arg(last_session_id++); + QString name = tr("Session %1").arg(last_session_id++); shared_ptr session = make_shared(device_manager_, name); @@ -344,22 +347,17 @@ void MainWindow::setup_ui() icon.addFile(QString(":/icons/sigrok-logo-notext.png")); setWindowIcon(icon); - action_view_sticky_scrolling_->setCheckable(true); - action_view_sticky_scrolling_->setChecked(true); - action_view_sticky_scrolling_->setShortcut(QKeySequence(Qt::Key_S)); - action_view_sticky_scrolling_->setObjectName( - QString::fromUtf8("actionViewStickyScrolling")); - action_view_sticky_scrolling_->setText(tr("&Sticky Scrolling")); + 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); - 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")); + 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); - action_about_->setObjectName(QString::fromUtf8("actionAbout")); - action_about_->setToolTip(tr("&About...")); + view_coloured_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_coloured_bg_shortcut())); + view_coloured_bg_shortcut_->setAutoRepeat(false); // Set up the tab area new_session_button_ = new QToolButton(); @@ -377,8 +375,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); @@ -412,6 +410,8 @@ void MainWindow::setup_ui() this, SLOT(on_run_stop_clicked())); connect(&session_state_mapper_, SIGNAL(mapped(QObject*)), this, SLOT(on_capture_state_changed(QObject*))); + connect(settings_button_, SIGNAL(clicked(bool)), + this, SLOT(on_settings_clicked())); connect(&session_selector_, SIGNAL(tabCloseRequested(int)), this, SLOT(on_tab_close_requested(int))); @@ -480,7 +480,7 @@ void MainWindow::restore_ui_settings() } } -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_) @@ -545,7 +545,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,6 +611,12 @@ void MainWindow::on_run_stop_clicked() } } +void MainWindow::on_settings_clicked() +{ + dialogs::Settings dlg(device_manager_); + dlg.exec(); +} + void MainWindow::on_session_name_changed() { // Update the corresponding dock widget's name(s) @@ -659,7 +665,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); } @@ -668,7 +674,7 @@ void MainWindow::on_view_close_clicked() { // Find the dock widget that contains the close button that was clicked QObject *w = QObject::sender(); - QDockWidget *dock = 0; + QDockWidget *dock = nullptr; while (w) { dock = qobject_cast(w); @@ -723,28 +729,81 @@ void MainWindow::on_tab_close_requested(int index) remove_session(session); } -void MainWindow::on_actionViewStickyScrolling_triggered() +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->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked()); + GlobalSettings settings; + + bool state = settings.value(GlobalSettings::Key_View_StickyScrolling).toBool(); + settings.setValue(GlobalSettings::Key_View_StickyScrolling, !state); } -void MainWindow::on_actionViewColouredBg_triggered() +void MainWindow::on_view_show_sampling_points_shortcut() { - shared_ptr viewbase = get_active_view(); - views::TraceView::View* view = - qobject_cast(viewbase.get()); - if (view) - view->enable_coloured_bg(action_view_coloured_bg_->isChecked()); + GlobalSettings settings; + + bool state = settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool(); + settings.setValue(GlobalSettings::Key_View_ShowSamplingPoints, !state); } -void MainWindow::on_actionAbout_triggered() +void MainWindow::on_view_show_analog_minor_grid_shortcut() { - dialogs::About dlg(device_manager_.context(), this); - dlg.exec(); + 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) +{ + 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_coloured_bg(state); + } +} + +void MainWindow::on_settingViewShowSamplingPoints_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_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()