X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=76966f4c93fdc4678bf50453ee96106ac78c22a9;hb=78bf7ce5aaa1e02717973dc559c24973a313b541;hp=2c2ccfee4504ef5ccb93aeac80e9e089e261dbe8;hpb=daa54986010a11879da11e30aafd3a2739ab7a15;p=pulseview.git

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index 2c2ccfe..76966f4 100644
--- a/pv/dialogs/settings.cpp
+++ b/pv/dialogs/settings.cpp
@@ -171,6 +171,10 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const
 		SLOT(on_view_showAnalogMinorGrid_changed(int)));
 	trace_view_layout->addRow(tr("Show analog minor grid in addition to vdiv grid"), cb);
 
+	cb = create_checkbox(GlobalSettings::Key_View_ShowConversionThresholds,
+		SLOT(on_view_showConversionThresholds_changed(int)));
+	trace_view_layout->addRow(tr("Show conversion thresholds in analog traces"), cb);
+
 	QSpinBox *default_div_height_sb = new QSpinBox();
 	default_div_height_sb->setRange(20, 1000);
 	default_div_height_sb->setSuffix(tr(" pixels"));
@@ -180,6 +184,15 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const
 		SLOT(on_view_defaultDivHeight_changed(int)));
 	trace_view_layout->addRow(tr("Default analog trace div height"), default_div_height_sb);
 
+	QSpinBox *default_logic_height_sb = new QSpinBox();
+	default_logic_height_sb->setRange(5, 1000);
+	default_logic_height_sb->setSuffix(tr(" pixels"));
+	default_logic_height_sb->setValue(
+		settings.value(GlobalSettings::Key_View_DefaultLogicHeight).toInt());
+	connect(default_logic_height_sb, SIGNAL(valueChanged(int)), this,
+		SLOT(on_view_defaultLogicHeight_changed(int)));
+	trace_view_layout->addRow(tr("Default logic trace height"), default_logic_height_sb);
+
 	return form;
 }
 
@@ -205,6 +218,7 @@ QWidget *Settings::get_decoder_settings_form(QWidget *parent) const
 	return form;
 #else
 	(void)parent;
+	return nullptr;
 #endif
 }
 
@@ -427,12 +441,24 @@ void Settings::on_view_showAnalogMinorGrid_changed(int state)
 	settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, state ? true : false);
 }
 
+void Settings::on_view_showConversionThresholds_changed(int state)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_ShowConversionThresholds, state ? true : false);
+}
+
 void Settings::on_view_defaultDivHeight_changed(int value)
 {
 	GlobalSettings settings;
 	settings.setValue(GlobalSettings::Key_View_DefaultDivHeight, value);
 }
 
+void Settings::on_view_defaultLogicHeight_changed(int value)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_DefaultLogicHeight, value);
+}
+
 void Settings::on_dec_initialStateConfigurable_changed(int state)
 {
 	GlobalSettings settings;