X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fglobalsettings.cpp;h=ae8682a68f3ba9ec6a31edf7ac9d96c212d6fc97;hp=cd356ae631f70c4f1ec3d83d1ae29fad302a8b4d;hb=6fff12acb797c5363f5ac2e60a9b747032f2ce79;hpb=1325ce422f1b49ab1f693125105b8c373c2965e5

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index cd356ae6..ae8682a6 100644
--- a/pv/globalsettings.cpp
+++ b/pv/globalsettings.cpp
@@ -20,6 +20,7 @@
 #include "globalsettings.hpp"
 
 #include <QApplication>
+#include <QColor>
 #include <QDebug>
 #include <QFontMetrics>
 #include <QString>
@@ -36,11 +37,16 @@ const QString GlobalSettings::Key_View_TriggerIsZeroTime = "View_TriggerIsZeroTi
 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_FillSignalHighAreas = "View_FillSignalHighAreas";
+const QString GlobalSettings::Key_View_FillSignalHighAreaColor = "View_FillSignalHighAreaColor";
 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_View_ShowHoverMarker = "View_ShowHoverMarker";
+const QString GlobalSettings::Key_View_SnapDistance = "View_SnapDistance";
 const QString GlobalSettings::Key_Dec_InitialStateConfigurable = "Dec_InitialStateConfigurable";
+const QString GlobalSettings::Key_Dec_ExportFormat = "Dec_ExportFormat";
 const QString GlobalSettings::Key_Log_BufferSize = "Log_BufferSize";
 const QString GlobalSettings::Key_Log_NotifyOfStacktrace = "Log_NotifyOfStacktrace";
 
@@ -68,6 +74,13 @@ void GlobalSettings::set_defaults_where_needed()
 	if (!contains(Key_View_ShowSamplingPoints))
 		setValue(Key_View_ShowSamplingPoints, true);
 
+	// Enable filling logic signal high areas by default
+	if (!contains(Key_View_FillSignalHighAreas))
+		setValue(Key_View_FillSignalHighAreas, true);
+	if (!contains(Key_View_FillSignalHighAreaColor))
+		setValue(Key_View_FillSignalHighAreaColor,
+			QColor(0, 0, 0, 5 * 256 / 100).rgba());
+
 	if (!contains(Key_View_DefaultDivHeight))
 		setValue(Key_View_DefaultDivHeight,
 		3 * QFontMetrics(QApplication::font()).height());
@@ -76,6 +89,15 @@ void GlobalSettings::set_defaults_where_needed()
 		setValue(Key_View_DefaultLogicHeight,
 		2 * QFontMetrics(QApplication::font()).height());
 
+	if (!contains(Key_View_ShowHoverMarker))
+		setValue(Key_View_ShowHoverMarker, true);
+
+	if (!contains(Key_View_SnapDistance))
+		setValue(Key_View_SnapDistance, 15);
+
+	if (!contains(Key_Dec_ExportFormat))
+		setValue(Key_Dec_ExportFormat, "%s %d: %c: %1");
+
 	// Default to 500 lines of backlog
 	if (!contains(Key_Log_BufferSize))
 		setValue(Key_Log_BufferSize, 500);