X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fglobalsettings.cpp;h=895dda54317e3aa4ec21653456d10f9adcef11a5;hp=6b13df16e397fc44ab6dd2473b92bba1f316c58f;hb=2601ce965fc455d23f5a964b84ddd74eb93705c4;hpb=d3feec232211b3acec6a323ca3b8008ed8b2faa0 diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp index 6b13df16..895dda54 100644 --- a/pv/globalsettings.cpp +++ b/pv/globalsettings.cpp @@ -19,7 +19,9 @@ #include "globalsettings.hpp" +#include #include +#include #include using std::function; @@ -34,6 +36,9 @@ 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_ShowConversionThresholds = "View_ShowConversionThresholds"; +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 > GlobalSettings::callbacks_; @@ -59,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,