X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=91e38729167d98135b8d9755ecdc315042820217;hp=985f698f8127f1e6efb2cf5f31ed067ec318c132;hb=7ea2a4ff0765fdad34b84e4b4631d6f3f5588714;hpb=143d322d0c92ea5c2cc51facc37b68787362c244 diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 985f698f..91e38729 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,29 +34,26 @@ #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 "view/view.hpp" +#include "util.hpp" +#include "views/trace/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; @@ -67,19 +65,13 @@ 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) : +MainWindow::MainWindow(DeviceManager &device_manager, 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") @@ -90,33 +82,17 @@ MainWindow::MainWindow(DeviceManager &device_manager, GlobalSettings::register_change_handler(GlobalSettings::Key_View_ColouredBG, bind(&MainWindow::on_settingViewColouredBg_changed, this, _1)); - setup_ui(); - restore_ui_settings(); - - if (!open_file_name.empty()) { - shared_ptr 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 = add_session(); + GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowSamplingPoints, + bind(&MainWindow::on_settingViewShowSamplingPoints_changed, this, _1)); - map dev_info; - shared_ptr other_device, demo_device; + GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowAnalogMinorGrid, + bind(&MainWindow::on_settingViewShowAnalogMinorGrid_changed, this, _1)); - // Use any available device that's not demo - for (shared_ptr dev : device_manager_.devices()) { - if (dev->hardware_device()->driver()->name() == "demo") { - demo_device = dev; - } else { - other_device = dev; - } - } + GlobalSettings settings; + settings.set_defaults_where_needed(); - // ...and if there isn't any, just use demo then - session->select_device(other_device ? other_device : demo_device); - } + setup_ui(); + restore_ui_settings(); } MainWindow::~MainWindow() @@ -125,11 +101,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... @@ -138,13 +109,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 @@ -180,7 +151,7 @@ shared_ptr 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(session, + v = make_shared(session, (main_bar ? false : true), dock_main); if (!v) @@ -192,6 +163,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); @@ -202,16 +174,17 @@ shared_ptr 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(v.get()), - SLOT(trigger_event(util::Timestamp))); + SLOT(trigger_event(int, util::Timestamp))); if (type == views::ViewTypeTrace) { - views::TraceView::View *tv = - qobject_cast(v.get()); + views::trace::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 */ @@ -258,7 +231,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(); @@ -305,8 +278,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); @@ -318,6 +301,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; }); @@ -338,6 +322,84 @@ void MainWindow::remove_session(shared_ptr session) } } +void MainWindow::add_session_with_file(string open_file_name, + string open_file_format) +{ + shared_ptr 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 = 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 user_device, other_device, demo_device; + for (shared_ptr 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 : sessions_) { + // Ignore sessions using the demo device or no device at all + if (session->device()) { + shared_ptr 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 = add_session(); + session->restore_settings(settings); + settings.endGroup(); + } +} + void MainWindow::setup_ui() { setObjectName(QString::fromUtf8("MainWindow")); @@ -346,18 +408,21 @@ 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())); 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", @@ -374,8 +439,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); @@ -426,38 +491,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 : sessions_) { - // Ignore sessions using the demo device or no device at all - if (session->device()) { - shared_ptr 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"); @@ -468,18 +511,9 @@ 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 = 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_) @@ -503,6 +537,7 @@ void MainWindow::closeEvent(QCloseEvent *event) event->ignore(); } else { save_ui_settings(); + save_sessions(); event->accept(); } } @@ -544,7 +579,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); } @@ -612,7 +647,7 @@ void MainWindow::on_run_stop_clicked() void MainWindow::on_settings_clicked() { - dialogs::Settings dlg; + dialogs::Settings dlg(device_manager_); dlg.exec(); } @@ -664,7 +699,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); } @@ -673,7 +708,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); @@ -720,7 +755,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?"), @@ -728,21 +764,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) @@ -753,17 +804,41 @@ void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value) shared_ptr viewbase = entry.second; // Only trace views have this setting - views::TraceView::View* view = - qobject_cast(viewbase.get()); + views::trace::View* view = + qobject_cast(viewbase.get()); if (view) view->enable_coloured_bg(state); } } -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::trace::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::trace::View* view = + qobject_cast(viewbase.get()); + if (view) + view->enable_show_analog_minor_grid(state); + } } void MainWindow::on_close_current_tab()