From fd5facd8492db8791cedc054bfb1a9bb609a8553 Mon Sep 17 00:00:00 2001
From: elecpower <elecpower@users.noreply.github.com>
Date: Tue, 16 Jul 2024 17:41:49 +1000
Subject: [PATCH] Remove curveref dependence on adjref and replace with
srcnumref
---
companion/src/firmwares/curvereference.cpp | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/companion/src/firmwares/curvereference.cpp b/companion/src/firmwares/curvereference.cpp
index 16e46baa1fd..4050cf5f2d8 100644
--- a/companion/src/firmwares/curvereference.cpp
+++ b/companion/src/firmwares/curvereference.cpp
@@ -19,7 +19,6 @@
*/
#include "curvereference.h"
-#include "adjustmentreference.h"
#include "helpers.h"
#include "modeldata.h"
#include "generalsettings.h"
@@ -65,7 +64,7 @@ const QString CurveReference::toString(const ModelData * model, bool verbose, co
const bool CurveReference::isValueNumber() const
{
- return (type == CURVE_REF_DIFF || type == CURVE_REF_EXPO) && AdjustmentReference(value).type == AdjustmentReference::ADJUST_REF_VALUE;
+ return (type == CURVE_REF_DIFF || type == CURVE_REF_EXPO) && SourceNumRef(value).isNumber();
}
const bool CurveReference::isAvailable() const
@@ -77,7 +76,7 @@ const bool CurveReference::isAvailable() const
int CurveReference::getDefaultValue(const CurveRefType type, const bool isGVar)
{
if (isGVar && (type == CURVE_REF_DIFF || type == CURVE_REF_EXPO))
- return AdjustmentReference(AdjustmentReference::ADJUST_REF_GVAR, 1).toValue();
+ return SourceNumRef(SOURCE_TYPE_GVAR, 1).toValue();
else if (type == CURVE_REF_FUNC)
return 1;
else
@@ -224,18 +223,6 @@ void CurveReferenceUIManager::update()
if (cboType)
cboType->setCurrentIndex(cboType->findData(curveRef.type));
-
-/*
- if (chkUseSource)
- chkUseSource->setVisible(widgetsMask & CURVE_REF_UI_SRC_SHOW);
-
- if (cboSource)
- cboSource->setVisible(widgetsMask & CURVE_REF_UI_SRC_SHOW);
-
- if (sbxValue)
- sbxValue->setVisible(widgetsMask & CURVE_REF_UI_VALUE_SHOW);
-*/
-
if (cboCurveFunc) {
if (curveRef.isValueReference())
populateValueCB(cboCurveFunc);