X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.cpp;h=1730e7ba2ebb78c8625c97073662fc68d0ed3398;hb=90ee1ed9a90bc0651f86ee4af07e0958572f86da;hp=f2f9e2692a753624b2750a5771405a7bce038660;hpb=edfe64fd633d83ea30cf4f61de9fdff0dcbc398e;p=pulseview.git diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp index f2f9e26..1730e7b 100644 --- a/pv/dialogs/settings.cpp +++ b/pv/dialogs/settings.cpp @@ -23,12 +23,13 @@ #include #include -#include +#include #include #include #include #include #include +#include #include #include #include @@ -101,6 +102,17 @@ void Settings::create_pages() viewButton->setTextAlignment(Qt::AlignHCenter); viewButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); +#ifdef ENABLE_DECODE + // Decoder page + pages->addWidget(get_decoder_settings_form(pages)); + + QListWidgetItem *decoderButton = new QListWidgetItem(page_list); + decoderButton->setIcon(QIcon(":/icons/add-decoder.svg")); + decoderButton->setText(tr("Decoders")); + decoderButton->setTextAlignment(Qt::AlignHCenter); + decoderButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); +#endif + // About page pages->addWidget(get_about_page(pages)); @@ -111,9 +123,20 @@ void Settings::create_pages() aboutButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled); } +QCheckBox *Settings::create_checkbox(const QString& key, const char* slot) const +{ + GlobalSettings settings; + + QCheckBox *cb = new QCheckBox(); + cb->setChecked(settings.value(key).toBool()); + connect(cb, SIGNAL(stateChanged(int)), this, slot); + return cb; +} + QWidget *Settings::get_view_settings_form(QWidget *parent) const { GlobalSettings settings; + QCheckBox *cb; QWidget *form = new QWidget(parent); QVBoxLayout *form_layout = new QVBoxLayout(form); @@ -125,32 +148,85 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const QFormLayout *trace_view_layout = new QFormLayout(); trace_view_group->setLayout(trace_view_layout); - QCheckBox *coloured_bg_cb = new QCheckBox(); - coloured_bg_cb->setChecked(settings.value(GlobalSettings::Key_View_ColouredBG).toBool()); - connect(coloured_bg_cb, SIGNAL(stateChanged(int)), this, SLOT(on_view_colouredBG_changed(int))); - trace_view_layout->addRow(tr("Use coloured trace &background"), coloured_bg_cb); + cb = create_checkbox(GlobalSettings::Key_View_ColouredBG, + SLOT(on_view_colouredBG_changed(int))); + trace_view_layout->addRow(tr("Use coloured trace &background"), 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))); + trace_view_layout->addRow(tr("Always keep &newest samples at the right edge during capture"), cb); + + cb = create_checkbox(GlobalSettings::Key_View_ShowSamplingPoints, + SLOT(on_view_showSamplingPoints_changed(int))); + trace_view_layout->addRow(tr("Show data &sampling points"), cb); + + 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 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); - QCheckBox *always_zoom_to_fit_cb = new QCheckBox(); - always_zoom_to_fit_cb->setChecked(settings.value(GlobalSettings::Key_View_AlwaysZoomToFit).toBool()); - connect(always_zoom_to_fit_cb, SIGNAL(stateChanged(int)), this, SLOT(on_view_alwaysZoomToFit_changed(int))); - trace_view_layout->addRow(tr("Constantly perform &zoom-to-fit during capture"), always_zoom_to_fit_cb); + return form; +} - QCheckBox *sticky_scrolling_cb = new QCheckBox(); - sticky_scrolling_cb->setChecked(settings.value(GlobalSettings::Key_View_StickyScrolling).toBool()); - connect(sticky_scrolling_cb, SIGNAL(stateChanged(int)), this, SLOT(on_view_stickyScrolling_changed(int))); - trace_view_layout->addRow(tr("Always keep &newest samples at the right edge during capture"), sticky_scrolling_cb); +QWidget *Settings::get_decoder_settings_form(QWidget *parent) const +{ +#ifdef ENABLE_DECODE + QCheckBox *cb; + + QWidget *form = new QWidget(parent); + QVBoxLayout *form_layout = new QVBoxLayout(form); - QCheckBox *show_sampling_points_cb = new QCheckBox(); - show_sampling_points_cb->setChecked(settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool()); - connect(show_sampling_points_cb, SIGNAL(stateChanged(int)), this, SLOT(on_view_showSamplingPoints_changed(int))); - trace_view_layout->addRow(tr("Show data &sampling points"), show_sampling_points_cb); + // Decoder settings + QGroupBox *decoder_group = new QGroupBox(tr("Decoders")); + form_layout->addWidget(decoder_group); - QCheckBox *show_analog_minor_grid_cb = new QCheckBox(); - show_analog_minor_grid_cb->setChecked(settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool()); - connect(show_analog_minor_grid_cb, SIGNAL(stateChanged(int)), this, SLOT(on_view_showAnalogMinorGrid_changed(int))); - trace_view_layout->addRow(tr("Show analog minor grid in addition to vdiv grid"), show_analog_minor_grid_cb); + QFormLayout *decoder_layout = new QFormLayout(); + decoder_group->setLayout(decoder_layout); + + cb = create_checkbox(GlobalSettings::Key_Dec_InitialStateConfigurable, + SLOT(on_dec_initialStateConfigurable_changed(int))); + decoder_layout->addRow(tr("Allow configuration of &initial signal state"), cb); return form; +#else + (void)parent; + return nullptr; +#endif } #ifdef ENABLE_DECODE @@ -171,7 +247,7 @@ QWidget *Settings::get_about_page(QWidget *parent) const #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(); @@ -336,10 +412,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_AlwaysZoomToFit, state ? true : false); + 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_colouredBG_changed(int state) @@ -366,5 +448,29 @@ void Settings::on_view_showAnalogMinorGrid_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; + settings.setValue(GlobalSettings::Key_Dec_InitialStateConfigurable, state ? true : false); +} + } // namespace dialogs } // namespace pv