#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;
using toolbars::MainBar;
-using std::bind;
-using std::placeholders::_1;
-
const QString MainWindow::WindowTitle = tr("PulseView");
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));
+
setup_ui();
restore_ui_settings();
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());
if (!main_bar) {
/* Initial view, create the main bar */
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_coloured_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_coloured_bg_shortcut()));
view_coloured_bg_shortcut_->setAutoRepeat(false);
}
}
-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_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);
}
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_settingViewColouredBg_changed(const QVariant new_value)
{
bool state = new_value.toBool();
}
}
+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_close_current_tab()
{
int tab = session_selector_.currentIndex();