X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fglobalsettings.cpp;h=eabe4d3c185498a5c19fd71ecb7eef8a420b33f1;hp=7fd1249cfd5d4fd525251ea03dca6b58186f76ff;hb=b5940cf0ef30b3519389da8c8768aee4d4424415;hpb=28ceff251c776bcf99eafae691e70a521af15957

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index 7fd1249c..eabe4d3c 100644
--- a/pv/globalsettings.cpp
+++ b/pv/globalsettings.cpp
@@ -19,18 +19,26 @@
 
 #include "globalsettings.hpp"
 
+#include <QApplication>
+#include <QByteArray>
+#include <QFontMetrics>
+#include <QString>
+
 using std::function;
 using std::map;
 using std::multimap;
 
 namespace pv {
 
-const QString GlobalSettings::Key_View_AlwaysZoomToFit = "View_AlwaysZoomToFit";
+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_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_;
@@ -56,6 +64,14 @@ void GlobalSettings::set_defaults_where_needed()
 	// Enable showing sampling points by default
 	if (!contains(Key_View_ShowSamplingPoints))
 		setValue(Key_View_ShowSamplingPoints, true);
+
+	if (!contains(Key_View_DefaultDivHeight))
+		setValue(Key_View_DefaultDivHeight,
+		3 * QFontMetrics(QApplication::font()).height());
+
+	if (!contains(Key_View_DefaultLogicHeight))
+		setValue(Key_View_DefaultLogicHeight,
+		2 * QFontMetrics(QApplication::font()).height());
 }
 
 void GlobalSettings::register_change_handler(const QString key,
@@ -102,4 +118,37 @@ void GlobalSettings::undo_tracked_changes()
 	tracked_changes_.clear();
 }
 
+void GlobalSettings::store_gvariant(QSettings &settings, GVariant *v)
+{
+	const GVariantType *var_type = g_variant_get_type(v);
+	char *var_type_str = g_variant_type_dup_string(var_type);
+
+	QByteArray var_data = QByteArray((const char*)g_variant_get_data(v),
+		g_variant_get_size(v));
+
+	settings.setValue("value", var_data);
+	settings.setValue("type", var_type_str);
+
+	g_free(var_type_str);
+}
+
+GVariant* GlobalSettings::restore_gvariant(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);
+
+	g_variant_type_free(var_type);
+
+	return value;
+}
+
+
 } // namespace pv