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
6649562c
Commit
6649562c
authored
Mar 05, 2017
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cleaning warning message output
parent
45cb473c
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
28 additions
and
14 deletions
+28
-14
MapFitFunctions.qml
src/FlightMap/Widgets/MapFitFunctions.qml
+8
-0
MissionSettingsEditor.qml
src/MissionEditor/MissionSettingsEditor.qml
+0
-2
SimpleItemMapVisual.qml
src/MissionEditor/SimpleItemMapVisual.qml
+18
-12
SurveyMapVisual.qml
src/MissionEditor/SurveyMapVisual.qml
+2
-0
No files found.
src/FlightMap/Widgets/MapFitFunctions.qml
View file @
6649562c
...
...
@@ -95,6 +95,10 @@ Item {
}
function
fitMapViewportToMissionItems
()
{
if
(
!
mapMissionController
.
visualItems
)
{
// Being called prior to controller.start
return
}
var
coordList
=
[
]
addMissionItemCoordsForFit
(
coordList
)
fitMapViewportToAllCoordinates
(
coordList
)
...
...
@@ -135,6 +139,10 @@ Item {
}
function
fitMapViewportToAllItems
()
{
if
(
!
mapMissionController
.
visualItems
)
{
// Being called prior to controller.start
return
}
var
coordList
=
[
]
addMissionItemCoordsForFit
(
coordList
)
addFenceItemCoordsForFit
(
coordList
)
...
...
src/MissionEditor/MissionSettingsEditor.qml
View file @
6649562c
...
...
@@ -160,7 +160,6 @@ Rectangle {
}
QGCLabel
{
Layout.row
:
2
text
:
qsTr
(
"
Cruise speed:
"
)
visible
:
_showCruiseSpeed
Layout.fillWidth
:
true
...
...
@@ -172,7 +171,6 @@ Rectangle {
}
QGCLabel
{
Layout.row
:
3
text
:
qsTr
(
"
Hover speed:
"
)
visible
:
_showHoverSpeed
Layout.fillWidth
:
true
...
...
src/MissionEditor/SimpleItemMapVisual.qml
View file @
6649562c
...
...
@@ -22,32 +22,38 @@ import QGroundControl.FlightMap 1.0
Item
{
property
var
map
///< Map control to place item in
property
var
_missionItem
:
object
property
var
_itemVisual
property
var
_dragArea
property
var
_missionItem
:
object
property
var
_itemVisual
property
var
_dragArea
property
bool
_itemVisualShowing
:
false
property
bool
_dragAreaShowing
:
false
function
hideItemVisuals
()
{
_itemVisual
.
destroy
()
_itemVisual
=
undefined
if
(
_itemVisualShowing
)
{
_itemVisual
.
destroy
()
_itemVisualShowing
=
false
}
}
function
showItemVisuals
()
{
if
(
!
_itemVisual
)
{
if
(
!
_itemVisual
Showing
)
{
_itemVisual
=
indicatorComponent
.
createObject
(
map
)
map
.
addMapItem
(
_itemVisual
)
_itemVisualShowing
=
true
}
}
function
hideDragArea
()
{
if
(
_dragArea
)
{
if
(
_dragArea
Showing
)
{
_dragArea
.
destroy
()
_dragArea
=
undefined
_dragArea
Showing
=
false
}
}
function
showDragArea
()
{
if
(
!
_dragArea
)
{
if
(
!
_dragArea
Showing
)
{
_dragArea
=
dragAreaComponent
.
createObject
(
map
)
_dragAreaShowing
=
true
}
}
...
...
@@ -81,10 +87,10 @@ Item {
id
:
dragAreaComponent
MissionItemIndicatorDrag
{
itemIndicator
:
_itemVisual
itemCoordinate
:
_missionItem
.
coordinate
itemIndicator
:
_itemVisual
itemCoordinate
:
_missionItem
.
coordinate
onItemCoordinateChanged
:
_missionItem
.
coordinate
=
itemCoordinate
onItemCoordinateChanged
:
_missionItem
.
coordinate
=
itemCoordinate
}
}
...
...
src/MissionEditor/SurveyMapVisual.qml
View file @
6649562c
...
...
@@ -76,6 +76,7 @@ Item {
anchorPoint.y
:
sourceItem
.
anchorPointY
z
:
QGroundControl
.
zOrderMapItems
coordinate
:
_missionItem
.
coordinate
visible
:
_missionItem
.
exitCoordinate
.
isValid
sourceItem
:
MissionItemIndexLabel
{
...
...
@@ -96,6 +97,7 @@ Item {
anchorPoint.y
:
sourceItem
.
anchorPointY
z
:
QGroundControl
.
zOrderMapItems
coordinate
:
_missionItem
.
exitCoordinate
visible
:
_missionItem
.
exitCoordinate
.
isValid
sourceItem
:
MissionItemIndexLabel
{
...
...
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