#include <libsigrokdecode/libsigrokdecode.h>
#endif
-#include <cassert>
#include <algorithm>
-#include <iterator>
-#include <cstdint>
+#include <cassert>
#include <cstdarg>
+#include <cstdint>
+#include <iterator>
#include <QAction>
#include <QApplication>
#include <QHBoxLayout>
#include <QMessageBox>
#include <QSettings>
-#include <QWidget>
#include <QShortcut>
+#include <QWidget>
#include "mainwindow.hpp"
#include "devicemanager.hpp"
-#include "globalsettings.hpp"
-#include "util.hpp"
#include "devices/hardwaredevice.hpp"
#include "dialogs/settings.hpp"
+#include "globalsettings.hpp"
#include "toolbars/mainbar.hpp"
+#include "util.hpp"
#include "view/view.hpp"
#include "views/trace/standardbar.hpp"
using std::bind;
using std::dynamic_pointer_cast;
-using std::list;
using std::make_shared;
using std::map;
using std::placeholders::_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();
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
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 */
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);
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();
}
}
+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()
{
int tab = session_selector_.currentIndex();