X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.cpp;h=25377024278ca8f7475a572c3d9867d7a64efdb8;hp=119ce0a791ba22a2aa1d6b1702a387fd6bef9caf;hb=ff046cb6c42a2382ee281e83955b7ae44030b42e;hpb=6e2a5b1d677a26a637465cd4d304e2bc52e14f36

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 119ce0a7..25377024 100644
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -30,6 +30,7 @@
 #include <QAction>
 #include <QApplication>
 #include <QCloseEvent>
+#include <QDebug>
 #include <QDockWidget>
 #include <QHBoxLayout>
 #include <QMessageBox>
@@ -50,11 +51,8 @@
 
 #include <libsigrokcxx/libsigrokcxx.hpp>
 
-using std::bind;
 using std::dynamic_pointer_cast;
 using std::make_shared;
-using std::map;
-using std::placeholders::_1;
 using std::shared_ptr;
 using std::string;
 
@@ -80,17 +78,7 @@ MainWindow::MainWindow(DeviceManager &device_manager, QWidget *parent) :
 	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));
-
-	GlobalSettings settings;
-	settings.set_defaults_where_needed();
+	GlobalSettings::add_change_handler(this);
 
 	setup_ui();
 	restore_ui_settings();
@@ -98,10 +86,25 @@ MainWindow::MainWindow(DeviceManager &device_manager, QWidget *parent) :
 
 MainWindow::~MainWindow()
 {
+	GlobalSettings::remove_change_handler(this);
+
 	while (!sessions_.empty())
 		remove_session(sessions_.front());
 }
 
+void MainWindow::show_session_error(const QString text, const QString info_text)
+{
+	// TODO Emulate noquote()
+	qDebug() << "Notifying user of session error:" << info_text;
+
+	QMessageBox msg;
+	msg.setText(text);
+	msg.setInformativeText(info_text);
+	msg.setStandardButtons(QMessageBox::Ok);
+	msg.setIcon(QMessageBox::Warning);
+	msg.exec();
+}
+
 shared_ptr<views::ViewBase> MainWindow::get_active_view() const
 {
 	// If there's only one view, use it...
@@ -175,15 +178,15 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
 	connect(close_btn, SIGNAL(clicked(bool)),
 		this, SLOT(on_view_close_clicked()));
 
-	connect(&session, SIGNAL(trigger_event(util::Timestamp)),
+	connect(&session, SIGNAL(trigger_event(int, util::Timestamp)),
 		qobject_cast<views::ViewBase*>(v.get()),
-		SLOT(trigger_event(util::Timestamp)));
+		SLOT(trigger_event(int, util::Timestamp)));
 
 	if (type == views::ViewTypeTrace) {
 		views::trace::View *tv =
 			qobject_cast<views::trace::View*>(v.get());
 
-		tv->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
+		tv->enable_colored_bg(settings.value(GlobalSettings::Key_View_ColoredBG).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());
 
@@ -401,6 +404,18 @@ void MainWindow::restore_sessions()
 	}
 }
 
+void MainWindow::on_setting_changed(const QString &key, const QVariant &value)
+{
+	if (key == GlobalSettings::Key_View_ColoredBG)
+		on_settingViewColoredBg_changed(value);
+
+	if (key == GlobalSettings::Key_View_ShowSamplingPoints)
+		on_settingViewShowSamplingPoints_changed(value);
+
+	if (key == GlobalSettings::Key_View_ShowAnalogMinorGrid)
+		on_settingViewShowAnalogMinorGrid_changed(value);
+}
+
 void MainWindow::setup_ui()
 {
 	setObjectName(QString::fromUtf8("MainWindow"));
@@ -421,8 +436,8 @@ void MainWindow::setup_ui()
 	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);
+	view_colored_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_colored_bg_shortcut()));
+	view_colored_bg_shortcut_->setAutoRepeat(false);
 
 	// Set up the tab area
 	new_session_button_ = new QToolButton();
@@ -559,23 +574,6 @@ bool MainWindow::restoreState(const QByteArray &state, int version)
 	return false;
 }
 
-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)
 {
@@ -637,7 +635,7 @@ void MainWindow::on_run_stop_clicked()
 	switch (session->get_capture_state()) {
 	case Session::Stopped:
 		session->start_capture([&](QString message) {
-			session_error("Capture failed", message); });
+			show_session_error("Capture failed", message); });
 		break;
 	case Session::AwaitingTrigger:
 	case Session::Running:
@@ -765,12 +763,12 @@ void MainWindow::on_tab_close_requested(int index)
 		remove_session(session);
 }
 
-void MainWindow::on_view_coloured_bg_shortcut()
+void MainWindow::on_view_colored_bg_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_ColoredBG).toBool();
+	settings.setValue(GlobalSettings::Key_View_ColoredBG, !state);
 }
 
 void MainWindow::on_view_sticky_scrolling_shortcut()
@@ -797,7 +795,7 @@ void MainWindow::on_view_show_analog_minor_grid_shortcut()
 	settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, !state);
 }
 
-void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
+void MainWindow::on_settingViewColoredBg_changed(const QVariant new_value)
 {
 	bool state = new_value.toBool();
 
@@ -808,7 +806,7 @@ void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
 		views::trace::View* view =
 				qobject_cast<views::trace::View*>(viewbase.get());
 		if (view)
-			view->enable_coloured_bg(state);
+			view->enable_colored_bg(state);
 	}
 }