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
a4054eba
Commit
a4054eba
authored
8 years ago
by
Don Gagne
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3441 from DonLakeFlyer/SummaryUnits
Show units in summary items
parents
0a9ca90a
19e0d39b
master
dev1
merge_branch_alt
original
phil
rc1
No related merge requests found
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
14 deletions
+14
-14
APMPowerComponentSummary.qml
src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml
+1
-1
APMSafetyComponentSummaryCopter.qml
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml
+4
-4
APMSafetyComponentSummaryPlane.qml
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml
+3
-3
PowerComponentSummary.qml
src/AutoPilotPlugins/PX4/PowerComponentSummary.qml
+2
-2
SafetyComponentSummary.qml
src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml
+4
-4
No files found.
src/AutoPilotPlugins/APM/APMPowerComponentSummary.qml
View file @
a4054eba
...
...
@@ -50,7 +50,7 @@ FactPanel {
VehicleSummaryRow
{
labelText
:
qsTr
(
"
Battery capacity:
"
)
valueText
:
battCapacity
.
valueString
valueText
:
battCapacity
.
valueString
+
"
"
+
battCapacity
.
units
}
}
}
This diff is collapsed.
Click to expand it.
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryCopter.qml
View file @
a4054eba
...
...
@@ -120,22 +120,22 @@ FactPanel {
VehicleSummaryRow
{
labelText
:
qsTr
(
"
RTL min alt:
"
)
valueText
:
_rtlAltFact
.
value
==
0
?
qsTr
(
"
current
"
)
:
_rtlAltFact
.
valueString
valueText
:
_rtlAltFact
.
value
==
0
?
qsTr
(
"
current
"
)
:
_rtlAltFact
.
valueString
+
"
"
+
_rtlAltFact
.
units
}
VehicleSummaryRow
{
labelText
:
qsTr
(
"
RTL loiter time:
"
)
valueText
:
_rtlLoitTimeFact
.
valueString
valueText
:
_rtlLoitTimeFact
.
valueString
+
"
"
+
_rtlLoitTimeFact
.
units
}
VehicleSummaryRow
{
labelText
:
qsTr
(
"
RTL final alt:
"
)
valueText
:
_rtlAltFinalFact
.
value
==
0
?
qsTr
(
"
Land
"
)
:
_rtlAltFinalFact
.
valueString
valueText
:
_rtlAltFinalFact
.
value
==
0
?
qsTr
(
"
Land
"
)
:
_rtlAltFinalFact
.
valueString
+
"
"
+
_rtlAltFinalFact
.
units
}
VehicleSummaryRow
{
labelText
:
qsTr
(
"
Descent speed:
"
)
valueText
:
_landSpeedFact
.
valueString
valueText
:
_landSpeedFact
.
valueString
+
"
"
+
_landSpeedFact
.
units
}
}
}
This diff is collapsed.
Click to expand it.
src/AutoPilotPlugins/APM/APMSafetyComponentSummaryPlane.qml
View file @
a4054eba
...
...
@@ -32,17 +32,17 @@ FactPanel {
VehicleSummaryRow
{
labelText
:
qsTr
(
"
Voltage failsafe:
"
)
valueText
:
_failsafeBattVoltage
.
value
==
0
?
qsTr
(
"
Disabled
"
)
:
_failsafeBattVoltage
.
valueString
valueText
:
_failsafeBattVoltage
.
value
==
0
?
qsTr
(
"
Disabled
"
)
:
_failsafeBattVoltage
.
valueString
+
"
"
+
_failsafeBattVoltage
.
units
}
VehicleSummaryRow
{
labelText
:
qsTr
(
"
mAh failsafe:
"
)
valueText
:
_failsafeBattMah
.
value
==
0
?
qsTr
(
"
Disabled
"
)
:
_failsafeBattMah
.
valueString
valueText
:
_failsafeBattMah
.
value
==
0
?
qsTr
(
"
Disabled
"
)
:
_failsafeBattMah
.
valueString
+
"
"
+
_failsafeBattMah
.
units
}
VehicleSummaryRow
{
labelText
:
qsTr
(
"
RTL min alt:
"
)
valueText
:
_rtlAltFact
.
value
<
0
?
qsTr
(
"
current
"
)
:
_rtlAltFact
.
valueString
valueText
:
_rtlAltFact
.
value
<
0
?
qsTr
(
"
current
"
)
:
_rtlAltFact
.
valueString
+
"
"
+
_rtlAltFact
.
units
}
}
}
This diff is collapsed.
Click to expand it.
src/AutoPilotPlugins/PX4/PowerComponentSummary.qml
View file @
a4054eba
...
...
@@ -50,12 +50,12 @@ FactPanel {
VehicleSummaryRow
{
labelText
:
qsTr
(
"
Battery Full:
"
)
valueText
:
batVChargedFact
?
batVChargedFact
.
valueString
:
""
valueText
:
batVChargedFact
?
batVChargedFact
.
valueString
+
"
"
+
batVChargedFact
.
units
:
""
}
VehicleSummaryRow
{
labelText
:
qsTr
(
"
Battery Empty:
"
)
valueText
:
batVEmptyFact
?
batVEmptyFact
.
valueString
:
""
valueText
:
batVEmptyFact
?
batVEmptyFact
.
valueString
+
"
"
+
batVEmptyFact
.
units
:
""
}
VehicleSummaryRow
{
...
...
This diff is collapsed.
Click to expand it.
src/AutoPilotPlugins/PX4/SafetyComponentSummary.qml
View file @
a4054eba
...
...
@@ -27,17 +27,17 @@ FactPanel {
VehicleSummaryRow
{
labelText
:
qsTr
(
"
RTL min alt:
"
)
valueText
:
returnAltFact
?
returnAltFact
.
valueString
:
""
valueText
:
returnAltFact
?
returnAltFact
.
valueString
+
"
"
+
returnAltFact
.
units
:
""
}
VehicleSummaryRow
{
labelText
:
qsTr
(
"
RTL home alt:
"
)
valueText
:
descendAltFact
?
descendAltFact
.
valueString
:
""
valueText
:
descendAltFact
?
descendAltFact
.
valueString
+
"
"
+
descendAltFact
.
units
:
""
}
VehicleSummaryRow
{
labelText
:
qsTr
(
"
RC loss RTL
(seconds)
:
"
)
valueText
:
commRCLossFact
?
commRCLossFact
.
valueString
:
""
labelText
:
qsTr
(
"
RC loss RTL:
"
)
valueText
:
commRCLossFact
?
commRCLossFact
.
valueString
+
"
"
+
commRCLossFact
.
units
:
""
}
VehicleSummaryRow
{
...
...
This diff is collapsed.
Click to expand it.
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