Refactor curve reference

2020-12-05 06:50:43 +11:00
parent b52a921c59
commit 83561fe6fe
10 changed files with 326 additions and 233 deletions
@@ -210,170 +210,6 @@ void GVarGroup::setWeight(int val)
  lock = false;
 }

-
-/*
- * CurveGroup
-*/
-
-CurveGroup::CurveGroup(QComboBox * curveTypeCB, QCheckBox * curveGVarCB, QComboBox * curveValueCB, QSpinBox * curveValueSB, CurveReference & curve, const ModelData & model, unsigned int flags):
-  QObject(),
-  curveTypeCB(curveTypeCB),
-  curveGVarCB(curveGVarCB),
-  curveValueCB(curveValueCB),
-  curveValueSB(curveValueSB),
-  curve(curve),
-  model(model),
-  flags(flags),
-  lock(false),
-  lastType(-1)
-{
-  if (!(flags & HIDE_DIFF)) curveTypeCB->addItem(tr("Diff"), 0);
-  if (!(flags & HIDE_EXPO)) curveTypeCB->addItem(tr("Expo"), 1);
-  curveTypeCB->addItem(tr("Func"), 2);
-  curveTypeCB->addItem(tr("Curve"), 3);
-
-  curveValueCB->setMaxVisibleItems(10);
-
-  connect(curveTypeCB, SIGNAL(currentIndexChanged(int)), this, SLOT(typeChanged(int)));
-  connect(curveGVarCB, SIGNAL(stateChanged(int)), this, SLOT(gvarCBChanged(int)));
-  connect(curveValueCB, SIGNAL(currentIndexChanged(int)), this, SLOT(valuesChanged()));
-  connect(curveValueSB, SIGNAL(editingFinished()), this, SLOT(valuesChanged()));
-
-  update();
-}
-
-void CurveGroup::update()
-{
-  lock = true;
-
-  int found = curveTypeCB->findData(curve.type);
-  if (found < 0) found = 0;
-  curveTypeCB->setCurrentIndex(found);
-
-  if (curve.type == CurveReference::CURVE_REF_DIFF || curve.type == CurveReference::CURVE_REF_EXPO) {
-    curveGVarCB->setVisible(getCurrentFirmware()->getCapability(Gvars));
-    if (curve.value > 100 || curve.value < -100) {
-      curveGVarCB->setChecked(true);
-      if (lastType != CurveReference::CURVE_REF_DIFF && lastType != CurveReference::CURVE_REF_EXPO) {
-        lastType = curve.type;
-        Helpers::populateGVCB(*curveValueCB, curve.value, model);
-      }
-      curveValueCB->show();
-      curveValueSB->hide();
-    }
-    else {
-      curveGVarCB->setChecked(false);
-      curveValueSB->setMinimum(-100);
-      curveValueSB->setMaximum(100);
-      curveValueSB->setValue(curve.value);
-      curveValueSB->show();
-      curveValueCB->hide();
-    }
-  }
-  else {
-    curveGVarCB->hide();
-    curveValueSB->hide();
-    curveValueCB->show();
-    switch (curve.type) {
-      case CurveReference::CURVE_REF_FUNC:
-        if (lastType != curve.type) {
-          lastType = curve.type;
-          curveValueCB->clear();
-          for (int i=0; i<=6/*TODO constant*/; i++) {
-            curveValueCB->addItem(CurveReference(CurveReference::CURVE_REF_FUNC, i).toString(&model, false));
-          }
-        }
-        curveValueCB->setCurrentIndex(curve.value);
-        break;
-      case CurveReference::CURVE_REF_CUSTOM:
-      {
-        int numcurves = getCurrentFirmware()->getCapability(NumCurves);
-        if (lastType != curve.type) {
-          lastType = curve.type;
-          curveValueCB->clear();
-          for (int i= ((flags & HIDE_NEGATIVE_CURVES) ? 0 : -numcurves); i<=numcurves; i++) {
-            curveValueCB->addItem(CurveReference(CurveReference::CURVE_REF_CUSTOM, i).toString(&model, false), i);
-            if (i == curve.value) {
-              curveValueCB->setCurrentIndex(curveValueCB->count() - 1);
-            }
-          }
-        }
-        break;
-      }
-      default:
-        break;
-    }
-  }
-
-  lock = false;
-}
-
-void CurveGroup::gvarCBChanged(int state)
-{
-  if (!lock) {
-    if (state) {
-      curve.value = 10000+1; // TODO constant in EEpromInterface ...
-      lastType = -1; // quickfix for issue #3518: force refresh of curveValueCB at next update() to set current index to GV1
-    }
-    else {
-      curve.value = 0; // TODO could be better
-    }
-
-    update();
-  }
-}
-
-void CurveGroup::typeChanged(int value)
-{
-  if (!lock) {
-    int type = curveTypeCB->itemData(curveTypeCB->currentIndex()).toInt();
-    switch (type) {
-      case 0:
-        curve = CurveReference(CurveReference::CURVE_REF_DIFF, 0);
-        break;
-      case 1:
-        curve = CurveReference(CurveReference::CURVE_REF_EXPO, 0);
-        break;
-      case 2:
-        curve = CurveReference(CurveReference::CURVE_REF_FUNC, 0);
-        break;
-      case 3:
-        curve = CurveReference(CurveReference::CURVE_REF_CUSTOM, 0);
-        break;
-    }
-
-    update();
-  }
-}
-
-void CurveGroup::valuesChanged()
-{
-  if (!lock) {
-    switch (curveTypeCB->itemData(curveTypeCB->currentIndex()).toInt()) {
-      case 0:
-      case 1:
-      {
-        int value;
-        if (curveGVarCB->isChecked())
-          value = curveValueCB->itemData(curveValueCB->currentIndex()).toInt();
-        else
-          value = curveValueSB->value();
-        curve = CurveReference(curveTypeCB->itemData(curveTypeCB->currentIndex()).toInt() == 0 ? CurveReference::CURVE_REF_DIFF : CurveReference::CURVE_REF_EXPO, value);
-        break;
-      }
-      case 2:
-        curve = CurveReference(CurveReference::CURVE_REF_FUNC, curveValueCB->currentIndex());
-        break;
-      case 3:
-        curve = CurveReference(CurveReference::CURVE_REF_CUSTOM, curveValueCB->itemData(curveValueCB->currentIndex()).toInt());
-        break;
-    }
-
-    update();
-  }
-}
-
-
 /*
 * Helpers namespace functions
 */