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
801b7e52
Unverified
Commit
801b7e52
authored
Aug 25, 2020
by
Don Gagne
Committed by
GitHub
Aug 25, 2020
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #9033 from DonLakeFlyer/MissionSpeeds
Mission speeds
parents
08cc9375
d2609393
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
25 deletions
+10
-25
OfflineVehicleFirstRunPrompt.qml
src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml
+0
-25
MissionSettingsEditor.qml
src/PlanView/MissionSettingsEditor.qml
+10
-0
No files found.
src/FirstRunPromptDialogs/OfflineVehicleFirstRunPrompt.qml
View file @
801b7e52
...
...
@@ -23,9 +23,6 @@ FirstRunPrompt {
property
real
_margins
:
ScreenTools
.
defaultFontPixelWidth
property
var
_appSettings
:
QGroundControl
.
settingsManager
.
appSettings
property
var
_offlineVehicle
:
QGroundControl
.
multiVehicleManager
.
offlineEditingVehicle
property
bool
_showCruiseSpeed
:
!
_offlineVehicle
.
multiRotor
property
bool
_showHoverSpeed
:
_offlineVehicle
.
multiRotor
||
_offlineVehicle
.
vtol
property
bool
_multipleFirmware
:
!
QGroundControl
.
singleFirmwareSupport
property
bool
_multipleVehicleTypes
:
!
QGroundControl
.
singleVehicleSupport
property
real
_fieldWidth
:
ScreenTools
.
defaultFontPixelWidth
*
16
...
...
@@ -77,28 +74,6 @@ FirstRunPrompt {
indexModel
:
false
visible
:
_multipleVehicleTypes
}
QGCLabel
{
Layout.fillWidth
:
true
text
:
qsTr
(
"
Mission Cruise Speed
"
)
visible
:
_showCruiseSpeed
}
FactTextField
{
Layout.preferredWidth
:
_fieldWidth
fact
:
QGroundControl
.
settingsManager
.
appSettings
.
offlineEditingCruiseSpeed
visible
:
_showCruiseSpeed
}
QGCLabel
{
Layout.fillWidth
:
true
text
:
qsTr
(
"
Mission Hover Speed
"
)
visible
:
_showHoverSpeed
}
FactTextField
{
Layout.preferredWidth
:
_fieldWidth
fact
:
QGroundControl
.
settingsManager
.
appSettings
.
offlineEditingHoverSpeed
visible
:
_showHoverSpeed
}
}
}
}
...
...
src/PlanView/MissionSettingsEditor.qml
View file @
801b7e52
...
...
@@ -220,6 +220,16 @@ Rectangle {
visible
:
_multipleVehicleTypes
&&
!
_noMissionItemsAdded
}
QGCLabel
{
Layout.columnSpan
:
2
Layout.alignment
:
Qt
.
AlignHCenter
Layout.fillWidth
:
true
wrapMode
:
Text
.
WordWrap
font.pointSize
:
ScreenTools
.
smallFontPointSize
text
:
qsTr
(
"
The following speed values are used to calculate total mission time. They do not affect the flight speed for the mission.
"
)
visible
:
_showCruiseSpeed
||
_showHoverSpeed
}
QGCLabel
{
text
:
qsTr
(
"
Cruise speed
"
)
visible
:
_showCruiseSpeed
...
...
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