#include <QApplication>
#include <QCloseEvent>
#include <QDockWidget>
+#include <QHBoxLayout>
#include <QSettings>
#include <QWidget>
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))
MainWindow::~MainWindow()
{
- for (auto entry : view_docks_) {
-
- const std::shared_ptr<QDockWidget> dock = entry.first;
-
- // Remove view from the dock widget's QMainWindow
- QMainWindow *dock_main = dynamic_cast<QMainWindow*>(dock->widget());
- dock_main->setCentralWidget(0);
-
- // Remove the QMainWindow
- dock->setWidget(0);
-
- const std::shared_ptr<pv::view::View> view = entry.second;
-
- for (shared_ptr<Session> 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
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)
// 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<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;
+ QMainWindow *main_window;
+ for (auto entry : session_windows_)
+ if (entry.first.get() == &session)
+ main_window = entry.second;
- if (type == pv::view::TraceView) {
- shared_ptr<QDockWidget> dock = make_shared<QDockWidget>(title, this);
+ assert(main_window);
+
+ 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<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);
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<views::ViewBase*>(v.get()),
SLOT(trigger_event(util::Timestamp)));
v->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
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*)));
}
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()
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);
+ QMainWindow *window = new QMainWindow();
+ window->setWindowFlags(Qt::Widget); // Remove Qt::Window flag
+ session_windows_[session] = window;
+ session_selector_.addTab(window, name);
+
+ window->setDockNestingEnabled(true);
+
+ 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<view::View> view : session->views()) {
- // Find the dock the view is contained in and close it
+ for (shared_ptr<views::ViewBase> 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<Session> s) {
return s == session; });
{
setObjectName(QString::fromUtf8("MainWindow"));
+ setCentralWidget(&session_selector_);
+
// Set the window icon
QIcon icon;
icon.addFile(QString(":/icons/sigrok-logo-notext.png"));
action_about_->setObjectName(QString::fromUtf8("actionAbout"));
action_about_->setText(tr("&About..."));
- setDockNestingEnabled(true);
+ // Set up the tab area
+ new_session_button_ = new QToolButton();
+ new_session_button_->setIcon(QIcon::fromTheme("document-new",
+ QIcon(":/icons/document-new.png")));
+ new_session_button_->setAutoRaise(true);
+
+ QHBoxLayout* layout = new QHBoxLayout();
+ layout->setContentsMargins(2, 2, 2, 2);
+ layout->addWidget(new_session_button_);
+
+ QWidget* static_tab_widget_ = new QWidget();
+ static_tab_widget_->setLayout(layout);
+
+ session_selector_.setCornerWidget(static_tab_widget_, Qt::TopLeftCorner);
+
+ session_selector_.setTabsClosable(true);
+
+ connect(new_session_button_, SIGNAL(clicked(bool)),
+ this, SLOT(on_new_session_clicked()));
+
+ connect(&session_selector_, SIGNAL(tabCloseRequested(int)),
+ this, SLOT(on_tab_close_requested(int)));
+ connect(&session_selector_, SIGNAL(currentChanged(int)),
+ this, SLOT(on_tab_changed(int)));
+
connect(static_cast<QApplication *>(QCoreApplication::instance()),
SIGNAL(focusChanged(QWidget*, QWidget*)),
}
}
+std::shared_ptr<Session> MainWindow::get_tab_session(int index) const
+{
+ // Find the session that belongs to the tab's main window
+ for (auto entry : session_windows_)
+ if (entry.second == session_selector_.widget(index))
+ return entry.first;
+
+ return nullptr;
+}
+
void MainWindow::closeEvent(QCloseEvent *event)
{
save_ui_settings();
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
void MainWindow::on_focus_changed()
{
- shared_ptr<view::View> 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;
+ static shared_ptr<Session> prev_session;
+
+ shared_ptr<views::ViewBase> view = get_active_view();
+
+ if (view) {
+ for (shared_ptr<Session> session : sessions_) {
+ if (session->has_view(view)) {
+ if (session != prev_session) {
+ // Activate correct tab if necessary
+ shared_ptr<Session> tab_session = get_tab_session(
+ session_selector_.currentIndex());
+ if (tab_session != session)
+ session_selector_.setCurrentWidget(
+ session_windows_.at(session));
+
+ on_focused_session_changed(session);
+ }
+
+ prev_session = session;
+ break;
+ }
+ }
}
- if (!title_set)
+ if (sessions_.empty())
setWindowTitle(WindowTitle);
}
-void MainWindow::on_new_session()
+void MainWindow::on_focused_session_changed(shared_ptr<Session> session)
+{
+ setWindowTitle(session->name() + " - " + WindowTitle);
+}
+
+void MainWindow::on_new_session_clicked()
{
add_session();
}
Session *session = qobject_cast<Session*>(QObject::sender());
assert(session);
- for (shared_ptr<view::View> view : session->views()) {
+ for (shared_ptr<views::ViewBase> view : session->views()) {
// Get the dock that contains the view
for (auto entry : view_docks_)
if (entry.second == view) {
}
// Refresh window title if the affected session has focus
- on_focus_changed();
+ shared_ptr<views::ViewBase> view = get_active_view();
+
+ if (view && session->has_view(view))
+ setWindowTitle(session->name() + " - " + WindowTitle);
}
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()
}
// Get the view contained in the dock widget
- shared_ptr<view::View> view;
+ shared_ptr<views::ViewBase> view;
for (auto entry : view_docks_)
- if (entry.first.get() == dock)
+ if (entry.first == dock)
view = entry.second;
// Deregister the view
}
}
+void MainWindow::on_tab_changed(int index)
+{
+ shared_ptr<Session> session = get_tab_session(index);
+
+ if (session)
+ on_focused_session_changed(session);
+}
+
+void MainWindow::on_tab_close_requested(int index)
+{
+ // TODO Ask user if this is intended in case data is unsaved
+
+ shared_ptr<Session> session = get_tab_session(index);
+
+ if (session)
+ remove_session(session);
+}
+
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