X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fglobalsettings.cpp;h=1a589fe9cf0459b986d88f2b5dfaa3398a1ba710;hb=d0c0573b3ee694827a747727f862c5f91736ca05;hp=6ec4a8e95635677b20d3afa2abf66755f41ef15b;hpb=48051ccba42d9205959658d6165546334878ad17;p=pulseview.git

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index 6ec4a8e..1a589fe 100644
--- a/pv/globalsettings.cpp
+++ b/pv/globalsettings.cpp
@@ -20,27 +20,27 @@
 #include "globalsettings.hpp"
 
 #include <QApplication>
-#include <QByteArray>
 #include <QFontMetrics>
 #include <QString>
 
-using std::function;
 using std::map;
-using std::multimap;
+using std::vector;
 
 namespace pv {
 
 const QString GlobalSettings::Key_View_ZoomToFitDuringAcq = "View_ZoomToFitDuringAcq";
 const QString GlobalSettings::Key_View_ZoomToFitAfterAcq = "View_ZoomToFitAfterAcq";
+const QString GlobalSettings::Key_View_TriggerIsZeroTime = "View_TriggerIsZeroTime";
 const QString GlobalSettings::Key_View_ColouredBG = "View_ColouredBG";
 const QString GlobalSettings::Key_View_StickyScrolling = "View_StickyScrolling";
 const QString GlobalSettings::Key_View_ShowSamplingPoints = "View_ShowSamplingPoints";
 const QString GlobalSettings::Key_View_ShowAnalogMinorGrid = "View_ShowAnalogMinorGrid";
+const QString GlobalSettings::Key_View_ConversionThresholdDispMode = "View_ConversionThresholdDispMode";
 const QString GlobalSettings::Key_View_DefaultDivHeight = "View_DefaultDivHeight";
 const QString GlobalSettings::Key_View_DefaultLogicHeight = "View_DefaultLogicHeight";
 const QString GlobalSettings::Key_Dec_InitialStateConfigurable = "Dec_InitialStateConfigurable";
 
-multimap< QString, function<void(QVariant)> > GlobalSettings::callbacks_;
+vector<GlobalSettingsInterface*> GlobalSettings::callbacks_;
 bool GlobalSettings::tracking_ = false;
 map<QString, QVariant> GlobalSettings::tracked_changes_;
 
@@ -73,10 +73,18 @@ void GlobalSettings::set_defaults_where_needed()
 		2 * QFontMetrics(QApplication::font()).height());
 }
 
-void GlobalSettings::register_change_handler(const QString key,
-	function<void(QVariant)> cb)
+void GlobalSettings::add_change_handler(GlobalSettingsInterface *cb)
 {
-	callbacks_.emplace(key, cb);
+	callbacks_.push_back(cb);
+}
+
+void GlobalSettings::remove_change_handler(GlobalSettingsInterface *cb)
+{
+	for (auto cb_it = callbacks_.begin(); cb_it != callbacks_.end(); cb_it++)
+		if (*cb_it == cb) {
+			callbacks_.erase(cb_it);
+			break;
+		}
 }
 
 void GlobalSettings::setValue(const QString &key, const QVariant &value)
@@ -88,11 +96,9 @@ void GlobalSettings::setValue(const QString &key, const QVariant &value)
 
 	QSettings::setValue(key, value);
 
-	// Call all registered callbacks for this key
-	auto range = callbacks_.equal_range(key);
-
-	for (auto it = range.first; it != range.second; it++)
-		it->second(value);
+	// Call all registered callbacks
+	for (GlobalSettingsInterface *cb : callbacks_)
+		cb->on_setting_changed(key, value);
 }
 
 void GlobalSettings::start_tracking()