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
cac6c95e
Commit
cac6c95e
authored
Aug 13, 2018
by
Gus Grubba
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add unit to features
Renamed "Invalid" (airspace) to "custom"
parent
3c411781
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
15 deletions
+25
-15
FlightFeature.qml
src/Airmap/FlightFeature.qml
+10
-0
AirspaceAdvisoryProvider.cc
src/AirspaceManagement/AirspaceAdvisoryProvider.cc
+15
-15
No files found.
src/Airmap/FlightFeature.qml
View file @
cac6c95e
...
...
@@ -38,6 +38,16 @@ Rectangle {
QGCTextField
{
text
:
feature
.
value
?
feature
.
value
:
""
visible
:
feature
.
type
!==
AirspaceRuleFeature
.
Boolean
showUnits
:
true
unitsLabel
:
{
if
(
feature
.
unit
==
AirspaceRuleFeature
.
Kilogram
)
return
"
kg
"
;
if
(
feature
.
unit
==
AirspaceRuleFeature
.
Meters
)
return
"
m
"
;
if
(
feature
.
unit
==
AirspaceRuleFeature
.
MetersPerSecond
)
return
"
m/s
"
;
return
""
}
anchors.right
:
parent
.
right
anchors.left
:
parent
.
left
inputMethodHints
:
feature
.
type
===
AirspaceRuleFeature
.
Float
?
Qt
.
ImhFormattedNumbersOnly
:
Qt
.
ImhNone
...
...
src/AirspaceManagement/AirspaceAdvisoryProvider.cc
View file @
cac6c95e
...
...
@@ -27,20 +27,20 @@ QString
AirspaceAdvisory
::
typeStr
()
{
switch
(
type
())
{
case
Airport
:
return
QString
(
tr
(
"Airport"
));
break
;
case
Controlled_airspace
:
return
QString
(
tr
(
"Controlled Airspace"
));
break
;
case
Special_use_airspace
:
return
QString
(
tr
(
"Special Use Airspace"
));
break
;
case
Tfr
:
return
QString
(
tr
(
"TFR"
));
break
;
case
Wildfire
:
return
QString
(
tr
(
"Wild Fire"
));
break
;
case
Park
:
return
QString
(
tr
(
"Park"
));
break
;
case
Power_plant
:
return
QString
(
tr
(
"Power Plant"
));
break
;
case
Heliport
:
return
QString
(
tr
(
"Heliport"
));
break
;
case
Prison
:
return
QString
(
tr
(
"Prison"
));
break
;
case
School
:
return
QString
(
tr
(
"School"
));
break
;
case
Hospital
:
return
QString
(
tr
(
"Hospital"
));
break
;
case
Fire
:
return
QString
(
tr
(
"Fire"
));
break
;
case
Emergency
:
return
QString
(
tr
(
"Emergency"
));
break
;
case
Invalid
:
return
QString
(
tr
(
"
Invalid"
));
break
;
default:
return
QString
(
tr
(
"Unknown"
));
break
;
case
Airport
:
return
QString
(
tr
(
"Airport"
));
case
Controlled_airspace
:
return
QString
(
tr
(
"Controlled Airspace"
));
case
Special_use_airspace
:
return
QString
(
tr
(
"Special Use Airspace"
));
case
Tfr
:
return
QString
(
tr
(
"TFR"
));
case
Wildfire
:
return
QString
(
tr
(
"Wild Fire"
));
case
Park
:
return
QString
(
tr
(
"Park"
));
case
Power_plant
:
return
QString
(
tr
(
"Power Plant"
));
case
Heliport
:
return
QString
(
tr
(
"Heliport"
));
case
Prison
:
return
QString
(
tr
(
"Prison"
));
case
School
:
return
QString
(
tr
(
"School"
));
case
Hospital
:
return
QString
(
tr
(
"Hospital"
));
case
Fire
:
return
QString
(
tr
(
"Fire"
));
case
Emergency
:
return
QString
(
tr
(
"Emergency"
));
case
Invalid
:
return
QString
(
tr
(
"
Custom"
))
;
default:
return
QString
(
tr
(
"Unknown"
));
}
}
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