#include <QApplication>
#include <QCloseEvent>
#include <QDockWidget>
+#include <QHBoxLayout>
+#include <QMessageBox>
#include <QSettings>
#include <QWidget>
#include "dialogs/about.hpp"
#include "toolbars/mainbar.hpp"
#include "view/view.hpp"
+#include "views/trace/standardbar.hpp"
#include <stdint.h>
#include <stdarg.h>
QWidget *parent) :
QMainWindow(parent),
device_manager_(device_manager),
+ session_selector_(this),
+ session_state_mapper_(this),
action_view_sticky_scrolling_(new QAction(this)),
action_view_coloured_bg_(new QAction(this)),
- action_about_(new QAction(this))
+ action_about_(new QAction(this)),
+ icon_red_(":/icons/status-red.svg"),
+ icon_green_(":/icons/status-green.svg"),
+ icon_grey_(":/icons/status-grey.svg")
{
qRegisterMetaType<util::Timestamp>("util::Timestamp");
if (!open_file_name.empty()) {
shared_ptr<Session> session = add_session();
- session->main_bar()->load_init_file(open_file_name, open_file_format);
+ session->load_init_file(open_file_name, open_file_format);
}
// Add empty default session if there aren't any sessions
}
// ...and if there isn't any, just use demo then
- session->main_bar()->select_device(other_device ?
- other_device : demo_device);
+ session->select_device(other_device ? other_device : demo_device);
}
}
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<views::ViewBase> 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
// 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<views::ViewBase> MainWindow::add_view(const QString &title,
views::ViewType type, Session &session)
{
+ QMainWindow *main_window = nullptr;
+ for (auto entry : session_windows_)
+ if (entry.first.get() == &session)
+ main_window = entry.second;
+
+ assert(main_window);
+
if (type == views::ViewTypeTrace) {
- shared_ptr<QDockWidget> dock = make_shared<QDockWidget>(title, this);
+ 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
shared_ptr<views::TraceView::View> v =
shared_ptr<MainBar> main_bar = session.main_bar();
if (!main_bar) {
- main_bar = make_shared<MainBar>(session, *this);
+ /* Initial view, create the main bar */
+ main_bar = make_shared<MainBar>(session, this, v.get());
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());
- connect(v.get(), SIGNAL(always_zoom_to_fit_changed(bool)),
- main_bar.get(), SLOT(on_always_zoom_to_fit_changed(bool)));
+ main_bar->action_view_show_cursors()->setChecked(v->cursors_shown());
+ } else {
+ /* Additional view, create a standard bar */
+ pv::views::trace::StandardBar *standard_bar =
+ new pv::views::trace::StandardBar(session, this, v.get());
+ dock_main->addToolBar(standard_bar);
+
+ standard_bar->action_view_show_cursors()->setChecked(v->cursors_shown());
+ }
}
return v;
this, SLOT(on_add_view(const QString&, views::ViewType, Session*)));
connect(session.get(), SIGNAL(name_changed()),
this, SLOT(on_session_name_changed()));
+ session_state_mapper_.setMapping(session.get(), session.get());
+ connect(session.get(), SIGNAL(capture_state_changed(int)),
+ &session_state_mapper_, SLOT(map()));
sessions_.push_back(session);
+ QMainWindow *window = new QMainWindow();
+ window->setWindowFlags(Qt::Widget); // Remove Qt::Window flag
+ session_windows_[session] = window;
+
+ int index = session_selector_.addTab(window, name);
+ session_selector_.setCurrentIndex(index);
+ last_focused_session_ = session;
+
+ window->setDockNestingEnabled(true);
+
shared_ptr<views::ViewBase> main_view =
add_view(name, views::ViewTypeTrace, *session);
void MainWindow::remove_session(shared_ptr<Session> session)
{
+ int h = new_session_button_->height();
+
for (shared_ptr<views::ViewBase> view : session->views()) {
- // Find the dock the view is contained in and close it
+ // 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);
+
+ if (last_focused_session_ == session)
+ last_focused_session_.reset();
+
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())
+ if (sessions_.empty()) {
+ // 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<QWidget*>())
+ w->setMinimumHeight(h);
+
+ int margin = static_tab_widget_->layout()->contentsMargins().bottom();
+ static_tab_widget_->setMinimumHeight(h + 2 * margin);
+ session_selector_.setMinimumHeight(h + 2 * margin);
+
+ // Update the window title if there is no view left to
+ // generate focus change events
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"));
action_view_coloured_bg_->setShortcut(QKeySequence(Qt::Key_B));
action_view_coloured_bg_->setObjectName(
QString::fromUtf8("actionViewColouredBg"));
- action_view_coloured_bg_->setText(tr("Use &coloured backgrounds"));
+ action_view_coloured_bg_->setText(tr("Use &Coloured Backgrounds"));
action_about_->setObjectName(QString::fromUtf8("actionAbout"));
- action_about_->setText(tr("&About..."));
+ action_about_->setToolTip(tr("&About..."));
+
+ // 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_->setToolTip(tr("Create New Session"));
+ new_session_button_->setAutoRaise(true);
+
+ run_stop_button_ = new QToolButton();
+ run_stop_button_->setAutoRaise(true);
+ run_stop_button_->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
+ run_stop_button_->setShortcut(QKeySequence(Qt::Key_Space));
+ run_stop_button_->setToolTip(tr("Start/Stop Acquisition"));
+
+ settings_button_ = new QToolButton();
+ settings_button_->setIcon(QIcon::fromTheme("configure",
+ QIcon(":/icons/configure.png")));
+ settings_button_->setToolTip(tr("Settings"));
+ settings_button_->setAutoRaise(true);
+
+ QFrame *separator1 = new QFrame();
+ separator1->setFrameStyle(QFrame::VLine | QFrame::Raised);
+ QFrame *separator2 = new QFrame();
+ separator2->setFrameStyle(QFrame::VLine | QFrame::Raised);
+
+ QHBoxLayout* layout = new QHBoxLayout();
+ layout->setContentsMargins(2, 2, 2, 2);
+ layout->addWidget(new_session_button_);
+ layout->addWidget(separator1);
+ layout->addWidget(run_stop_button_);
+ layout->addWidget(separator2);
+ layout->addWidget(settings_button_);
+
+ 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(run_stop_button_, SIGNAL(clicked(bool)),
+ this, SLOT(on_run_stop_clicked()));
+ connect(&session_state_mapper_, SIGNAL(mapped(QObject*)),
+ this, SLOT(on_capture_state_changed(QObject*)));
+
+ 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)));
- setDockNestingEnabled(true);
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::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)
{
void MainWindow::on_focus_changed()
{
- shared_ptr<views::ViewBase> view;
- bool title_set = false;
+ shared_ptr<views::ViewBase> view = get_active_view();
+
+ if (view) {
+ for (shared_ptr<Session> session : sessions_) {
+ if (session->has_view(view)) {
+ if (session != last_focused_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);
+ }
+
+ break;
+ }
+ }
+ }
- view = get_active_view();
+ if (sessions_.empty())
+ setWindowTitle(WindowTitle);
+}
- for (shared_ptr<Session> session : sessions_) {
- if (!session->has_view(view))
- continue;
+void MainWindow::on_focused_session_changed(shared_ptr<Session> session)
+{
+ last_focused_session_ = session;
- setWindowTitle(session->name() + " - " + WindowTitle);
- title_set = true;
- }
+ setWindowTitle(session->name() + " - " + WindowTitle);
- if (!title_set)
- setWindowTitle(WindowTitle);
+ // Update the state of the run/stop button, too
+ on_capture_state_changed(session.get());
}
-void MainWindow::on_new_session()
+void MainWindow::on_new_session_clicked()
{
add_session();
}
+void MainWindow::on_run_stop_clicked()
+{
+ shared_ptr<Session> session = last_focused_session_;
+
+ if (!session)
+ return;
+
+ switch (session->get_capture_state()) {
+ case Session::Stopped:
+ session->start_capture([&](QString message) {
+ session_error("Capture failed", message); });
+ break;
+ case Session::AwaitingTrigger:
+ case Session::Running:
+ session->stop_capture();
+ break;
+ }
+}
+
void MainWindow::on_session_name_changed()
{
// Update the corresponding dock widget's name(s)
}
}
+ // Update the tab widget by finding the main window and the tab from that
+ for (auto entry : session_windows_)
+ if (entry.first.get() == session) {
+ QMainWindow *window = entry.second;
+ const int index = session_selector_.indexOf(window);
+ session_selector_.setTabText(index, session->name());
+ }
+
// Refresh window title if the affected session has focus
- on_focus_changed();
+ if (session == last_focused_session_.get())
+ setWindowTitle(session->name() + " - " + WindowTitle);
+}
+
+void MainWindow::on_capture_state_changed(QObject *obj)
+{
+ Session *caller = qobject_cast<Session*>(obj);
+
+ // Ignore if caller is not the currently focused session
+ // unless there is only one session
+ if ((sessions_.size() > 1) && (caller != last_focused_session_.get()))
+ return;
+
+ int state = caller->get_capture_state();
+
+ const QIcon *icons[] = {&icon_grey_, &icon_red_, &icon_green_};
+ run_stop_button_->setIcon(*icons[state]);
+ run_stop_button_->setText((state == pv::Session::Stopped) ?
+ tr("Run") : tr("Stop"));
}
void MainWindow::on_new_view(Session *session)
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<views::ViewBase> viewbase = get_active_view();
projects / pulseview.git / blobdiff