X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=775f9dec90a53d628271f5580a829b60b2027035;hp=92c92d023225a7d5fa7cb5f54764d4e1218b2a12;hb=cbf7b5db5c3c04b95daf77bc0e6dc112c15e0195;hpb=82f8a42ba990894356fedd141bae2579ff5373a8 diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp index 92c92d02..775f9dec 100644 --- a/pv/mainwindow.cpp +++ b/pv/mainwindow.cpp @@ -69,6 +69,7 @@ MainWindow::MainWindow(DeviceManager &device_manager, QWidget *parent) : QMainWindow(parent), device_manager_(device_manager), + session_selector_(this), action_view_sticky_scrolling_(new QAction(this)), action_view_coloured_bg_(new QAction(this)), action_about_(new QAction(this)) @@ -107,23 +108,8 @@ MainWindow::MainWindow(DeviceManager &device_manager, MainWindow::~MainWindow() { - for (auto entry : view_docks_) { - - const std::shared_ptr dock = entry.first; - - // Remove view from the dock widget's QMainWindow - QMainWindow *dock_main = dynamic_cast(dock->widget()); - dock_main->setCentralWidget(0); - - // Remove the QMainWindow - dock->setWidget(0); - - const std::shared_ptr view = entry.second; - - for (shared_ptr session : sessions_) - if (session->has_view(view)) - session->deregister_view(view); - } + while (!sessions_.empty()) + remove_session(sessions_.front()); } QAction* MainWindow::action_view_sticky_scrolling() const @@ -141,7 +127,7 @@ QAction* MainWindow::action_about() const return action_about_; } -shared_ptr MainWindow::get_active_view() const +shared_ptr MainWindow::get_active_view() const { // If there's only one view, use it... if (view_docks_.size() == 1) @@ -160,27 +146,33 @@ shared_ptr MainWindow::get_active_view() const // Get the view contained in the dock widget for (auto entry : view_docks_) - if (entry.first.get() == dock) + if (entry.first == dock) return entry.second; return nullptr; } -shared_ptr MainWindow::add_view(const QString &title, - view::ViewType type, Session &session) +shared_ptr MainWindow::add_view(const QString &title, + views::ViewType type, Session &session) { - shared_ptr v; + QMainWindow *main_window; + for (auto entry : session_windows_) + if (entry.first.get() == &session) + main_window = entry.second; + + assert(main_window); - if (type == pv::view::TraceView) { - shared_ptr dock = make_shared(title, this); + if (type == views::ViewTypeTrace) { + QDockWidget* dock = new QDockWidget(title, main_window); dock->setObjectName(title); - addDockWidget(Qt::TopDockWidgetArea, dock.get()); + 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.get()); + QMainWindow *dock_main = new QMainWindow(dock); dock_main->setWindowFlags(Qt::Widget); // Remove Qt::Window flag - v = make_shared(session, dock_main); + shared_ptr v = + make_shared(session, dock_main); view_docks_[dock] = v; session.register_view(v); @@ -197,8 +189,9 @@ shared_ptr MainWindow::add_view(const QString &title, connect(close_btn, SIGNAL(clicked(bool)), this, SLOT(on_view_close_clicked())); - if (type == view::TraceView) { - connect(&session, SIGNAL(trigger_event(util::Timestamp)), v.get(), + if (type == views::ViewTypeTrace) { + connect(&session, SIGNAL(trigger_event(util::Timestamp)), + qobject_cast(v.get()), SLOT(trigger_event(util::Timestamp))); v->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked()); @@ -220,53 +213,78 @@ shared_ptr MainWindow::add_view(const QString &title, connect(v.get(), SIGNAL(always_zoom_to_fit_changed(bool)), main_bar.get(), SLOT(on_always_zoom_to_fit_changed(bool))); } + + return v; } - return v; + return nullptr; } shared_ptr MainWindow::add_session() { - int id = sessions_.size(); - QString name = tr("Untitled-%1").arg(id + 1); + static int last_session_id = 1; + QString name = tr("Untitled-%1").arg(last_session_id++); shared_ptr session = make_shared(device_manager_, name); - connect(session.get(), SIGNAL(add_view(const QString&, view::ViewType, Session*)), - this, SLOT(on_add_view(const QString&, view::ViewType, Session*))); + connect(session.get(), SIGNAL(add_view(const QString&, views::ViewType, Session*)), + this, SLOT(on_add_view(const QString&, views::ViewType, Session*))); connect(session.get(), SIGNAL(name_changed()), this, SLOT(on_session_name_changed())); sessions_.push_back(session); - shared_ptr main_view = - add_view(name, pv::view::TraceView, *session); + QMainWindow *window = new QMainWindow(); + window->setWindowFlags(Qt::Widget); // Remove Qt::Window flag + session_windows_[session] = window; + session_selector_.addTab(window, name); + + shared_ptr main_view = + add_view(name, views::ViewTypeTrace, *session); return session; } void MainWindow::remove_session(shared_ptr session) { - for (shared_ptr view : session->views()) { - // Find the dock the view is contained in and close it + for (shared_ptr view : session->views()) { + // Find the dock the view is contained in and remove it for (auto entry : view_docks_) - if (entry.second == view) - entry.first->close(); + if (entry.second == view) { + // Remove the view from the session + session->deregister_view(view); + + // Remove the view from its parent; otherwise, Qt will + // 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 + entry.second->setParent(0); + + // Remove this entry from the container + view_docks_.erase(entry.first); + } } + QMainWindow *window = session_windows_.at(session); + session_selector_.removeTab(session_selector_.indexOf(window)); + + session_windows_.erase(session); + sessions_.remove_if([&](shared_ptr s) { return s == session; }); // Update the window title if there is no view left to // generate focus change events if (sessions_.empty()) - on_session_name_changed(); + setWindowTitle(WindowTitle); } void MainWindow::setup_ui() { setObjectName(QString::fromUtf8("MainWindow")); + setCentralWidget(&session_selector_); + // Set the window icon QIcon icon; icon.addFile(QString(":/icons/sigrok-logo-notext.png")); @@ -374,7 +392,7 @@ bool MainWindow::restoreState(const QByteArray &state, int version) return false; } -void MainWindow::on_add_view(const QString &title, view::ViewType type, +void MainWindow::on_add_view(const QString &title, views::ViewType type, Session *session) { // We get a pointer and need a reference @@ -385,7 +403,7 @@ void MainWindow::on_add_view(const QString &title, view::ViewType type, void MainWindow::on_focus_changed() { - shared_ptr view; + shared_ptr view; bool title_set = false; view = get_active_view(); @@ -413,7 +431,7 @@ void MainWindow::on_session_name_changed() Session *session = qobject_cast(QObject::sender()); assert(session); - for (shared_ptr view : session->views()) { + for (shared_ptr view : session->views()) { // Get the dock that contains the view for (auto entry : view_docks_) if (entry.second == view) { @@ -431,7 +449,7 @@ void MainWindow::on_new_view(Session *session) // We get a pointer and need a reference for (std::shared_ptr s : sessions_) if (s.get() == session) - add_view(session->name(), pv::view::TraceView, *s); + add_view(session->name(), views::ViewTypeTrace, *s); } void MainWindow::on_view_close_clicked() @@ -448,10 +466,10 @@ void MainWindow::on_view_close_clicked() } // Get the view contained in the dock widget - shared_ptr view; + shared_ptr view; for (auto entry : view_docks_) - if (entry.first.get() == dock) + if (entry.first == dock) view = entry.second; // Deregister the view @@ -470,14 +488,18 @@ void MainWindow::on_view_close_clicked() void MainWindow::on_actionViewStickyScrolling_triggered() { - shared_ptr view = get_active_view(); + 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()); } void MainWindow::on_actionViewColouredBg_triggered() { - shared_ptr view = get_active_view(); + 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()); }