Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 09:45:21 +03:00
Code Issues Wiki Activity

Re #1783: NOT curves removed from inputs (for non ARM platforms)

Browse source
This commit is contained in:
Damjan Adamic 2014-11-03 22:15:05 +01:00 • committed by bsongis
parent 525d956935
commit 8a80463476
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
companion/src/helpers.cpp
View file

@ -273,11 +273,13 @@ void CurveGroup::update()
if (lastType != curve.type) { if (lastType != curve.type) {
lastType = curve.type; lastType = curve.type;
curveValueCB->clear(); curveValueCB->clear();
for (int i=-numcurves; i<=numcurves; i++) { for (int i= ((flags & HIDE_NEGATIVE_CURVES) ? 0 : -numcurves); i<=numcurves; i++) {
curveValueCB->addItem(CurveReference(CurveReference::CURVE_REF_CUSTOM, i).toString()); curveValueCB->addItem(CurveReference(CurveReference::CURVE_REF_CUSTOM, i).toString(), i);
if (i == curve.value) {
curveValueCB->setCurrentIndex(curveValueCB->count() - 1);
}
} }
} }
curveValueCB->setCurrentIndex(curve.value+numcurves);
break; break;
} }
default: default:
@ -344,7 +346,7 @@ void CurveGroup::valuesChanged()
curve = CurveReference(CurveReference::CURVE_REF_FUNC, curveValueCB->currentIndex()); curve = CurveReference(CurveReference::CURVE_REF_FUNC, curveValueCB->currentIndex());
break; break;
case 3: case 3:
curve = CurveReference(CurveReference::CURVE_REF_CUSTOM, curveValueCB->currentIndex() - GetCurrentFirmware()->getCapability(NumCurves)); curve = CurveReference(CurveReference::CURVE_REF_CUSTOM, curveValueCB->itemData(curveValueCB->currentIndex()).toInt());
break; break;
} }

5
companion/src/helpers.h
View file

@ -57,8 +57,9 @@ class GVarGroup: public QObject {
bool lock; bool lock;
}; };
#define HIDE_DIFF 1 #define HIDE_DIFF 0x01
#define HIDE_EXPO 2 #define HIDE_EXPO 0x02
#define HIDE_NEGATIVE_CURVES 0x04
class CurveGroup : public QObject { class CurveGroup : public QObject {

2
companion/src/modeledit/expodialog.cpp
View file

@ -31,7 +31,7 @@ ExpoDialog::ExpoDialog(QWidget *parent, ModelData & model, ExpoData *expoData, G
ui->offsetCB->hide(); ui->offsetCB->hide();
} }
curveGroup = new CurveGroup(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueCB, ui->curveValueSB, ed->curve, firmware->getCapability(HasInputDiff) ? 0 : HIDE_DIFF); curveGroup = new CurveGroup(ui->curveTypeCB, ui->curveGVarCB, ui->curveValueCB, ui->curveValueSB, ed->curve, firmware->getCapability(HasInputDiff) ? 0 : (HIDE_DIFF | HIDE_NEGATIVE_CURVES));
populateSwitchCB(ui->switchesCB, ed->swtch, generalSettings, MixesContext); populateSwitchCB(ui->switchesCB, ed->swtch, generalSettings, MixesContext);