* along with this program; if not, see <http://www.gnu.org/licenses/>.
*/
-#include <cassert>
-
#ifdef ENABLE_DECODE
#include <libsigrokdecode/libsigrokdecode.h>
#endif
#include <algorithm>
+#include <cassert>
+#include <cstdarg>
+#include <cstdint>
#include <iterator>
#include <QAction>
#include <QHBoxLayout>
#include <QMessageBox>
#include <QSettings>
-#include <QWidget>
#include <QShortcut>
+#include <QWidget>
#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 <stdint.h>
-#include <stdarg.h>
#include <libsigrokcxx/libsigrokcxx.hpp>
+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;
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")
qRegisterMetaType<util::Timestamp>("util::Timestamp");
qRegisterMetaType<uint64_t>("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();
remove_session(sessions_.front());
}
-QAction* MainWindow::action_about() const
-{
- return action_about_;
-}
-
shared_ptr<views::ViewBase> MainWindow::get_active_view() const
{
// If there's only one view, use it...
// ...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<QDockWidget*>(w);
- if (dock)
- break;
- w = w->parent();
+ dock = qobject_cast<QDockWidget*>(w);
+ if (dock)
+ break;
+ w = w->parent();
}
// Get the view contained in the dock widget
shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
views::ViewType type, Session &session)
{
+ GlobalSettings settings;
+ shared_ptr<views::ViewBase> v;
+
QMainWindow *main_window = nullptr;
for (auto entry : session_windows_)
if (entry.first.get() == &session)
assert(main_window);
- if (type == views::ViewTypeTrace) {
- QDockWidget* dock = new QDockWidget(title, main_window);
- dock->setObjectName(title);
- 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);
- dock_main->setWindowFlags(Qt::Widget); // Remove Qt::Window flag
-
- shared_ptr<views::TraceView::View> v =
- make_shared<views::TraceView::View>(session, dock_main);
- view_docks_[dock] = v;
- session.register_view(v);
+ shared_ptr<MainBar> 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<QAbstractButton*>
- ("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<views::TraceView::View>(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 == views::ViewTypeTrace) {
- connect(&session, SIGNAL(trigger_event(util::Timestamp)),
- qobject_cast<views::ViewBase*>(v.get()),
- SLOT(trigger_event(util::Timestamp)));
+ view_docks_[dock] = v;
+ session.register_view(v);
- v->enable_sticky_scrolling(true);
- v->enable_coloured_bg(true);
+ dock_main->setCentralWidget(v.get());
+ dock->setWidget(dock_main);
- shared_ptr<MainBar> main_bar = session.main_bar();
- if (!main_bar) {
- /* 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);
+ dock->setContextMenuPolicy(Qt::PreventContextMenu);
+ dock->setFeatures(QDockWidget::DockWidgetMovable |
+ QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
- connect(main_bar.get(), SIGNAL(new_view(Session*)),
- this, SLOT(on_new_view(Session*)));
+ QAbstractButton *close_btn =
+ dock->findChildren<QAbstractButton*>
+ ("qt_dockwidget_closebutton").front();
- main_bar->action_view_show_cursors()->setChecked(v->cursors_shown());
+ connect(close_btn, SIGNAL(clicked(bool)),
+ this, SLOT(on_view_close_clicked()));
- /* 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, v.get());
- dock_main->addToolBar(standard_bar);
+ connect(&session, SIGNAL(trigger_event(util::Timestamp)),
+ qobject_cast<views::ViewBase*>(v.get()),
+ SLOT(trigger_event(util::Timestamp)));
- standard_bar->action_view_show_cursors()->setChecked(v->cursors_shown());
- }
+ if (type == views::ViewTypeTrace) {
+ views::TraceView::View *tv =
+ qobject_cast<views::TraceView::View*>(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<MainBar>(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;
}
- return nullptr;
+ return v;
}
void MainWindow::remove_view(shared_ptr<views::ViewBase> 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();
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",
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);
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)));
}
}
-std::shared_ptr<Session> MainWindow::get_tab_session(int index) const
+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_)
Session *session)
{
// We get a pointer and need a reference
- for (std::shared_ptr<Session> s : sessions_)
+ for (shared_ptr<Session> s : sessions_)
if (s.get() == session)
add_view(title, type, *s);
}
}
}
+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)
void MainWindow::on_new_view(Session *session)
{
// We get a pointer and need a reference
- for (std::shared_ptr<Session> s : sessions_)
+ for (shared_ptr<Session> s : sessions_)
if (s.get() == session)
add_view(session->name(), views::ViewTypeTrace, *s);
}
{
// 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<QDockWidget*>(w);
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<views::ViewBase> viewbase = get_active_view();
- views::TraceView::View* view =
- qobject_cast<views::TraceView::View*>(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()
{
- shared_ptr<views::ViewBase> viewbase = get_active_view();
- views::TraceView::View* view =
- qobject_cast<views::TraceView::View*>(viewbase.get());
- if (view)
- view->toggle_coloured_bg();
+ GlobalSettings settings;
+
+ bool state = settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool();
+ settings.setValue(GlobalSettings::Key_View_ShowSamplingPoints, !state);
}
-void MainWindow::on_actionAbout_triggered()
+void MainWindow::on_view_show_analog_minor_grid_shortcut()
{
- dialogs::About dlg(device_manager_.context(), this);
- dlg.exec();
+ 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<views::ViewBase> viewbase = entry.second;
+
+ // Only trace views have this setting
+ views::TraceView::View* view =
+ qobject_cast<views::TraceView::View*>(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<views::ViewBase> viewbase = entry.second;
+
+ // Only trace views have this setting
+ views::TraceView::View* view =
+ qobject_cast<views::TraceView::View*>(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<views::ViewBase> viewbase = entry.second;
+
+ // Only trace views have this setting
+ views::TraceView::View* view =
+ qobject_cast<views::TraceView::View*>(viewbase.get());
+ if (view)
+ view->enable_show_analog_minor_grid(state);
+ }
}
void MainWindow::on_close_current_tab()
projects / pulseview.git / blobdiff