X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fglobalsettings.cpp;h=cd356ae631f70c4f1ec3d83d1ae29fad302a8b4d;hp=eabe4d3c185498a5c19fd71ecb7eef8a420b33f1;hb=ff046cb6c42a2382ee281e83955b7ae44030b42e;hpb=90ee1ed9a90bc0651f86ee4af07e0958572f86da

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index eabe4d3c..cd356ae6 100644
--- a/pv/globalsettings.cpp
+++ b/pv/globalsettings.cpp
@@ -20,19 +20,20 @@
 #include "globalsettings.hpp"
 
 #include <QApplication>
-#include <QByteArray>
+#include <QDebug>
 #include <QFontMetrics>
 #include <QString>
 
-using std::function;
 using std::map;
-using std::multimap;
+using std::string;
+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_ColouredBG = "View_ColouredBG";
+const QString GlobalSettings::Key_View_TriggerIsZeroTime = "View_TriggerIsZeroTime";
+const QString GlobalSettings::Key_View_ColoredBG = "View_ColoredBG";
 const QString GlobalSettings::Key_View_StickyScrolling = "View_StickyScrolling";
 const QString GlobalSettings::Key_View_ShowSamplingPoints = "View_ShowSamplingPoints";
 const QString GlobalSettings::Key_View_ShowAnalogMinorGrid = "View_ShowAnalogMinorGrid";
@@ -40,8 +41,10 @@ const QString GlobalSettings::Key_View_ConversionThresholdDispMode = "View_Conve
 const QString GlobalSettings::Key_View_DefaultDivHeight = "View_DefaultDivHeight";
 const QString GlobalSettings::Key_View_DefaultLogicHeight = "View_DefaultLogicHeight";
 const QString GlobalSettings::Key_Dec_InitialStateConfigurable = "Dec_InitialStateConfigurable";
+const QString GlobalSettings::Key_Log_BufferSize = "Log_BufferSize";
+const QString GlobalSettings::Key_Log_NotifyOfStacktrace = "Log_NotifyOfStacktrace";
 
-multimap< QString, function<void(QVariant)> > GlobalSettings::callbacks_;
+vector<GlobalSettingsInterface*> GlobalSettings::callbacks_;
 bool GlobalSettings::tracking_ = false;
 map<QString, QVariant> GlobalSettings::tracked_changes_;
 
@@ -57,9 +60,9 @@ void GlobalSettings::set_defaults_where_needed()
 	if (!contains(Key_View_ZoomToFitAfterAcq))
 		setValue(Key_View_ZoomToFitAfterAcq, true);
 
-	// Enable coloured trace backgrounds by default
-	if (!contains(Key_View_ColouredBG))
-		setValue(Key_View_ColouredBG, true);
+	// Enable colored trace backgrounds by default
+	if (!contains(Key_View_ColoredBG))
+		setValue(Key_View_ColoredBG, true);
 
 	// Enable showing sampling points by default
 	if (!contains(Key_View_ShowSamplingPoints))
@@ -72,12 +75,28 @@ void GlobalSettings::set_defaults_where_needed()
 	if (!contains(Key_View_DefaultLogicHeight))
 		setValue(Key_View_DefaultLogicHeight,
 		2 * QFontMetrics(QApplication::font()).height());
+
+	// Default to 500 lines of backlog
+	if (!contains(Key_Log_BufferSize))
+		setValue(Key_Log_BufferSize, 500);
+
+	// Notify user of existing stack trace by default
+	if (!contains(Key_Log_NotifyOfStacktrace))
+		setValue(Key_Log_NotifyOfStacktrace, true);
 }
 
-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)
@@ -89,11 +108,12 @@ 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);
+	// TODO Emulate noquote()
+	qDebug() << "Setting" << key << "changed to" << value;
 
-	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()
@@ -150,5 +170,33 @@ GVariant* GlobalSettings::restore_gvariant(QSettings &settings)
 	return value;
 }
 
+void GlobalSettings::store_variantbase(QSettings &settings, Glib::VariantBase v)
+{
+	const QByteArray var_data = QByteArray((const char*)v.get_data(), v.get_size());
+
+	settings.setValue("value", var_data);
+	settings.setValue("type", QString::fromStdString(v.get_type_string()));
+}
+
+Glib::VariantBase GlobalSettings::restore_variantbase(QSettings &settings)
+{
+	QString raw_type = settings.value("type").toString();
+	GVariantType *var_type = g_variant_type_new(raw_type.toUtf8());
+
+	QByteArray data = settings.value("value").toByteArray();
+
+	gpointer var_data = g_memdup((gconstpointer)data.constData(),
+		(guint)data.size());
+
+	GVariant *value = g_variant_new_from_data(var_type, var_data,
+		data.size(), false, g_free, var_data);
+
+	Glib::VariantBase ret_val = Glib::VariantBase(value, true);
+
+	g_variant_type_free(var_type);
+	g_variant_unref(value);
+
+	return ret_val;
+}
 
 } // namespace pv