|
|
|
@ -130,88 +130,44 @@ QGCView { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Rectangle { |
|
|
|
Image { |
|
|
|
id: addMissionItemsButton |
|
|
|
id: addMissionItemsButton |
|
|
|
anchors.rightMargin: ScreenTools.defaultFontPixelHeight |
|
|
|
anchors.rightMargin: ScreenTools.defaultFontPixelHeight |
|
|
|
anchors.right: homePositionManagerButton.left |
|
|
|
anchors.right: homePositionManagerButton.left |
|
|
|
anchors.top: homePositionManagerButton.top |
|
|
|
anchors.top: homePositionManagerButton.top |
|
|
|
radius: (ScreenTools.defaultFontPixelHeight * 3) / 2 |
|
|
|
width: ScreenTools.defaultFontPixelHeight * 3 |
|
|
|
width: radius * 2 |
|
|
|
fillMode: Image.PreserveAspectFit |
|
|
|
height: radius * 2 |
|
|
|
mipmap: true |
|
|
|
border.width: 2 |
|
|
|
smooth: true |
|
|
|
border.color: "white" |
|
|
|
source: "/qmlimages/MapAddMission.svg" |
|
|
|
color: _addMissionItems ? _qgcPal.buttonHighlight : "black" |
|
|
|
opacity: _addMissionItems ? 1.0 : 0.75 |
|
|
|
opacity: _addMissionItems ? 0.75 : 1.0 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
MouseArea { |
|
|
|
MouseArea { |
|
|
|
anchors.fill: parent |
|
|
|
anchors.fill: parent |
|
|
|
|
|
|
|
|
|
|
|
onClicked: { |
|
|
|
onClicked: { |
|
|
|
_addMissionItems = !_addMissionItems |
|
|
|
_addMissionItems = !_addMissionItems |
|
|
|
_showHomePositionManager = false |
|
|
|
_showHomePositionManager = false |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Rectangle { |
|
|
|
|
|
|
|
anchors.verticalCenter: parent.verticalCenter |
|
|
|
|
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
|
|
|
|
width: ScreenTools.defaultFontPixelHeight * 1.5 |
|
|
|
|
|
|
|
height: width |
|
|
|
|
|
|
|
radius: width / 2 |
|
|
|
|
|
|
|
border.width: 2 |
|
|
|
|
|
|
|
border.color: "white" |
|
|
|
|
|
|
|
color: "transparent" |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
QGCLabel { |
|
|
|
|
|
|
|
anchors.fill: parent |
|
|
|
|
|
|
|
horizontalAlignment: Text.AlignHCenter |
|
|
|
|
|
|
|
verticalAlignment: Text.AlignVCenter |
|
|
|
|
|
|
|
color: "white" |
|
|
|
|
|
|
|
text: "1" |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Rectangle { |
|
|
|
Image { |
|
|
|
id: homePositionManagerButton |
|
|
|
id: homePositionManagerButton |
|
|
|
anchors.rightMargin: ScreenTools.defaultFontPixelHeight |
|
|
|
anchors.rightMargin: ScreenTools.defaultFontPixelHeight |
|
|
|
anchors.right: centerMapButton.left |
|
|
|
anchors.right: centerMapButton.left |
|
|
|
anchors.top: centerMapButton.top |
|
|
|
anchors.top: centerMapButton.top |
|
|
|
radius: (ScreenTools.defaultFontPixelHeight * 3) / 2 |
|
|
|
width: ScreenTools.defaultFontPixelHeight * 3 |
|
|
|
width: radius * 2 |
|
|
|
fillMode: Image.PreserveAspectFit |
|
|
|
height: radius * 2 |
|
|
|
mipmap: true |
|
|
|
border.width: 2 |
|
|
|
smooth: true |
|
|
|
border.color: "white" |
|
|
|
source: "/qmlimages/MapHome.svg" |
|
|
|
color: _showHomePositionManager ? _qgcPal.buttonHighlight : "black" |
|
|
|
opacity: _showHomePositionManager ? 1.0 : 0.75 |
|
|
|
opacity: _showHomePositionManager ? 0.75 : 1.0 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
MouseArea { |
|
|
|
MouseArea { |
|
|
|
anchors.fill: parent |
|
|
|
anchors.fill: parent |
|
|
|
|
|
|
|
|
|
|
|
onClicked: { |
|
|
|
onClicked: { |
|
|
|
_showHomePositionManager = !_showHomePositionManager |
|
|
|
_showHomePositionManager = !_showHomePositionManager |
|
|
|
_addMissionItems = false |
|
|
|
_addMissionItems = false |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Rectangle { |
|
|
|
|
|
|
|
anchors.verticalCenter: parent.verticalCenter |
|
|
|
|
|
|
|
anchors.horizontalCenter: parent.horizontalCenter |
|
|
|
|
|
|
|
width: ScreenTools.defaultFontPixelHeight * 1.5 |
|
|
|
|
|
|
|
height: width |
|
|
|
|
|
|
|
radius: width / 2 |
|
|
|
|
|
|
|
border.width: 2 |
|
|
|
|
|
|
|
border.color: "white" |
|
|
|
|
|
|
|
color: "transparent" |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
QGCLabel { |
|
|
|
|
|
|
|
anchors.fill: parent |
|
|
|
|
|
|
|
horizontalAlignment: Text.AlignHCenter |
|
|
|
|
|
|
|
verticalAlignment: Text.AlignVCenter |
|
|
|
|
|
|
|
color: "white" |
|
|
|
|
|
|
|
text: "H" |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
DropButton { |
|
|
|
DropButton { |
|
|
|
@ -296,7 +252,7 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only |
|
|
|
anchors.right: mapTypeButton.left |
|
|
|
anchors.right: mapTypeButton.left |
|
|
|
anchors.top: mapTypeButton.top |
|
|
|
anchors.top: mapTypeButton.top |
|
|
|
dropDirection: dropDown |
|
|
|
dropDirection: dropDown |
|
|
|
buttonImage: "/qmlimages/Sync.png" |
|
|
|
buttonImage: "/qmlimages/MapSync.svg" |
|
|
|
viewportMargins: ScreenTools.defaultFontPixelWidth / 2 |
|
|
|
viewportMargins: ScreenTools.defaultFontPixelWidth / 2 |
|
|
|
exclusiveGroup: _dropButtonsExclusiveGroup |
|
|
|
exclusiveGroup: _dropButtonsExclusiveGroup |
|
|
|
|
|
|
|
|
|
|
|
@ -571,9 +527,9 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only |
|
|
|
QGCLabel { |
|
|
|
QGCLabel { |
|
|
|
width: parent.width |
|
|
|
width: parent.width |
|
|
|
wrapMode: Text.WordWrap |
|
|
|
wrapMode: Text.WordWrap |
|
|
|
text: "To add a new home position, click in the Map to set the position. " + |
|
|
|
text: "To add a new home position, click on the Map to set the position. " + |
|
|
|
"Then give it a new name and click Add/Update. " + |
|
|
|
"Then give it a new name and click Add/Update. " + |
|
|
|
"To change the current home position, click in the Map to set the new position. " + |
|
|
|
"To change the current home position, click on the Map to set the new position. " + |
|
|
|
"Then click Add/Update without changing the name." |
|
|
|
"Then click Add/Update without changing the name." |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -716,28 +672,18 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only |
|
|
|
anchors.top: helpTitle.bottom |
|
|
|
anchors.top: helpTitle.bottom |
|
|
|
width: parent.width |
|
|
|
width: parent.width |
|
|
|
wrapMode: Text.WordWrap |
|
|
|
wrapMode: Text.WordWrap |
|
|
|
text: "In the upper right corner of the map you will see the Mission Planner tools:" |
|
|
|
text: "Mission Planner tool buttons:" |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Rectangle { |
|
|
|
Image { |
|
|
|
id: addMissionItemsHelpIcon |
|
|
|
id: addMissionItemsHelpIcon |
|
|
|
anchors.topMargin: ScreenTools.defaultFontPixelHeight |
|
|
|
anchors.topMargin: ScreenTools.defaultFontPixelHeight |
|
|
|
anchors.top: helpIconLabel.bottom |
|
|
|
anchors.top: helpIconLabel.bottom |
|
|
|
anchors.horizontalCenter: mapTypeHelpIcon.horizontalCenter |
|
|
|
width: ScreenTools.defaultFontPixelHeight * 3 |
|
|
|
width: ScreenTools.defaultFontPixelHeight * 1.5 |
|
|
|
fillMode: Image.PreserveAspectFit |
|
|
|
height: width |
|
|
|
mipmap: true |
|
|
|
radius: width / 2 |
|
|
|
smooth: true |
|
|
|
border.width: 2 |
|
|
|
source: "/qmlimages/MapAddMission.svg" |
|
|
|
border.color: "white" |
|
|
|
|
|
|
|
color: _qgcPal.window |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
QGCLabel { |
|
|
|
|
|
|
|
anchors.fill: parent |
|
|
|
|
|
|
|
horizontalAlignment: Text.AlignHCenter |
|
|
|
|
|
|
|
verticalAlignment: Text.AlignVCenter |
|
|
|
|
|
|
|
color: "white" |
|
|
|
|
|
|
|
text: "1" |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
QGCLabel { |
|
|
|
QGCLabel { |
|
|
|
@ -747,30 +693,19 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only |
|
|
|
anchors.right: parent.right |
|
|
|
anchors.right: parent.right |
|
|
|
anchors.top: addMissionItemsHelpIcon.top |
|
|
|
anchors.top: addMissionItemsHelpIcon.top |
|
|
|
wrapMode: Text.WordWrap |
|
|
|
wrapMode: Text.WordWrap |
|
|
|
text: "This is the Add Mission Items tool. " + |
|
|
|
text: "<b>Add Mission Items</b><br>" + |
|
|
|
"Click it to turn on the ability to add mission items by clicking in the map. " + |
|
|
|
"When enabled, add mission items by clicking on the map." |
|
|
|
"Click it again to turn it off." |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Rectangle { |
|
|
|
Image { |
|
|
|
id: homePositionManagerHelpIcon |
|
|
|
id: homePositionManagerHelpIcon |
|
|
|
anchors.topMargin: ScreenTools.defaultFontPixelHeight |
|
|
|
anchors.topMargin: ScreenTools.defaultFontPixelHeight |
|
|
|
anchors.top: addMissionItemsHelpText.bottom |
|
|
|
anchors.top: addMissionItemsHelpText.bottom |
|
|
|
anchors.horizontalCenter: mapTypeHelpIcon.horizontalCenter |
|
|
|
width: ScreenTools.defaultFontPixelHeight * 3 |
|
|
|
width: ScreenTools.defaultFontPixelHeight * 1.5 |
|
|
|
fillMode: Image.PreserveAspectFit |
|
|
|
height: width |
|
|
|
mipmap: true |
|
|
|
radius: width / 2 |
|
|
|
smooth: true |
|
|
|
border.width: 2 |
|
|
|
source: "/qmlimages/MapHome.svg" |
|
|
|
border.color: "white" |
|
|
|
|
|
|
|
color: _qgcPal.window |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
QGCLabel { |
|
|
|
|
|
|
|
anchors.fill: parent |
|
|
|
|
|
|
|
horizontalAlignment: Text.AlignHCenter |
|
|
|
|
|
|
|
verticalAlignment: Text.AlignVCenter |
|
|
|
|
|
|
|
color: "white" |
|
|
|
|
|
|
|
text: "H" |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
QGCLabel { |
|
|
|
QGCLabel { |
|
|
|
@ -780,8 +715,8 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only |
|
|
|
anchors.right: parent.right |
|
|
|
anchors.right: parent.right |
|
|
|
anchors.top: homePositionManagerHelpIcon.top |
|
|
|
anchors.top: homePositionManagerHelpIcon.top |
|
|
|
wrapMode: Text.WordWrap |
|
|
|
wrapMode: Text.WordWrap |
|
|
|
text: "This is the Home Position Manager tool. " + |
|
|
|
text: "<b>Home Position Manager</b><br>" + |
|
|
|
"This tool allows you to select/add/update home positions. " + |
|
|
|
"When enabled, allows you to select/add/update home positions. " + |
|
|
|
"You can save multiple home position to represent multiple flying areas." |
|
|
|
"You can save multiple home position to represent multiple flying areas." |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -803,8 +738,8 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only |
|
|
|
anchors.right: parent.right |
|
|
|
anchors.right: parent.right |
|
|
|
anchors.top: mapCenterHelpIcon.top |
|
|
|
anchors.top: mapCenterHelpIcon.top |
|
|
|
wrapMode: Text.WordWrap |
|
|
|
wrapMode: Text.WordWrap |
|
|
|
text: "This is the Map Center tool. " + |
|
|
|
text: "<b>Map Center</b><br>" + |
|
|
|
"It will show a set of options which will center the map." |
|
|
|
"Options for centering the map." |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Image { |
|
|
|
Image { |
|
|
|
@ -815,7 +750,7 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only |
|
|
|
fillMode: Image.PreserveAspectFit |
|
|
|
fillMode: Image.PreserveAspectFit |
|
|
|
mipmap: true |
|
|
|
mipmap: true |
|
|
|
smooth: true |
|
|
|
smooth: true |
|
|
|
source: "/qmlimages/Sync.png" |
|
|
|
source: "/qmlimages/MapSync.svg" |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
QGCLabel { |
|
|
|
QGCLabel { |
|
|
|
@ -825,8 +760,8 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only |
|
|
|
anchors.right: parent.right |
|
|
|
anchors.right: parent.right |
|
|
|
anchors.top: syncHelpIcon.top |
|
|
|
anchors.top: syncHelpIcon.top |
|
|
|
wrapMode: Text.WordWrap |
|
|
|
wrapMode: Text.WordWrap |
|
|
|
text: "This is the Sync tool. " + |
|
|
|
text: "<b>Sync</b><br>" + |
|
|
|
"It will show a set of options for saving/loading mission items." |
|
|
|
"Options for saving/loading mission items." |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Image { |
|
|
|
Image { |
|
|
|
@ -847,8 +782,8 @@ This code will need to wait for Qml 5.5 support since Map.visibleRegion is only |
|
|
|
anchors.right: parent.right |
|
|
|
anchors.right: parent.right |
|
|
|
anchors.top: mapTypeHelpIcon.top |
|
|
|
anchors.top: mapTypeHelpIcon.top |
|
|
|
wrapMode: Text.WordWrap |
|
|
|
wrapMode: Text.WordWrap |
|
|
|
text: "This is the Map Type tool. " + |
|
|
|
text: "<b>Map Type</b><br>" + |
|
|
|
"It will show a set of options for selecting map types." |
|
|
|
"Map type options." |
|
|
|
} |
|
|
|
} |
|
|
|
} // Item - Help Panel |
|
|
|
} // Item - Help Panel |
|
|
|
} // Item |
|
|
|
} // Item |
|
|
|
|
Don Gagne
10 years ago
