Browse Source

Param meta data fixes (#3685)

* Fix long description meta data

* Add reboot required
QGC4.4
Don Gagne 9 years ago committed by GitHub
parent
commit
27510eea0a
  1. 2
      src/FirmwarePlugin/APM/APMParameterMetaData.cc
  2. 55
      src/QmlControls/ParameterEditorDialog.qml

2
src/FirmwarePlugin/APM/APMParameterMetaData.cc

@ -219,7 +219,7 @@ void APMParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData @@ -219,7 +219,7 @@ void APMParameterMetaData::loadParameterFactMetaDataFile(const QString& metaData
group = group.remove(QRegExp("[0-9]*$")); // remove any numbers from the end
QString shortDescription = xml.attributes().value("humanName").toString();
QString longDescription = xml.attributes().value("docmentation").toString();
QString longDescription = xml.attributes().value("documentation").toString();
QString userLevel = xml.attributes().value("user").toString();
qCDebug(APMParameterMetaDataVerboseLog) << "Found parameter name:" << name

55
src/QmlControls/ParameterEditorDialog.qml

@ -158,35 +158,46 @@ QGCViewDialog { @@ -158,35 +158,46 @@ QGCViewDialog {
QGCLabel { text: fact.name }
Row {
spacing: defaultTextWidth
Column {
spacing: defaultTextHeight / 2
anchors.left: parent.left
anchors.right: parent.right
QGCLabel { text: qsTr("Units:") }
QGCLabel { text: fact.units ? fact.units : qsTr("none") }
}
Row {
spacing: defaultTextWidth
Row {
spacing: defaultTextWidth
visible: !fact.minIsDefaultForType
QGCLabel { text: qsTr("Units:") }
QGCLabel { text: fact.units ? fact.units : qsTr("none") }
}
QGCLabel { text: qsTr("Minimum value:") }
QGCLabel { text: fact.minString }
}
Row {
spacing: defaultTextWidth
visible: !fact.minIsDefaultForType
Row {
spacing: defaultTextWidth
visible: !fact.maxIsDefaultForType
QGCLabel { text: qsTr("Minimum value:") }
QGCLabel { text: fact.minString }
}
QGCLabel { text: qsTr("Maximum value:") }
QGCLabel { text: fact.maxString }
}
Row {
spacing: defaultTextWidth
visible: !fact.maxIsDefaultForType
Row {
spacing: defaultTextWidth
QGCLabel { text: qsTr("Maximum value:") }
QGCLabel { text: fact.maxString }
}
QGCLabel { text: qsTr("Default value:") }
QGCLabel { text: fact.defaultValueAvailable ? fact.defaultValueString : qsTr("none") }
}
Row {
spacing: defaultTextWidth
QGCLabel { text: qsTr("Default value:") }
QGCLabel { text: fact.defaultValueAvailable ? fact.defaultValueString : qsTr("none") }
}
QGCLabel {
visible: fact.rebootRequired
text: "Reboot required after change"
}
} // Column
QGCLabel {
width: parent.width

Loading…
Cancel
Save