using toolbars::MainBar;
+const QString MainWindow::WindowTitle = tr("PulseView");
+
MainWindow::MainWindow(DeviceManager &device_manager,
string open_file_name, string open_file_format,
QWidget *parent) :
// Remove the QMainWindow
dock->setWidget(0);
- const std::shared_ptr<pv::view::View> view = entry.second;
+ const std::shared_ptr<views::ViewBase> view = entry.second;
for (shared_ptr<Session> session : sessions_)
if (session->has_view(view))
return action_about_;
}
-shared_ptr<pv::view::View> MainWindow::get_active_view() const
+shared_ptr<views::ViewBase> MainWindow::get_active_view() const
{
// If there's only one view, use it...
if (view_docks_.size() == 1)
if (entry.first.get() == dock)
return entry.second;
- return shared_ptr<pv::view::View>();
+ return nullptr;
}
-shared_ptr<pv::view::View> MainWindow::add_view(const QString &title,
- view::ViewType type, Session &session)
+shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
+ views::ViewType type, Session &session)
{
- shared_ptr<pv::view::View> v;
-
- if (type == pv::view::TraceView) {
+ if (type == views::ViewTypeTrace) {
shared_ptr<QDockWidget> dock = make_shared<QDockWidget>(title, this);
dock->setObjectName(title);
addDockWidget(Qt::TopDockWidgetArea, dock.get());
QMainWindow *dock_main = new QMainWindow(dock.get());
dock_main->setWindowFlags(Qt::Widget); // Remove Qt::Window flag
- v = make_shared<pv::view::View>(session, dock_main);
+ shared_ptr<views::TraceView::View> v =
+ make_shared<views::TraceView::View>(session, dock_main);
view_docks_[dock] = v;
session.register_view(v);
dock->setWidget(dock_main);
dock->setFeatures(QDockWidget::DockWidgetMovable |
- QDockWidget::DockWidgetFloatable);
+ QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
+
+ QAbstractButton *close_btn =
+ dock->findChildren<QAbstractButton*>
+ ("qt_dockwidget_closebutton").front();
- if (type == view::TraceView) {
- connect(&session, SIGNAL(trigger_event(util::Timestamp)), v.get(),
+ connect(close_btn, SIGNAL(clicked(bool)),
+ this, SLOT(on_view_close_clicked()));
+
+ if (type == views::ViewTypeTrace) {
+ connect(&session, SIGNAL(trigger_event(util::Timestamp)),
+ qobject_cast<views::ViewBase*>(v.get()),
SLOT(trigger_event(util::Timestamp)));
v->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
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<Session> 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> 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*)));
+ 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<view::View> main_view =
- add_view(name, pv::view::TraceView, *session);
+ shared_ptr<views::ViewBase> main_view =
+ add_view(name, views::ViewTypeTrace, *session);
return session;
}
+void MainWindow::remove_session(shared_ptr<Session> session)
+{
+ for (shared_ptr<views::ViewBase> 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; });
+
+ // Update the window title if there is no view left to
+ // generate focus change events
+ if (sessions_.empty())
+ setWindowTitle(WindowTitle);
+}
+
void MainWindow::setup_ui()
{
setObjectName(QString::fromUtf8("MainWindow"));
setDockNestingEnabled(true);
- // Set the title
- setWindowTitle(tr("PulseView"));
+ connect(static_cast<QApplication *>(QCoreApplication::instance()),
+ SIGNAL(focusChanged(QWidget*, QWidget*)),
+ this, SLOT(on_focus_changed()));
}
void MainWindow::save_ui_settings()
settings.endGroup();
for (shared_ptr<Session> session : sessions_) {
- // Ignore sessions using the demo device
+ // Ignore sessions using the demo device or no device at all
if (session->device()) {
shared_ptr<devices::HardwareDevice> device =
dynamic_pointer_cast< devices::HardwareDevice >
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.beginGroup("Session" + QString::number(id++));
+ settings.remove(""); // Remove all keys in this group
+ session->save_settings(settings);
+ settings.endGroup();
+ }
}
settings.setValue("sessions", id);
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
add_view(title, type, *s);
}
+void MainWindow::on_focus_changed()
+{
+ shared_ptr<views::ViewBase> view;
+ bool title_set = false;
+
+ view = get_active_view();
+
+ for (shared_ptr<Session> session : sessions_) {
+ if (!session->has_view(view))
+ continue;
+
+ setWindowTitle(session->name() + " - " + WindowTitle);
+ title_set = true;
+ }
+
+ if (!title_set)
+ setWindowTitle(WindowTitle);
+}
+
void MainWindow::on_new_session()
{
add_session();
}
+void MainWindow::on_session_name_changed()
+{
+ // Update the corresponding dock widget's name(s)
+ Session *session = qobject_cast<Session*>(QObject::sender());
+ assert(session);
+
+ for (shared_ptr<views::ViewBase> view : session->views()) {
+ // Get the dock that contains the view
+ for (auto entry : view_docks_)
+ if (entry.second == view) {
+ entry.first->setObjectName(session->name());
+ entry.first->setWindowTitle(session->name());
+ }
+ }
+
+ // Refresh window title if the affected session has focus
+ on_focus_changed();
+}
+
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);
+ add_view(session->name(), views::ViewTypeTrace, *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<views::ViewBase> 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();
+ shared_ptr<views::ViewBase> viewbase = get_active_view();
+ views::TraceView::View* view =
+ qobject_cast<views::TraceView::View*>(viewbase.get());
if (view)
view->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
}
void MainWindow::on_actionViewColouredBg_triggered()
{
- shared_ptr<pv::view::View> view = get_active_view();
+ shared_ptr<views::ViewBase> viewbase = get_active_view();
+ views::TraceView::View* view =
+ qobject_cast<views::TraceView::View*>(viewbase.get());
if (view)
view->enable_coloured_bg(action_view_coloured_bg_->isChecked());
}
projects / pulseview.git / blobdiff