From 3234d52864c14f7c8472055764fbe2f2295f4519 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Tue, 27 Aug 2019 17:44:54 +0200 Subject: [PATCH] Update curve combo box on update() (#6669) closes #6054 --- companion/src/modeledit/channels.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/companion/src/modeledit/channels.cpp b/companion/src/modeledit/channels.cpp index 5347efe54..57f68a5c2 100644 --- a/companion/src/modeledit/channels.cpp +++ b/companion/src/modeledit/channels.cpp @@ -162,11 +162,6 @@ Channels::Channels(QWidget * parent, ModelData & model, GeneralSettings & genera if (IS_HORUS_OR_TARANIS(firmware->getBoard())) { curveCB[i] = new QComboBox(this); curveCB[i]->setProperty("index", i); - int numcurves = firmware->getCapability(NumCurves); - for (int j=-numcurves; j<=numcurves; j++) { - curveCB[i]->addItem(CurveReference(CurveReference::CURVE_REF_CUSTOM, j).toString(&model, false), j); - } - curveCB[i]->setCurrentIndex(model.limitData[i].curve.value+numcurves); connect(curveCB[i], SIGNAL(currentIndexChanged(int)), this, SLOT(curveEdited())); tableLayout->addWidget(i, col++, curveCB[i]); } @@ -298,7 +293,12 @@ void Channels::updateLine(int i) chnMax[i]->setValue(model->limitData[i].max); invCB[i]->setCurrentIndex((model->limitData[i].revert) ? 1 : 0); if (IS_HORUS_OR_TARANIS(firmware->getBoard())) { - curveCB[i]->setCurrentIndex(model->limitData[i].curve.value + firmware->getCapability(NumCurves)); + int numcurves = firmware->getCapability(NumCurves); + curveCB[i]->clear(); + for (int j=-numcurves; j<=numcurves; j++) { + curveCB[i]->addItem(CurveReference(CurveReference::CURVE_REF_CUSTOM, j).toString(model, false), j); + } + curveCB[i]->setCurrentIndex(model->limitData[i].curve.value + numcurves); } if (firmware->getCapability(PPMCenter)) { centerSB[i]->setValue(model->limitData[i].ppmCenter + 1500);