X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=76966f4c93fdc4678bf50453ee96106ac78c22a9;hp=b74264ac2cbd89301a83ea25dc4a58d92e932a64;hb=2601ce965fc455d23f5a964b84ddd74eb93705c4;hpb=311da12176d31b4cab2a7af9c4acf4cec6030dbf

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index b74264ac..76966f4c 100644
--- a/pv/dialogs/settings.cpp
+++ b/pv/dialogs/settings.cpp
@@ -28,6 +28,7 @@
 #include <QGroupBox>
 #include <QHBoxLayout>
 #include <QLabel>
+#include <QSpinBox>
 #include <QString>
 #include <QTextBrowser>
 #include <QTextDocument>
@@ -133,6 +134,7 @@ QCheckBox *Settings::create_checkbox(const QString& key, const char* slot) const
 
 QWidget *Settings::get_view_settings_form(QWidget *parent) const
 {
+	GlobalSettings settings;
 	QCheckBox *cb;
 
 	QWidget *form = new QWidget(parent);
@@ -149,9 +151,13 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const
 		SLOT(on_view_colouredBG_changed(int)));
 	trace_view_layout->addRow(tr("Use coloured trace &background"), cb);
 
-	cb = create_checkbox(GlobalSettings::Key_View_AlwaysZoomToFit,
-		SLOT(on_view_alwaysZoomToFit_changed(int)));
-	trace_view_layout->addRow(tr("Constantly perform &zoom-to-fit during capture"), cb);
+	cb = create_checkbox(GlobalSettings::Key_View_ZoomToFitDuringAcq,
+		SLOT(on_view_zoomToFitDuringAcq_changed(int)));
+	trace_view_layout->addRow(tr("Constantly perform &zoom-to-fit during acquisition"), cb);
+
+	cb = create_checkbox(GlobalSettings::Key_View_ZoomToFitAfterAcq,
+		SLOT(on_view_zoomToFitAfterAcq_changed(int)));
+	trace_view_layout->addRow(tr("Perform a zoom-to-&fit when acquisition stops"), cb);
 
 	cb = create_checkbox(GlobalSettings::Key_View_StickyScrolling,
 		SLOT(on_view_stickyScrolling_changed(int)));
@@ -165,6 +171,28 @@ 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"));
+	default_div_height_sb->setValue(
+		settings.value(GlobalSettings::Key_View_DefaultDivHeight).toInt());
+	connect(default_div_height_sb, SIGNAL(valueChanged(int)), this,
+		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;
 }
 
@@ -190,6 +218,7 @@ QWidget *Settings::get_decoder_settings_form(QWidget *parent) const
 	return form;
 #else
 	(void)parent;
+	return nullptr;
 #endif
 }
 
@@ -376,10 +405,16 @@ void Settings::on_page_changed(QListWidgetItem *current, QListWidgetItem *previo
 	pages->setCurrentIndex(page_list->row(current));
 }
 
-void Settings::on_view_alwaysZoomToFit_changed(int state)
+void Settings::on_view_zoomToFitDuringAcq_changed(int state)
+{
+	GlobalSettings settings;
+	settings.setValue(GlobalSettings::Key_View_ZoomToFitDuringAcq, state ? true : false);
+}
+
+void Settings::on_view_zoomToFitAfterAcq_changed(int state)
 {
 	GlobalSettings settings;
-	settings.setValue(GlobalSettings::Key_View_AlwaysZoomToFit, state ? true : false);
+	settings.setValue(GlobalSettings::Key_View_ZoomToFitAfterAcq, state ? true : false);
 }
 
 void Settings::on_view_colouredBG_changed(int state)
@@ -406,6 +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;