X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=205c95ca95a765670d5386e16345ef176dcdf804;hb=0bd39c0c6fcf31063fca364bfdb23d3d40914ba1;hp=98ca7bada700ce1c7b6391ff6fb63a6dce6e0697;hpb=90d77e35b43fb7fdffc800945761bf95ba9faf02;p=pulseview.git
diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 98ca7ba..205c95c 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -14,43 +14,47 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
-#include
-
#ifdef ENABLE_DECODE
#include
#endif
#include
+#include
+#include
+#include
#include
#include
#include
#include
#include
+#include
+#include
#include
+#include
#include
#include "mainwindow.hpp"
#include "devicemanager.hpp"
-#include "util.hpp"
#include "devices/hardwaredevice.hpp"
-#include "dialogs/about.hpp"
+#include "dialogs/settings.hpp"
+#include "globalsettings.hpp"
#include "toolbars/mainbar.hpp"
+#include "util.hpp"
#include "view/view.hpp"
+#include "views/trace/standardbar.hpp"
-#include
-#include
#include
+using std::bind;
using std::dynamic_pointer_cast;
-using std::list;
using std::make_shared;
using std::map;
+using std::placeholders::_1;
using std::shared_ptr;
using std::string;
@@ -69,18 +73,30 @@ MainWindow::MainWindow(DeviceManager &device_manager,
QWidget *parent) :
QMainWindow(parent),
device_manager_(device_manager),
- action_view_sticky_scrolling_(new QAction(this)),
- action_view_coloured_bg_(new QAction(this)),
- action_about_(new QAction(this))
+ session_selector_(this),
+ session_state_mapper_(this),
+ icon_red_(":/icons/status-red.svg"),
+ icon_green_(":/icons/status-green.svg"),
+ icon_grey_(":/icons/status-grey.svg")
{
qRegisterMetaType("util::Timestamp");
+ qRegisterMetaType("uint64_t");
+
+ GlobalSettings::register_change_handler(GlobalSettings::Key_View_ColouredBG,
+ bind(&MainWindow::on_settingViewColouredBg_changed, this, _1));
+
+ GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowSamplingPoints,
+ bind(&MainWindow::on_settingViewShowSamplingPoints_changed, this, _1));
+
+ GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowAnalogMinorGrid,
+ bind(&MainWindow::on_settingViewShowAnalogMinorGrid_changed, this, _1));
setup_ui();
restore_ui_settings();
if (!open_file_name.empty()) {
shared_ptr 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
@@ -100,48 +116,17 @@ MainWindow::MainWindow(DeviceManager &device_manager,
}
// ...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 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);
- }
-}
-
-QAction* MainWindow::action_view_sticky_scrolling() const
-{
- return action_view_sticky_scrolling_;
-}
-
-QAction* MainWindow::action_view_coloured_bg() const
-{
- return action_view_coloured_bg_;
-}
-
-QAction* MainWindow::action_about() const
-{
- return action_about_;
+ while (!sessions_.empty())
+ remove_session(sessions_.front());
}
-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)
@@ -149,147 +134,289 @@ shared_ptr MainWindow::get_active_view() const
// ...otherwise find the dock widget the widget with focus is contained in
QObject *w = QApplication::focusWidget();
- QDockWidget *dock = 0;
+ QDockWidget *dock = nullptr;
while (w) {
- dock = qobject_cast(w);
- if (dock)
- break;
- w = w->parent();
+ dock = qobject_cast(w);
+ if (dock)
+ break;
+ w = w->parent();
}
// 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;
+ GlobalSettings settings;
+ shared_ptr v;
- if (type == pv::view::TraceView) {
- shared_ptr dock = make_shared(title, this);
- dock->setObjectName(title);
- addDockWidget(Qt::TopDockWidgetArea, dock.get());
+ QMainWindow *main_window = nullptr;
+ for (auto entry : session_windows_)
+ if (entry.first.get() == &session)
+ main_window = entry.second;
- // Insert a QMainWindow into the dock widget to allow for a tool bar
- QMainWindow *dock_main = new QMainWindow(dock.get());
- dock_main->setWindowFlags(Qt::Widget); // Remove Qt::Window flag
+ assert(main_window);
- v = make_shared(session, dock_main);
- view_docks_[dock] = v;
- session.register_view(v);
+ shared_ptr main_bar = session.main_bar();
- dock_main->setCentralWidget(v.get());
- dock->setWidget(dock_main);
+ QDockWidget* dock = new QDockWidget(title, main_window);
+ dock->setObjectName(title);
+ main_window->addDockWidget(Qt::TopDockWidgetArea, dock);
- dock->setFeatures(QDockWidget::DockWidgetMovable |
- QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
+ // Insert a QMainWindow into the dock widget to allow for a tool bar
+ QMainWindow *dock_main = new QMainWindow(dock);
+ dock_main->setWindowFlags(Qt::Widget); // Remove Qt::Window flag
- QAbstractButton *close_btn =
- dock->findChildren
- ("qt_dockwidget_closebutton").front();
+ if (type == views::ViewTypeTrace)
+ // This view will be the main view if there's no main bar yet
+ v = make_shared(session,
+ (main_bar ? false : true), dock_main);
- connect(close_btn, SIGNAL(clicked(bool)),
- this, SLOT(on_view_close_clicked()));
+ if (!v)
+ return nullptr;
- if (type == view::TraceView) {
- connect(&session, SIGNAL(trigger_event(util::Timestamp)), v.get(),
- SLOT(trigger_event(util::Timestamp)));
+ view_docks_[dock] = v;
+ session.register_view(v);
- v->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
- v->enable_coloured_bg(action_view_coloured_bg_->isChecked());
+ dock_main->setCentralWidget(v.get());
+ dock->setWidget(dock_main);
- shared_ptr main_bar = session.main_bar();
- if (!main_bar) {
- main_bar = make_shared(session, *this);
- dock_main->addToolBar(main_bar.get());
- session.set_main_bar(main_bar);
+ dock->setFeatures(QDockWidget::DockWidgetMovable |
+ QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
- 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());
+ QAbstractButton *close_btn =
+ dock->findChildren
+ ("qt_dockwidget_closebutton").front();
+
+ connect(close_btn, SIGNAL(clicked(bool)),
+ this, SLOT(on_view_close_clicked()));
- connect(v.get(), SIGNAL(always_zoom_to_fit_changed(bool)),
- main_bar.get(), SLOT(on_always_zoom_to_fit_changed(bool)));
+ connect(&session, SIGNAL(trigger_event(util::Timestamp)),
+ qobject_cast(v.get()),
+ SLOT(trigger_event(util::Timestamp)));
+
+ if (type == views::ViewTypeTrace) {
+ views::TraceView::View *tv =
+ qobject_cast(v.get());
+
+ tv->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
+ tv->enable_show_sampling_points(settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool());
+ tv->enable_show_analog_minor_grid(settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool());
+
+ if (!main_bar) {
+ /* Initial view, create the main bar */
+ main_bar = make_shared(session, this, tv);
+ dock_main->addToolBar(main_bar.get());
+ session.set_main_bar(main_bar);
+
+ connect(main_bar.get(), SIGNAL(new_view(Session*)),
+ this, SLOT(on_new_view(Session*)));
+
+ main_bar->action_view_show_cursors()->setChecked(tv->cursors_shown());
+
+ /* For the main view we need to prevent the dock widget from
+ * closing itself when its close button is clicked. This is
+ * so we can confirm with the user first. Regular views don't
+ * need this */
+ close_btn->disconnect(SIGNAL(clicked()), dock, SLOT(close()));
+ } else {
+ /* Additional view, create a standard bar */
+ pv::views::trace::StandardBar *standard_bar =
+ new pv::views::trace::StandardBar(session, this, tv);
+ dock_main->addToolBar(standard_bar);
+
+ standard_bar->action_view_show_cursors()->setChecked(tv->cursors_shown());
}
}
return v;
}
+void MainWindow::remove_view(shared_ptr view)
+{
+ for (shared_ptr session : sessions_) {
+ if (!session->has_view(view))
+ continue;
+
+ // Find the dock the view is contained in and remove it
+ for (auto entry : view_docks_)
+ 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
+ view->setParent(nullptr);
+
+ // Delete the view's dock widget and all widgets inside it
+ entry.first->deleteLater();
+
+ // Remove the dock widget from the list and stop iterating
+ view_docks_.erase(entry.first);
+ break;
+ }
+ }
+}
+
shared_ptr MainWindow::add_session()
{
static int last_session_id = 1;
- QString name = tr("Untitled-%1").arg(last_session_id++);
+ QString name = tr("Session %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()));
+ 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);
- 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;
+
+ int index = session_selector_.addTab(window, name);
+ session_selector_.setCurrentIndex(index);
+ last_focused_session_ = session;
+
+ window->setDockNestingEnabled(true);
+
+ 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 (auto entry : view_docks_)
- if (entry.second == view)
- entry.first->close();
- }
+ int h = new_session_button_->height();
+
+ for (shared_ptr view : session->views())
+ remove_view(view);
+
+ 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 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())
+ 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"));
setWindowIcon(icon);
- action_view_sticky_scrolling_->setCheckable(true);
- action_view_sticky_scrolling_->setChecked(true);
- action_view_sticky_scrolling_->setShortcut(QKeySequence(Qt::Key_S));
- action_view_sticky_scrolling_->setObjectName(
- QString::fromUtf8("actionViewStickyScrolling"));
- action_view_sticky_scrolling_->setText(tr("&Sticky Scrolling"));
+ view_sticky_scrolling_shortcut_ = new QShortcut(QKeySequence(Qt::Key_S), this, SLOT(on_view_sticky_scrolling_shortcut()));
+ view_sticky_scrolling_shortcut_->setAutoRepeat(false);
+
+ view_show_sampling_points_shortcut_ = new QShortcut(QKeySequence(Qt::Key_Period), this, SLOT(on_view_show_sampling_points_shortcut()));
+ view_show_sampling_points_shortcut_->setAutoRepeat(false);
+
+ view_show_analog_minor_grid_shortcut_ = new QShortcut(QKeySequence(Qt::Key_G), this, SLOT(on_view_show_analog_minor_grid_shortcut()));
+ view_show_analog_minor_grid_shortcut_->setAutoRepeat(false);
+
+ view_coloured_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_coloured_bg_shortcut()));
+ view_coloured_bg_shortcut_->setAutoRepeat(false);
+
+ // 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_->setToolTip(tr("Start/Stop Acquisition"));
- action_view_coloured_bg_->setCheckable(true);
- action_view_coloured_bg_->setChecked(true);
- 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"));
+ run_stop_shortcut_ = new QShortcut(QKeySequence(Qt::Key_Space), run_stop_button_, SLOT(click()));
+ run_stop_shortcut_->setAutoRepeat(false);
- action_about_->setObjectName(QString::fromUtf8("actionAbout"));
- action_about_->setText(tr("&About..."));
+ settings_button_ = new QToolButton();
+ settings_button_->setIcon(QIcon::fromTheme("preferences-system",
+ QIcon(":/icons/preferences-system.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);
+
+ close_application_shortcut_ = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q), this, SLOT(close()));
+ close_application_shortcut_->setAutoRepeat(false);
+
+ close_current_tab_shortcut_ = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_W), this, SLOT(on_close_current_tab()));
+
+ 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(settings_button_, SIGNAL(clicked(bool)),
+ this, SLOT(on_settings_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)));
- setDockNestingEnabled(true);
connect(static_cast(QCoreApplication::instance()),
SIGNAL(focusChanged(QWidget*, QWidget*)),
@@ -352,10 +479,32 @@ void MainWindow::restore_ui_settings()
}
}
+shared_ptr 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();
- event->accept();
+ bool data_saved = true;
+
+ for (auto entry : session_windows_)
+ if (!entry.first->data_saved())
+ data_saved = false;
+
+ if (!data_saved && (QMessageBox::question(this, tr("Confirmation"),
+ tr("There is unsaved data. Close anyway?"),
+ QMessageBox::Yes | QMessageBox::No) == QMessageBox::No)) {
+ event->ignore();
+ } else {
+ save_ui_settings();
+ event->accept();
+ }
}
QMenu* MainWindow::createPopupMenu()
@@ -374,46 +523,106 @@ bool MainWindow::restoreState(const QByteArray &state, int version)
return false;
}
-void MainWindow::on_add_view(const QString &title, view::ViewType type,
+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)
{
// We get a pointer and need a reference
- for (std::shared_ptr s : sessions_)
+ for (shared_ptr s : sessions_)
if (s.get() == session)
add_view(title, type, *s);
}
void MainWindow::on_focus_changed()
{
- shared_ptr view;
- bool title_set = false;
+ shared_ptr view = get_active_view();
+
+ if (view) {
+ for (shared_ptr session : sessions_) {
+ if (session->has_view(view)) {
+ if (session != last_focused_session_) {
+ // Activate correct tab if necessary
+ shared_ptr 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 : sessions_) {
- if (!session->has_view(view))
- continue;
+void MainWindow::on_focused_session_changed(shared_ptr 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 = 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_settings_clicked()
+{
+ dialogs::Settings dlg(device_manager_);
+ dlg.exec();
+}
+
void MainWindow::on_session_name_changed()
{
// Update the corresponding dock widget's name(s)
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) {
@@ -422,23 +631,49 @@ void MainWindow::on_session_name_changed()
}
}
+ // 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(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)
{
// We get a pointer and need a reference
- for (std::shared_ptr s : sessions_)
+ for (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()
{
// Find the dock widget that contains the close button that was clicked
QObject *w = QObject::sender();
- QDockWidget *dock = 0;
+ QDockWidget *dock = nullptr;
while (w) {
dock = qobject_cast(w);
@@ -448,10 +683,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
@@ -459,33 +694,122 @@ void MainWindow::on_view_close_clicked()
if (!session->has_view(view))
continue;
- // Also destroy the entire session if its main view is closing
+ // Also destroy the entire session if its main view is closing...
if (view == session->main_view()) {
- remove_session(session);
+ // ...but only if data is saved or the user confirms closing
+ if (session->data_saved() || (QMessageBox::question(this, tr("Confirmation"),
+ tr("This session contains unsaved data. Close it anyway?"),
+ QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes))
+ remove_session(session);
break;
} else
- session->deregister_view(view);
+ // All other views can be closed at any time as no data will be lost
+ remove_view(view);
}
}
-void MainWindow::on_actionViewStickyScrolling_triggered()
+void MainWindow::on_tab_changed(int index)
{
- shared_ptr view = get_active_view();
- if (view)
- view->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
+ shared_ptr session = get_tab_session(index);
+
+ if (session)
+ on_focused_session_changed(session);
}
-void MainWindow::on_actionViewColouredBg_triggered()
+void MainWindow::on_tab_close_requested(int index)
{
- shared_ptr view = get_active_view();
- if (view)
- view->enable_coloured_bg(action_view_coloured_bg_->isChecked());
+ shared_ptr session = get_tab_session(index);
+
+ assert(session);
+
+ if (session->data_saved() || (QMessageBox::question(this, tr("Confirmation"),
+ tr("This session contains unsaved data. Close it anyway?"),
+ QMessageBox::Yes | QMessageBox::No) == QMessageBox::Yes))
+ remove_session(session);
}
-void MainWindow::on_actionAbout_triggered()
+void MainWindow::on_view_coloured_bg_shortcut()
{
- dialogs::About dlg(device_manager_.context(), this);
- dlg.exec();
+ GlobalSettings settings;
+
+ bool state = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
+ settings.setValue(GlobalSettings::Key_View_ColouredBG, !state);
+}
+
+void MainWindow::on_view_sticky_scrolling_shortcut()
+{
+ GlobalSettings settings;
+
+ bool state = settings.value(GlobalSettings::Key_View_StickyScrolling).toBool();
+ settings.setValue(GlobalSettings::Key_View_StickyScrolling, !state);
+}
+
+void MainWindow::on_view_show_sampling_points_shortcut()
+{
+ GlobalSettings settings;
+
+ bool state = settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool();
+ settings.setValue(GlobalSettings::Key_View_ShowSamplingPoints, !state);
+}
+
+void MainWindow::on_view_show_analog_minor_grid_shortcut()
+{
+ GlobalSettings settings;
+
+ bool state = settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool();
+ settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, !state);
+}
+
+void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
+{
+ bool state = new_value.toBool();
+
+ for (auto entry : view_docks_) {
+ shared_ptr viewbase = entry.second;
+
+ // Only trace views have this setting
+ views::TraceView::View* view =
+ qobject_cast(viewbase.get());
+ if (view)
+ view->enable_coloured_bg(state);
+ }
+}
+
+void MainWindow::on_settingViewShowSamplingPoints_changed(const QVariant new_value)
+{
+ bool state = new_value.toBool();
+
+ for (auto entry : view_docks_) {
+ shared_ptr viewbase = entry.second;
+
+ // Only trace views have this setting
+ views::TraceView::View* view =
+ qobject_cast(viewbase.get());
+ if (view)
+ view->enable_show_sampling_points(state);
+ }
+}
+
+void MainWindow::on_settingViewShowAnalogMinorGrid_changed(const QVariant new_value)
+{
+ bool state = new_value.toBool();
+
+ for (auto entry : view_docks_) {
+ shared_ptr viewbase = entry.second;
+
+ // Only trace views have this setting
+ views::TraceView::View* view =
+ qobject_cast(viewbase.get());
+ if (view)
+ view->enable_show_analog_minor_grid(state);
+ }
+}
+
+void MainWindow::on_close_current_tab()
+{
+ int tab = session_selector_.currentIndex();
+
+ on_tab_close_requested(tab);
}
} // namespace pv