X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=638d75b5179fbb63c2e0151d6c6d09ff215b95c5;hp=a20f12a6712a087522ab45d6d770e0fba668fe03;hb=611c86259f66dd1766b10b1e1b671b0fadd51fe2;hpb=d8d053b6e51abf651ca31d0d4822035c06fb7f9b diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index a20f12a6..638d75b5 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include @@ -45,16 +46,17 @@ #include "globalsettings.hpp" #include "toolbars/mainbar.hpp" #include "util.hpp" -#include "view/view.hpp" +#include "views/trace/view.hpp" #include "views/trace/standardbar.hpp" +#ifdef ENABLE_DECODE +#include "subwindows/decoder_selector/subwindow.hpp" +#endif + #include -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 +70,7 @@ using toolbars::MainBar; const QString MainWindow::WindowTitle = tr("PulseView"); -MainWindow::MainWindow(DeviceManager &device_manager, - string open_file_name, string open_file_format, - bool restore_sessions, QWidget *parent) : +MainWindow::MainWindow(DeviceManager &device_manager, QWidget *parent) : QMainWindow(parent), device_manager_(device_manager), session_selector_(this), @@ -79,51 +79,35 @@ MainWindow::MainWindow(DeviceManager &device_manager, icon_green_(":/icons/status-green.svg"), icon_grey_(":/icons/status-grey.svg") { - 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)); + GlobalSettings::add_change_handler(this); setup_ui(); - restore_ui_settings(restore_sessions); - - if (!open_file_name.empty()) { - shared_ptr session = add_session(); - session->load_init_file(open_file_name, open_file_format); - } + restore_ui_settings(); +} - // Add empty default session if there aren't any sessions - if (sessions_.size() == 0) { - shared_ptr session = add_session(); +MainWindow::~MainWindow() +{ + GlobalSettings::remove_change_handler(this); - map dev_info; - shared_ptr other_device, demo_device; + // Make sure we no longer hold any shared pointers to widgets after the + // destructor finishes (goes for sessions and sub windows alike) - // 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; - } - } + while (!sessions_.empty()) + remove_session(sessions_.front()); - // ...and if there isn't any, just use demo then - session->select_device(other_device ? other_device : demo_device); - } + sub_windows_.clear(); } -MainWindow::~MainWindow() +void MainWindow::show_session_error(const QString text, const QString info_text) { - while (!sessions_.empty()) - remove_session(sessions_.front()); + // TODO Emulate noquote() + qDebug() << "Notifying user of session error:" << info_text; + + QMessageBox msg; + msg.setText(text + "\n\n" + info_text); + msg.setStandardButtons(QMessageBox::Ok); + msg.setIcon(QMessageBox::Warning); + msg.exec(); } shared_ptr MainWindow::get_active_view() const @@ -144,7 +128,7 @@ shared_ptr MainWindow::get_active_view() const } // Get the view contained in the dock widget - for (auto entry : view_docks_) + for (auto& entry : view_docks_) if (entry.first == dock) return entry.second; @@ -158,7 +142,7 @@ shared_ptr MainWindow::add_view(const QString &title, shared_ptr v; QMainWindow *main_window = nullptr; - for (auto entry : session_windows_) + for (auto& entry : session_windows_) if (entry.first.get() == &session) main_window = entry.second; @@ -176,7 +160,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) @@ -193,21 +177,21 @@ shared_ptr MainWindow::add_view(const QString &title, QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable); QAbstractButton *close_btn = - dock->findChildren - ("qt_dockwidget_closebutton").front(); + dock->findChildren("qt_dockwidget_closebutton") // clazy:exclude=detaching-temporary + .front(); 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_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool()); + tv->enable_colored_bg(settings.value(GlobalSettings::Key_View_ColoredBG).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()); @@ -219,6 +203,8 @@ shared_ptr MainWindow::add_view(const QString &title, connect(main_bar.get(), SIGNAL(new_view(Session*)), this, SLOT(on_new_view(Session*))); + connect(main_bar.get(), SIGNAL(show_decoder_selector(Session*)), + this, SLOT(on_show_decoder_selector(Session*))); main_bar->action_view_show_cursors()->setChecked(tv->cursors_shown()); @@ -247,7 +233,7 @@ void MainWindow::remove_view(shared_ptr view) continue; // Find the dock the view is contained in and remove it - for (auto entry : view_docks_) + for (auto& entry : view_docks_) if (entry.second == view) { // Remove the view from the session session->deregister_view(view); @@ -268,6 +254,71 @@ void MainWindow::remove_view(shared_ptr view) } } +shared_ptr MainWindow::add_subwindow( + subwindows::SubWindowType type, Session &session) +{ + GlobalSettings settings; + shared_ptr v; + + QMainWindow *main_window = nullptr; + for (auto entry : session_windows_) + if (entry.first.get() == &session) + main_window = entry.second; + + assert(main_window); + + QString title = ""; + + switch (type) { +#ifdef ENABLE_DECODE + case subwindows::SubWindowTypeDecoderSelector: + title = tr("Decoder Selector"); + break; +#endif + default: + break; + } + + 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 + +#ifdef ENABLE_DECODE + if (type == subwindows::SubWindowTypeDecoderSelector) + v = make_shared(session, dock_main); +#endif + + if (!v) + return nullptr; + + sub_windows_[dock] = v; + dock_main->setCentralWidget(v.get()); + dock->setWidget(dock_main); + + dock->setContextMenuPolicy(Qt::PreventContextMenu); + dock->setFeatures(QDockWidget::DockWidgetMovable | + QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable); + + QAbstractButton *close_btn = + dock->findChildren + ("qt_dockwidget_closebutton").front(); + + connect(close_btn, SIGNAL(clicked(bool)), + this, SLOT(on_sub_window_close_clicked())); + + if (v->has_toolbar()) + dock_main->addToolBar(v->create_toolbar(dock_main)); + + if (v->minimum_width() > 0) + dock->setMinimumSize(v->minimum_width(), 0); + + return v; +} + shared_ptr MainWindow::add_session() { static int last_session_id = 1; @@ -303,9 +354,19 @@ 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(); - for (shared_ptr view : session->views()) + // 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 (const shared_ptr& view : session->views()) remove_view(view); QMainWindow *window = session_windows_.at(session); @@ -316,6 +377,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; }); @@ -323,7 +385,7 @@ void MainWindow::remove_session(shared_ptr session) // When there are no more tabs, the height of the QTabWidget // drops to zero. We must prevent this to keep the static // widgets visible - for (QWidget *w : static_tab_widget_->findChildren()) + for (QWidget *w : static_tab_widget_->findChildren()) // clazy:exclude=range-loop w->setMinimumHeight(h); int margin = static_tab_widget_->layout()->contentsMargins().bottom(); @@ -336,6 +398,99 @@ void MainWindow::remove_session(shared_ptr session) } } +void MainWindow::add_session_with_file(string open_file_name, + string open_file_format, + string open_setup_file_name) +{ + shared_ptr session = add_session(); + session->load_init_file(open_file_name, + open_file_format, + open_setup_file_name); +} + +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 (const 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::on_setting_changed(const QString &key, const QVariant &value) +{ + if (key == GlobalSettings::Key_View_ColoredBG) + on_settingViewColoredBg_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 +499,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())); @@ -356,8 +511,8 @@ void MainWindow::setup_ui() 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); + view_colored_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_colored_bg_shortcut())); + view_colored_bg_shortcut_->setAutoRepeat(false); // Set up the tab area new_session_button_ = new QToolButton(); @@ -427,35 +582,14 @@ 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(bool restore_sessions) +void MainWindow::restore_ui_settings() { QSettings settings; @@ -468,25 +602,12 @@ void MainWindow::restore_ui_settings(bool restore_sessions) resize(1000, 720); settings.endGroup(); - - if (restore_sessions) { - 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(); - } - } } 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_) + for (auto& entry : session_windows_) if (entry.second == session_selector_.widget(index)) return entry.first; @@ -497,7 +618,7 @@ void MainWindow::closeEvent(QCloseEvent *event) { bool data_saved = true; - for (auto entry : session_windows_) + for (auto& entry : session_windows_) if (!entry.first->data_saved()) data_saved = false; @@ -507,6 +628,7 @@ void MainWindow::closeEvent(QCloseEvent *event) event->ignore(); } else { save_ui_settings(); + save_sessions(); event->accept(); } } @@ -527,28 +649,11 @@ bool MainWindow::restoreState(const QByteArray &state, int version) return false; } -void MainWindow::session_error(const QString text, const QString info_text) -{ - QMetaObject::invokeMethod(this, "show_session_error", - Qt::QueuedConnection, Q_ARG(QString, text), - Q_ARG(QString, info_text)); -} - -void MainWindow::show_session_error(const QString text, const QString info_text) -{ - QMessageBox msg(this); - msg.setText(text); - msg.setInformativeText(info_text); - msg.setStandardButtons(QMessageBox::Ok); - msg.setIcon(QMessageBox::Warning); - msg.exec(); -} - void MainWindow::on_add_view(const QString &title, views::ViewType type, Session *session) { // We get a pointer and need a reference - for (shared_ptr s : sessions_) + for (shared_ptr& s : sessions_) if (s.get() == session) add_view(title, type, *s); } @@ -605,7 +710,7 @@ void MainWindow::on_run_stop_clicked() switch (session->get_capture_state()) { case Session::Stopped: session->start_capture([&](QString message) { - session_error("Capture failed", message); }); + show_session_error("Capture failed", message); }); break; case Session::AwaitingTrigger: case Session::Running: @@ -626,9 +731,9 @@ void MainWindow::on_session_name_changed() Session *session = qobject_cast(QObject::sender()); assert(session); - for (shared_ptr view : session->views()) { + for (const shared_ptr& view : session->views()) { // Get the dock that contains the view - for (auto entry : view_docks_) + for (auto& entry : view_docks_) if (entry.second == view) { entry.first->setObjectName(session->name()); entry.first->setWindowTitle(session->name()); @@ -636,7 +741,7 @@ void MainWindow::on_session_name_changed() } // Update the tab widget by finding the main window and the tab from that - for (auto entry : session_windows_) + for (auto& entry : session_windows_) if (entry.first.get() == session) { QMainWindow *window = entry.second; const int index = session_selector_.indexOf(window); @@ -668,7 +773,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 (shared_ptr s : sessions_) + for (shared_ptr& s : sessions_) if (s.get() == session) add_view(session->name(), views::ViewTypeTrace, *s); } @@ -689,7 +794,7 @@ void MainWindow::on_view_close_clicked() // Get the view contained in the dock widget shared_ptr view; - for (auto entry : view_docks_) + for (auto& entry : view_docks_) if (entry.first == dock) view = entry.second; @@ -733,12 +838,49 @@ void MainWindow::on_tab_close_requested(int index) remove_session(session); } -void MainWindow::on_view_coloured_bg_shortcut() +void MainWindow::on_show_decoder_selector(Session *session) +{ +#ifdef ENABLE_DECODE + // Close dock widget if it's already showing and return + for (auto entry : sub_windows_) { + QDockWidget* dock = entry.first; + if (dynamic_pointer_cast(entry.second)) { + sub_windows_.erase(dock); + dock->close(); + return; + } + } + + // We get a pointer and need a reference + for (shared_ptr s : sessions_) + if (s.get() == session) + add_subwindow(subwindows::SubWindowTypeDecoderSelector, *s); +#endif +} + +void MainWindow::on_sub_window_close_clicked() +{ + // Find the dock widget that contains the close button that was clicked + QObject *w = QObject::sender(); + QDockWidget *dock = nullptr; + + while (w) { + dock = qobject_cast(w); + if (dock) + break; + w = w->parent(); + } + + sub_windows_.erase(dock); + dock->close(); +} + +void MainWindow::on_view_colored_bg_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_ColoredBG).toBool(); + settings.setValue(GlobalSettings::Key_View_ColoredBG, !state); } void MainWindow::on_view_sticky_scrolling_shortcut() @@ -765,18 +907,18 @@ void MainWindow::on_view_show_analog_minor_grid_shortcut() settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, !state); } -void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value) +void MainWindow::on_settingViewColoredBg_changed(const QVariant new_value) { bool state = new_value.toBool(); - for (auto entry : view_docks_) { + for (auto& entry : view_docks_) { 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); + view->enable_colored_bg(state); } } @@ -784,12 +926,12 @@ void MainWindow::on_settingViewShowSamplingPoints_changed(const QVariant new_val { bool state = new_value.toBool(); - for (auto entry : view_docks_) { + for (auto& entry : view_docks_) { 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_show_sampling_points(state); } @@ -799,12 +941,12 @@ void MainWindow::on_settingViewShowAnalogMinorGrid_changed(const QVariant new_va { bool state = new_value.toBool(); - for (auto entry : view_docks_) { + for (auto& entry : view_docks_) { 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_show_analog_minor_grid(state); }