Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
27510eea
Commit
27510eea
authored
Jun 29, 2016
by
Don Gagne
Committed by
GitHub
Jun 29, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Param meta data fixes (#3685)
* Fix long description meta data * Add reboot required
parent
b301ce3a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
34 additions
and
23 deletions
+34
-23
APMParameterMetaData.cc
src/FirmwarePlugin/APM/APMParameterMetaData.cc
+1
-1
ParameterEditorDialog.qml
src/QmlControls/ParameterEditorDialog.qml
+33
-22
No files found.
src/FirmwarePlugin/APM/APMParameterMetaData.cc
View file @
27510eea
...
...
@@ -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
(
"doc
u
mentation"
).
toString
();
QString
userLevel
=
xml
.
attributes
().
value
(
"user"
).
toString
();
qCDebug
(
APMParameterMetaDataVerboseLog
)
<<
"Found parameter name:"
<<
name
...
...
src/QmlControls/ParameterEditorDialog.qml
View file @
27510eea
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment