Commit 27510eea authored by Don Gagne's avatar Don Gagne Committed by GitHub

Param meta data fixes (#3685)

* Fix long description meta data

* Add reboot required
parent b301ce3a
...@@ -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 group = group.remove(QRegExp("[0-9]*$")); // remove any numbers from the end
QString shortDescription = xml.attributes().value("humanName").toString(); 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(); QString userLevel = xml.attributes().value("user").toString();
qCDebug(APMParameterMetaDataVerboseLog) << "Found parameter name:" << name qCDebug(APMParameterMetaDataVerboseLog) << "Found parameter name:" << name
......
...@@ -158,35 +158,46 @@ QGCViewDialog { ...@@ -158,35 +158,46 @@ QGCViewDialog {
QGCLabel { text: fact.name } QGCLabel { text: fact.name }
Row { Column {
spacing: defaultTextWidth spacing: defaultTextHeight / 2
anchors.left: parent.left
anchors.right: parent.right
QGCLabel { text: qsTr("Units:") } Row {
QGCLabel { text: fact.units ? fact.units : qsTr("none") } spacing: defaultTextWidth
}
Row { QGCLabel { text: qsTr("Units:") }
spacing: defaultTextWidth QGCLabel { text: fact.units ? fact.units : qsTr("none") }
visible: !fact.minIsDefaultForType }
QGCLabel { text: qsTr("Minimum value:") } Row {
QGCLabel { text: fact.minString } spacing: defaultTextWidth
} visible: !fact.minIsDefaultForType
Row { QGCLabel { text: qsTr("Minimum value:") }
spacing: defaultTextWidth QGCLabel { text: fact.minString }
visible: !fact.maxIsDefaultForType }
QGCLabel { text: qsTr("Maximum value:") } Row {
QGCLabel { text: fact.maxString } spacing: defaultTextWidth
} visible: !fact.maxIsDefaultForType
Row { QGCLabel { text: qsTr("Maximum value:") }
spacing: defaultTextWidth QGCLabel { text: fact.maxString }
}
QGCLabel { text: qsTr("Default value:") } Row {
QGCLabel { text: fact.defaultValueAvailable ? fact.defaultValueString : qsTr("none") } 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 { QGCLabel {
width: parent.width width: parent.width
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment