From 650f16391ffaeb7d0332d029c7b60dceb329c06a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Jos=C3=A9=20Pereira?= Date: Fri, 23 Jul 2021 15:08:04 -0400 Subject: [PATCH] QmlControls: ParameterEditor: Show selected values in bitmask MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Patrick José Pereira --- src/QmlControls/ParameterEditor.qml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/QmlControls/ParameterEditor.qml b/src/QmlControls/ParameterEditor.qml index 4f0114b..ff8620d 100644 --- a/src/QmlControls/ParameterEditor.qml +++ b/src/QmlControls/ParameterEditor.qml @@ -243,7 +243,17 @@ Item { id: valueLabel width: ScreenTools.defaultFontPixelWidth * 20 color: factRow.modelFact.defaultValueAvailable ? (factRow.modelFact.valueEqualsDefault ? qgcPal.text : qgcPal.warningText) : qgcPal.text - text: factRow.modelFact.enumStrings.length === 0 ? factRow.modelFact.valueString + " " + factRow.modelFact.units : factRow.modelFact.enumStringValue + text: { + if(factRow.modelFact.enumStrings.length === 0) { + return factRow.modelFact.valueString + " " + factRow.modelFact.units + } + + if(factRow.modelFact.bitmaskStrings.length != 0) { + return factRow.modelFact.selectedBitmaskStrings.join(',') + } + + return factRow.modelFact.enumStringValue + } clip: true }