dock->setWidget(dock_main);
dock->setFeatures(QDockWidget::DockWidgetMovable |
- QDockWidget::DockWidgetFloatable);
+ QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
+
+ QAbstractButton *close_btn =
+ dock->findChildren<QAbstractButton*>
+ ("qt_dockwidget_closebutton").front();
+
+ 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(),
main_bar = make_shared<MainBar>(session, *this);
dock_main->addToolBar(main_bar.get());
session.set_main_bar(main_bar);
+
+ connect(main_bar.get(), SIGNAL(new_session()),
+ this, SLOT(on_new_session()));
+ connect(main_bar.get(), SIGNAL(new_view(Session*)),
+ this, SLOT(on_new_view(Session*)));
}
main_bar->action_view_show_cursors()->setChecked(v->cursors_shown());
shared_ptr<Session> session = make_shared<Session>(device_manager_, name);
+ connect(session.get(), SIGNAL(add_view(const QString&, view::ViewType, Session*)),
+ this, SLOT(on_add_view(const QString&, view::ViewType, Session*)));
+
sessions_.push_back(session);
shared_ptr<view::View> main_view =
return session;
}
+void MainWindow::remove_session(shared_ptr<Session> session)
+{
+ for (shared_ptr<view::View> view : session->views()) {
+ // Find the dock the view is contained in and close it
+ for (auto entry : view_docks_)
+ if (entry.second == view)
+ entry.first->close();
+ }
+
+ sessions_.remove_if([&](shared_ptr<Session> s) {
+ return s == session; });
+}
+
void MainWindow::setup_ui()
{
setObjectName(QString::fromUtf8("MainWindow"));
action_about_->setObjectName(QString::fromUtf8("actionAbout"));
action_about_->setText(tr("&About..."));
+ setDockNestingEnabled(true);
+
// Set the title
setWindowTitle(tr("PulseView"));
}
dynamic_pointer_cast< devices::HardwareDevice >
(session->device());
- if (device->hardware_device()->driver()->name() == "demo")
+ if (device &&
+ device->hardware_device()->driver()->name() == "demo")
continue;
}
return false;
}
+void MainWindow::on_add_view(const QString &title, view::ViewType type,
+ Session *session)
+{
+ // We get a pointer and need a reference
+ for (std::shared_ptr<Session> s : sessions_)
+ if (s.get() == session)
+ add_view(title, type, *s);
+}
+
+void MainWindow::on_new_session()
+{
+ add_session();
+}
+
+void MainWindow::on_new_view(Session *session)
+{
+ // We get a pointer and need a reference
+ for (std::shared_ptr<Session> s : sessions_)
+ if (s.get() == session)
+ add_view(session->name(), pv::view::TraceView, *s);
+}
+
+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;
+
+ while (w) {
+ dock = qobject_cast<QDockWidget*>(w);
+ if (dock)
+ break;
+ w = w->parent();
+ }
+
+ // Get the view contained in the dock widget
+ shared_ptr<view::View> view;
+
+ for (auto entry : view_docks_)
+ if (entry.first.get() == dock)
+ view = entry.second;
+
+ // Deregister the view
+ for (shared_ptr<Session> session : sessions_) {
+ if (!session->has_view(view))
+ continue;
+
+ // Also destroy the entire session if its main view is closing
+ if (view == session->main_view()) {
+ remove_session(session);
+ break;
+ } else
+ session->deregister_view(view);
+ }
+}
+
void MainWindow::on_actionViewStickyScrolling_triggered()
{
shared_ptr<pv::view::View> view = get_active_view();