X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=a20f12a6712a087522ab45d6d770e0fba668fe03;hb=d8d053b6e51abf651ca31d0d4822035c06fb7f9b;hp=2f9ab323008948395f3496e5e14bf39bb0a23736;hpb=ddaded8bccdb05d700b4242b7b3ef59a55b39ac0;p=pulseview.git
diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 2f9ab32..a20f12a 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -17,13 +17,14 @@
* along with this program; if not, see .
*/
-#include
-
#ifdef ENABLE_DECODE
#include
#endif
#include
+#include
+#include
+#include
#include
#include
@@ -33,29 +34,27 @@
#include
#include
#include
-#include
#include
+#include
#include "mainwindow.hpp"
#include "devicemanager.hpp"
-#include "globalsettings.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;
@@ -67,19 +66,15 @@ class ViewItem;
using toolbars::MainBar;
-using std::bind;
-using std::placeholders::_1;
-
const QString MainWindow::WindowTitle = tr("PulseView");
MainWindow::MainWindow(DeviceManager &device_manager,
string open_file_name, string open_file_format,
- QWidget *parent) :
+ bool restore_sessions, QWidget *parent) :
QMainWindow(parent),
device_manager_(device_manager),
session_selector_(this),
session_state_mapper_(this),
- action_about_(new QAction(this)),
icon_red_(":/icons/status-red.svg"),
icon_green_(":/icons/status-green.svg"),
icon_grey_(":/icons/status-grey.svg")
@@ -90,8 +85,14 @@ MainWindow::MainWindow(DeviceManager &device_manager,
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();
+ restore_ui_settings(restore_sessions);
if (!open_file_name.empty()) {
shared_ptr session = add_session();
@@ -125,11 +126,6 @@ MainWindow::~MainWindow()
remove_session(sessions_.front());
}
-QAction* MainWindow::action_about() const
-{
- return action_about_;
-}
-
shared_ptr MainWindow::get_active_view() const
{
// If there's only one view, use it...
@@ -138,13 +134,13 @@ 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
@@ -168,6 +164,8 @@ shared_ptr MainWindow::add_view(const QString &title,
assert(main_window);
+ shared_ptr main_bar = session.main_bar();
+
QDockWidget* dock = new QDockWidget(title, main_window);
dock->setObjectName(title);
main_window->addDockWidget(Qt::TopDockWidgetArea, dock);
@@ -177,7 +175,9 @@ shared_ptr MainWindow::add_view(const QString &title,
dock_main->setWindowFlags(Qt::Widget); // Remove Qt::Window flag
if (type == views::ViewTypeTrace)
- v = make_shared(session, dock_main);
+ // This view will be the main view if there's no main bar yet
+ v = make_shared(session,
+ (main_bar ? false : true), dock_main);
if (!v)
return nullptr;
@@ -188,6 +188,7 @@ shared_ptr MainWindow::add_view(const QString &title,
dock_main->setCentralWidget(v.get());
dock->setWidget(dock_main);
+ dock->setContextMenuPolicy(Qt::PreventContextMenu);
dock->setFeatures(QDockWidget::DockWidgetMovable |
QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
@@ -206,10 +207,10 @@ shared_ptr MainWindow::add_view(const QString &title,
views::TraceView::View *tv =
qobject_cast(v.get());
- tv->enable_sticky_scrolling(true);
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());
- shared_ptr main_bar = session.main_bar();
if (!main_bar) {
/* Initial view, create the main bar */
main_bar = make_shared(session, this, tv);
@@ -255,7 +256,7 @@ void MainWindow::remove_view(shared_ptr view)
// 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(0);
+ view->setParent(nullptr);
// Delete the view's dock widget and all widgets inside it
entry.first->deleteLater();
@@ -349,12 +350,15 @@ void MainWindow::setup_ui()
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);
- action_about_->setObjectName(QString::fromUtf8("actionAbout"));
- action_about_->setToolTip(tr("&About..."));
-
// Set up the tab area
new_session_button_ = new QToolButton();
new_session_button_->setIcon(QIcon::fromTheme("document-new",
@@ -371,8 +375,8 @@ void MainWindow::setup_ui()
run_stop_shortcut_->setAutoRepeat(false);
settings_button_ = new QToolButton();
- settings_button_->setIcon(QIcon::fromTheme("configure",
- QIcon(":/icons/configure.png")));
+ settings_button_->setIcon(QIcon::fromTheme("preferences-system",
+ QIcon(":/icons/preferences-system.png")));
settings_button_->setToolTip(tr("Settings"));
settings_button_->setAutoRaise(true);
@@ -451,10 +455,9 @@ void MainWindow::save_ui_settings()
settings.setValue("sessions", id);
}
-void MainWindow::restore_ui_settings()
+void MainWindow::restore_ui_settings(bool restore_sessions)
{
QSettings settings;
- int i, session_count;
settings.beginGroup("MainWindow");
@@ -466,17 +469,21 @@ void MainWindow::restore_ui_settings()
settings.endGroup();
- session_count = settings.value("sessions", 0).toInt();
+ if (restore_sessions) {
+ int i, session_count;
- for (i = 0; i < session_count; i++) {
- settings.beginGroup("Session" + QString::number(i));
- shared_ptr session = add_session();
- session->restore_settings(settings);
- settings.endGroup();
+ session_count = settings.value("sessions", 0).toInt();
+
+ for (i = 0; i < session_count; i++) {
+ settings.beginGroup("Session" + QString::number(i));
+ shared_ptr session = add_session();
+ session->restore_settings(settings);
+ settings.endGroup();
+ }
}
}
-std::shared_ptr MainWindow::get_tab_session(int index) const
+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_)
@@ -541,7 +548,7 @@ 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);
}
@@ -609,7 +616,7 @@ void MainWindow::on_run_stop_clicked()
void MainWindow::on_settings_clicked()
{
- dialogs::Settings dlg;
+ dialogs::Settings dlg(device_manager_);
dlg.exec();
}
@@ -661,7 +668,7 @@ void MainWindow::on_capture_state_changed(QObject *obj)
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(), views::ViewTypeTrace, *s);
}
@@ -670,7 +677,7 @@ 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);
@@ -717,7 +724,8 @@ void MainWindow::on_tab_close_requested(int index)
{
shared_ptr session = get_tab_session(index);
- assert(session);
+ if (!session)
+ return;
if (session->data_saved() || (QMessageBox::question(this, tr("Confirmation"),
tr("This session contains unsaved data. Close it anyway?"),
@@ -725,21 +733,36 @@ void MainWindow::on_tab_close_requested(int index)
remove_session(session);
}
+void MainWindow::on_view_coloured_bg_shortcut()
+{
+ 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()
{
- shared_ptr viewbase = get_active_view();
- views::TraceView::View* view =
- qobject_cast(viewbase.get());
- if (view)
- view->toggle_sticky_scrolling();
+ GlobalSettings settings;
+
+ bool state = settings.value(GlobalSettings::Key_View_StickyScrolling).toBool();
+ settings.setValue(GlobalSettings::Key_View_StickyScrolling, !state);
}
-void MainWindow::on_view_coloured_bg_shortcut()
+void MainWindow::on_view_show_sampling_points_shortcut()
{
GlobalSettings settings;
- bool state = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
- settings.setValue(GlobalSettings::Key_View_ColouredBG, !state);
+ 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)
@@ -757,10 +780,34 @@ void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
}
}
-void MainWindow::on_actionAbout_triggered()
+void MainWindow::on_settingViewShowSamplingPoints_changed(const QVariant new_value)
{
- dialogs::About dlg(device_manager_.context(), this);
- dlg.exec();
+ 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()