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
1c252066
Commit
1c252066
authored
Mar 12, 2017
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Better visuals for mobile and connected vehicle
parent
1d444d01
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
42 deletions
+14
-42
MissionSettingsEditor.qml
src/MissionEditor/MissionSettingsEditor.qml
+14
-42
No files found.
src/MissionEditor/MissionSettingsEditor.qml
View file @
1c252066
...
@@ -40,6 +40,7 @@ Rectangle {
...
@@ -40,6 +40,7 @@ Rectangle {
property
bool
_showHoverSpeed
:
_missionVehicle
.
multiRotor
||
missionController
.
vehicle
.
vtol
property
bool
_showHoverSpeed
:
_missionVehicle
.
multiRotor
||
missionController
.
vehicle
.
vtol
property
bool
_multipleFirmware
:
QGroundControl
.
supportedFirmwareCount
>
2
property
bool
_multipleFirmware
:
QGroundControl
.
supportedFirmwareCount
>
2
property
real
_fieldWidth
:
ScreenTools
.
defaultFontPixelWidth
*
16
property
real
_fieldWidth
:
ScreenTools
.
defaultFontPixelWidth
*
16
property
bool
_mobile
:
ScreenTools
.
isMobile
readonly
property
string
_firmwareLabel
:
qsTr
(
"
Firmware:
"
)
readonly
property
string
_firmwareLabel
:
qsTr
(
"
Firmware:
"
)
readonly
property
string
_vehicleLabel
:
qsTr
(
"
Vehicle:
"
)
readonly
property
string
_vehicleLabel
:
qsTr
(
"
Vehicle:
"
)
...
@@ -68,6 +69,8 @@ Rectangle {
...
@@ -68,6 +69,8 @@ Rectangle {
anchors.left
:
parent
.
left
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
anchors.right
:
parent
.
right
spacing
:
_margin
spacing
:
_margin
visible
:
_mobile
?
index
==
2
:
true
// Cheating here since we known we only have Lat/Lon/Alt
QGCLabel
{
text
:
object
.
name
;
Layout.fillWidth
:
true
}
QGCLabel
{
text
:
object
.
name
;
Layout.fillWidth
:
true
}
FactTextField
{
FactTextField
{
Layout.preferredWidth
:
_fieldWidth
Layout.preferredWidth
:
_fieldWidth
...
@@ -84,11 +87,17 @@ Rectangle {
...
@@ -84,11 +87,17 @@ Rectangle {
}
}
QGCLabel
{
QGCLabel
{
width
:
parent
.
width
width
:
parent
.
width
wrapMode
:
Text
.
WordWrap
wrapMode
:
Text
.
WordWrap
font.pointSize
:
ScreenTools
.
smallFontPointSize
font.pointSize
:
ScreenTools
.
smallFontPointSize
text
:
qsTr
(
"
Actual position set by vehicle at flight time.
"
)
text
:
qsTr
(
"
Actual position set by vehicle at flight time.
"
)
horizontalAlignment
:
Text
.
AlignHCenter
horizontalAlignment
:
Text
.
AlignHCenter
}
QGCButton
{
text
:
qsTr
(
"
Set Home To Map Center
"
)
onClicked
:
editorRoot
.
moveHomeToMapCenter
()
anchors.horizontalCenter
:
parent
.
horizontalCenter
}
}
QGCLabel
{
QGCLabel
{
...
@@ -124,17 +133,6 @@ Rectangle {
...
@@ -124,17 +133,6 @@ Rectangle {
Layout.preferredWidth
:
_fieldWidth
Layout.preferredWidth
:
_fieldWidth
}
}
QGCLabel
{
text
:
_firmwareLabel
visible
:
!
_showOfflineEditingCombos
Layout.fillWidth
:
true
}
QGCLabel
{
text
:
_missionVehicle
.
firmwareTypeString
visible
:
!
_showOfflineEditingCombos
Layout.preferredWidth
:
_fieldWidth
}
QGCLabel
{
QGCLabel
{
text
:
_vehicleLabel
text
:
_vehicleLabel
visible
:
_showOfflineEditingCombos
visible
:
_showOfflineEditingCombos
...
@@ -148,17 +146,6 @@ Rectangle {
...
@@ -148,17 +146,6 @@ Rectangle {
Layout.preferredWidth
:
_fieldWidth
Layout.preferredWidth
:
_fieldWidth
}
}
QGCLabel
{
text
:
_vehicleLabel
visible
:
!
_showOfflineEditingCombos
Layout.fillWidth
:
true
}
QGCLabel
{
text
:
_missionVehicle
.
vehicleTypeString
visible
:
!
_showOfflineEditingCombos
Layout.preferredWidth
:
_fieldWidth
}
QGCLabel
{
QGCLabel
{
text
:
qsTr
(
"
Cruise speed:
"
)
text
:
qsTr
(
"
Cruise speed:
"
)
visible
:
_showCruiseSpeed
visible
:
_showCruiseSpeed
...
@@ -201,21 +188,6 @@ Rectangle {
...
@@ -201,21 +188,6 @@ Rectangle {
text
:
qsTr
(
"
Speeds are only used for time calculations. Actual vehicle speed will not be affected.
"
)
text
:
qsTr
(
"
Speeds are only used for time calculations. Actual vehicle speed will not be affected.
"
)
horizontalAlignment
:
Text
.
AlignHCenter
horizontalAlignment
:
Text
.
AlignHCenter
}
}
Rectangle
{
anchors.left
:
parent
.
left
anchors.right
:
parent
.
right
height
:
1
color
:
qgcPal
.
text
}
QGCButton
{
width
:
parent
.
width
*
0.9
text
:
qsTr
(
"
Set Home To Map Center
"
)
onClicked
:
editorRoot
.
moveHomeToMapCenter
()
anchors.horizontalCenter
:
parent
.
horizontalCenter
}
}
// Column
}
// Column
}
// Item
}
// Item
}
// Component
}
// Component
...
...
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