Session: Query the device's sample rate when needed, not sooner

[pulseview.git] / pv / globalsettings.cpp

diff --git a/pv/globalsettings.cpp b/pv/globalsettings.cpp
index d437c16681983711b842678b8323e49ec9a034ed..eabe4d3c185498a5c19fd71ecb7eef8a420b33f1 100644 (file)
--- a/pv/globalsettings.cpp
+++ b/pv/globalsettings.cpp
@@ -36,7 +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_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_;
@@ -66,6 +68,10 @@ void GlobalSettings::set_defaults_where_needed()
        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,