#include <boost/version.hpp>
#include <QApplication>
+#include <QComboBox>
#include <QDialogButtonBox>
#include <QFormLayout>
#include <QGroupBox>
#include <QHBoxLayout>
#include <QLabel>
+#include <QSpinBox>
#include <QString>
#include <QTextBrowser>
#include <QTextDocument>
QWidget *Settings::get_view_settings_form(QWidget *parent) const
{
+ GlobalSettings settings;
QCheckBox *cb;
QWidget *form = new QWidget(parent);
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_TriggerIsZeroTime,
+ SLOT(on_view_triggerIsZero_changed(int)));
+ trace_view_layout->addRow(tr("Show time zero at the trigger"), cb);
cb = create_checkbox(GlobalSettings::Key_View_StickyScrolling,
SLOT(on_view_stickyScrolling_changed(int)));
cb = create_checkbox(GlobalSettings::Key_View_ShowAnalogMinorGrid,
SLOT(on_view_showAnalogMinorGrid_changed(int)));
- trace_view_layout->addRow(tr("Show analog minor grid in addition to vdiv grid"), cb);
+ trace_view_layout->addRow(tr("Show analog minor grid in addition to div grid"), cb);
+
+ QComboBox *thr_disp_mode_cb = new QComboBox();
+ thr_disp_mode_cb->addItem(tr("None"), GlobalSettings::ConvThrDispMode_None);
+ thr_disp_mode_cb->addItem(tr("Background"), GlobalSettings::ConvThrDispMode_Background);
+ thr_disp_mode_cb->addItem(tr("Dots"), GlobalSettings::ConvThrDispMode_Dots);
+ thr_disp_mode_cb->setCurrentIndex(
+ settings.value(GlobalSettings::Key_View_ConversionThresholdDispMode).toInt());
+ connect(thr_disp_mode_cb, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(on_view_conversionThresholdDispMode_changed(int)));
+ trace_view_layout->addRow(tr("Conversion threshold display mode (analog traces only)"), thr_disp_mode_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;
}
return form;
#else
(void)parent;
+ return nullptr;
#endif
}
#endif
QLabel *icon = new QLabel();
- icon->setPixmap(QPixmap(QString::fromUtf8(":/icons/sigrok-logo-notext.svg")));
+ icon->setPixmap(QPixmap(QString::fromUtf8(":/icons/pulseview.svg")));
/* Setup the version field */
QLabel *version_info = new QLabel();
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_ZoomToFitAfterAcq, state ? true : false);
+}
+
+void Settings::on_view_triggerIsZero_changed(int state)
{
GlobalSettings settings;
- settings.setValue(GlobalSettings::Key_View_AlwaysZoomToFit, state ? true : false);
+ settings.setValue(GlobalSettings::Key_View_TriggerIsZeroTime, state ? true : false);
}
void Settings::on_view_colouredBG_changed(int state)
settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, state ? true : false);
}
+void Settings::on_view_conversionThresholdDispMode_changed(int state)
+{
+ GlobalSettings settings;
+ settings.setValue(GlobalSettings::Key_View_ConversionThresholdDispMode, state);
+}
+
+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;