Use combo box if enums available

140c572f · Don Gagne · 92db6e3c · 140c572f
Commit 140c572f authored Jan 02, 2016 by Don Gagne
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

ParameterEditor.qml src/QmlControls/ParameterEditor.qml +1 -1

No files found.
--- a/src/QmlControls/ParameterEditor.qml
+++ b/src/QmlControls/ParameterEditor.qml
@@ -290,7 +290,7 @@ QGCView {
                            id:     valueLabel
                            width:  ScreenTools.defaultFontPixelWidth  * 20
                            color:  factRow.modelFact.defaultValueAvailable ? (factRow.modelFact.valueEqualsDefault ? __qgcPal.text : __qgcPal.warningText) : __qgcPal.text
-                            text:   factRow.modelFact.valueString + " " + factRow.modelFact.units
+                            text:   factRow.modelFact.enumStrings.length == 0 ? factRow.modelFact.valueString + " " + factRow.modelFact.units : factRow.modelFact.enumStringValue
                        }
                        QGCLabel {
                            text:   factRow.modelFact.shortDescription