Browse Source

Cleaning warning message output

QGC4.4
Don Gagne 8 years ago
parent
commit
6649562c2a
  1. 8
      src/FlightMap/Widgets/MapFitFunctions.qml
  2. 2
      src/MissionEditor/MissionSettingsEditor.qml
  3. 30
      src/MissionEditor/SimpleItemMapVisual.qml
  4. 2
      src/MissionEditor/SurveyMapVisual.qml

8
src/FlightMap/Widgets/MapFitFunctions.qml

@ -95,6 +95,10 @@ Item { @@ -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 { @@ -135,6 +139,10 @@ Item {
}
function fitMapViewportToAllItems() {
if (!mapMissionController.visualItems) {
// Being called prior to controller.start
return
}
var coordList = [ ]
addMissionItemCoordsForFit(coordList)
addFenceItemCoordsForFit(coordList)

2
src/MissionEditor/MissionSettingsEditor.qml

@ -160,7 +160,6 @@ Rectangle { @@ -160,7 +160,6 @@ Rectangle {
}
QGCLabel {
Layout.row: 2
text: qsTr("Cruise speed:")
visible: _showCruiseSpeed
Layout.fillWidth: true
@ -172,7 +171,6 @@ Rectangle { @@ -172,7 +171,6 @@ Rectangle {
}
QGCLabel {
Layout.row: 3
text: qsTr("Hover speed:")
visible: _showHoverSpeed
Layout.fillWidth: true

30
src/MissionEditor/SimpleItemMapVisual.qml

@ -22,32 +22,38 @@ import QGroundControl.FlightMap 1.0 @@ -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 (!_itemVisualShowing) {
_itemVisual = indicatorComponent.createObject(map)
map.addMapItem(_itemVisual)
_itemVisualShowing = true
}
}
function hideDragArea() {
if (_dragArea) {
if (_dragAreaShowing) {
_dragArea.destroy()
_dragArea = undefined
_dragAreaShowing = false
}
}
function showDragArea() {
if (!_dragArea) {
if (!_dragAreaShowing) {
_dragArea = dragAreaComponent.createObject(map)
_dragAreaShowing = true
}
}
@ -81,10 +87,10 @@ Item { @@ -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
}
}

2
src/MissionEditor/SurveyMapVisual.qml

@ -76,6 +76,7 @@ Item { @@ -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 { @@ -96,6 +97,7 @@ Item {
anchorPoint.y: sourceItem.anchorPointY
z: QGroundControl.zOrderMapItems
coordinate: _missionItem.exitCoordinate
visible: _missionItem.exitCoordinate.isValid
sourceItem:
MissionItemIndexLabel {

Loading…
Cancel
Save