projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
View: Improve 2a9fcd621 by using settings_restored_
[pulseview.git]
/
pv
/
view
/
decodetrace.cpp
diff --git
a/pv/view/decodetrace.cpp
b/pv/view/decodetrace.cpp
index 9cc07d3377e5646c6191635714aa9dbc1420afc9..89d335d7e0e8e572b64010c54b6bc252b212fe49 100644
(file)
--- a/
pv/view/decodetrace.cpp
+++ b/
pv/view/decodetrace.cpp
@@
-40,6
+40,7
@@
extern "C" {
#include "decodetrace.hpp"
#include "decodetrace.hpp"
+#include <pv/globalsettings.hpp>
#include <pv/data/decode/annotation.hpp>
#include <pv/data/decode/decoder.hpp>
#include <pv/data/decoderstack.hpp>
#include <pv/data/decode/annotation.hpp>
#include <pv/data/decode/decoder.hpp>
#include <pv/data/decoderstack.hpp>
@@
-781,6
+782,7
@@
void DecodeTrace::create_decoder_form(int index,
QFormLayout *form)
{
const GSList *l;
QFormLayout *form)
{
const GSList *l;
+ GlobalSettings settings;
assert(dec);
const srd_decoder *const decoder = dec->decoder();
assert(dec);
const srd_decoder *const decoder = dec->decoder();
@@
-825,6
+827,9
@@
void DecodeTrace::create_decoder_form(int index,
hlayout->addWidget(combo);
hlayout->addWidget(combo_initial_pin);
hlayout->addWidget(combo);
hlayout->addWidget(combo_initial_pin);
+ if (!settings.value(GlobalSettings::Key_Dec_InitialStateConfigurable).toBool())
+ combo_initial_pin->hide();
+
decoder_form->addRow(tr("<b>%1</b> (%2) *")
.arg(QString::fromUtf8(pdch->name),
QString::fromUtf8(pdch->desc)), hlayout);
decoder_form->addRow(tr("<b>%1</b> (%2) *")
.arg(QString::fromUtf8(pdch->name),
QString::fromUtf8(pdch->desc)), hlayout);
@@
-850,6
+855,9
@@
void DecodeTrace::create_decoder_form(int index,
hlayout->addWidget(combo);
hlayout->addWidget(combo_initial_pin);
hlayout->addWidget(combo);
hlayout->addWidget(combo_initial_pin);
+ if (!settings.value(GlobalSettings::Key_Dec_InitialStateConfigurable).toBool())
+ combo_initial_pin->hide();
+
decoder_form->addRow(tr("<b>%1</b> (%2)")
.arg(QString::fromUtf8(pdch->name),
QString::fromUtf8(pdch->desc)), hlayout);
decoder_form->addRow(tr("<b>%1</b> (%2)")
.arg(QString::fromUtf8(pdch->name),
QString::fromUtf8(pdch->desc)), hlayout);
@@
-918,7
+926,7
@@
QComboBox* DecodeTrace::create_channel_selector_initial_pin(QWidget *parent,
selector->addItem("0", qVariantFromValue((int)SRD_INITIAL_PIN_LOW));
selector->addItem("1", qVariantFromValue((int)SRD_INITIAL_PIN_HIGH));
selector->addItem("0", qVariantFromValue((int)SRD_INITIAL_PIN_LOW));
selector->addItem("1", qVariantFromValue((int)SRD_INITIAL_PIN_HIGH));
- selector->addItem("
?
", qVariantFromValue((int)SRD_INITIAL_PIN_SAME_AS_SAMPLE0));
+ selector->addItem("
X
", qVariantFromValue((int)SRD_INITIAL_PIN_SAME_AS_SAMPLE0));
// Default to index 2 (SRD_INITIAL_PIN_SAME_AS_SAMPLE0).
const int idx = (!dec->initial_pins()) ? 2 : dec->initial_pins()->data[pdch->order];
// Default to index 2 (SRD_INITIAL_PIN_SAME_AS_SAMPLE0).
const int idx = (!dec->initial_pins()) ? 2 : dec->initial_pins()->data[pdch->order];