Skip to content

Q
qgroundcontrol
Unverified Commit a1cf6a3b authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #8013 from DonLakeFlyer/CreatePlan 

Plan: Create Plan
parents 6282fe56 134ccd28
Hide whitespace changes
Inline Side-by-side
Showing with 250 additions and 285 deletions
qgcimages.qrc
View file @ a1cf6a3b
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
<file alias="pipHide.svg">src/FlightMap/Images/pipHide.svg</file> <file alias="pipHide.svg">src/FlightMap/Images/pipHide.svg</file>
<file alias="pipResize.svg">src/FlightMap/Images/pipResize.svg</file> <file alias="pipResize.svg">src/FlightMap/Images/pipResize.svg</file>
<file alias="Plan.svg">src/ui/toolbar/Images/Plan.svg</file> <file alias="Plan.svg">src/ui/toolbar/Images/Plan.svg</file>
<file alias="PlanCreator/CustomPlanCreator.png">src/MissionManager/CustomPlanCreator.png</file> <file alias="PlanCreator/BlankPlanCreator.png">src/MissionManager/BlankPlanCreator.png</file>
<file alias="PlanCreator/CorridorScanPlanCreator.png">src/MissionManager/CorridorScanPlanCreator.png</file> <file alias="PlanCreator/CorridorScanPlanCreator.png">src/MissionManager/CorridorScanPlanCreator.png</file>
<file alias="PlanCreator/StructureScanPlanCreator.png">src/MissionManager/StructureScanPlanCreator.png</file> <file alias="PlanCreator/StructureScanPlanCreator.png">src/MissionManager/StructureScanPlanCreator.png</file>
<file alias="PlanCreator/SurveyPlanCreator.png">src/MissionManager/SurveyPlanCreator.png</file> <file alias="PlanCreator/SurveyPlanCreator.png">src/MissionManager/SurveyPlanCreator.png</file>
......
qgroundcontrol.pro
View file @ a1cf6a3b
...@@ -592,7 +592,7 @@ HEADERS += \ ...@@ -592,7 +592,7 @@ HEADERS += \
src/MissionManager/ComplexMissionItem.h \ src/MissionManager/ComplexMissionItem.h \
src/MissionManager/CorridorScanComplexItem.h \ src/MissionManager/CorridorScanComplexItem.h \
src/MissionManager/CorridorScanPlanCreator.h \ src/MissionManager/CorridorScanPlanCreator.h \
src/MissionManager/CustomPlanCreator.h \ src/MissionManager/BlankPlanCreator.h \
src/MissionManager/FixedWingLandingComplexItem.h \ src/MissionManager/FixedWingLandingComplexItem.h \
src/MissionManager/GeoFenceController.h \ src/MissionManager/GeoFenceController.h \
src/MissionManager/GeoFenceManager.h \ src/MissionManager/GeoFenceManager.h \
...@@ -823,7 +823,7 @@ SOURCES += \ ...@@ -823,7 +823,7 @@ SOURCES += \
src/MissionManager/ComplexMissionItem.cc \ src/MissionManager/ComplexMissionItem.cc \
src/MissionManager/CorridorScanComplexItem.cc \ src/MissionManager/CorridorScanComplexItem.cc \
src/MissionManager/CorridorScanPlanCreator.cc \ src/MissionManager/CorridorScanPlanCreator.cc \
src/MissionManager/CustomPlanCreator.cc \ src/MissionManager/BlankPlanCreator.cc \
src/MissionManager/FixedWingLandingComplexItem.cc \ src/MissionManager/FixedWingLandingComplexItem.cc \
src/MissionManager/GeoFenceController.cc \ src/MissionManager/GeoFenceController.cc \
src/MissionManager/GeoFenceManager.cc \ src/MissionManager/GeoFenceManager.cc \
......
qgroundcontrol.qrc
View file @ a1cf6a3b
...@@ -102,7 +102,6 @@ ...@@ -102,7 +102,6 @@
<file alias="QGroundControl/Controls/ParameterEditorDialog.qml">src/QmlControls/ParameterEditorDialog.qml</file> <file alias="QGroundControl/Controls/ParameterEditorDialog.qml">src/QmlControls/ParameterEditorDialog.qml</file>
<file alias="QGroundControl/Controls/PIDTuning.qml">src/QmlControls/PIDTuning.qml</file> <file alias="QGroundControl/Controls/PIDTuning.qml">src/QmlControls/PIDTuning.qml</file>
<file alias="QGroundControl/Controls/PlanEditToolbar.qml">src/PlanView/PlanEditToolbar.qml</file> <file alias="QGroundControl/Controls/PlanEditToolbar.qml">src/PlanView/PlanEditToolbar.qml</file>
<file alias="QGroundControl/Controls/PlanStartOverlay.qml">src/PlanView/PlanStartOverlay.qml</file>
<file alias="QGroundControl/Controls/PreFlightCheckButton.qml">src/QmlControls/PreFlightCheckButton.qml</file> <file alias="QGroundControl/Controls/PreFlightCheckButton.qml">src/QmlControls/PreFlightCheckButton.qml</file>
<file alias="QGroundControl/Controls/PreFlightCheckGroup.qml">src/QmlControls/PreFlightCheckGroup.qml</file> <file alias="QGroundControl/Controls/PreFlightCheckGroup.qml">src/QmlControls/PreFlightCheckGroup.qml</file>
<file alias="QGroundControl/Controls/PreFlightCheckModel.qml">src/QmlControls/PreFlightCheckModel.qml</file> <file alias="QGroundControl/Controls/PreFlightCheckModel.qml">src/QmlControls/PreFlightCheckModel.qml</file>
......
src/MissionManager/BlankPlanCreator.cc 0 → 100644
View file @ a1cf6a3b
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
*
****************************************************************************/
#include "BlankPlanCreator.h"
#include "PlanMasterController.h"
#include "MissionSettingsItem.h"
#include "FixedWingLandingComplexItem.h"
BlankPlanCreator::BlankPlanCreator(PlanMasterController* planMasterController, QObject* parent)
: PlanCreator(planMasterController, tr("Blank"), QStringLiteral("/qmlimages/PlanCreator/BlankPlanCreator.png"), parent)
{
}
void BlankPlanCreator::createPlan(const QGeoCoordinate& /*mapCenterCoord*/)
{
_planMasterController->removeAll();
}
src/MissionManager/CustomPlanCreator.h → src/MissionManager/BlankPlanCreator.h
View file @ a1cf6a3b
...@@ -11,12 +11,12 @@ ...@@ -11,12 +11,12 @@
#include "PlanCreator.h" #include "PlanCreator.h"
class CustomPlanCreator : public PlanCreator class BlankPlanCreator : public PlanCreator
{ {
Q_OBJECT Q_OBJECT
public: public:
CustomPlanCreator(PlanMasterController* planMasterController, QObject* parent = nullptr); BlankPlanCreator(PlanMasterController* planMasterController, QObject* parent = nullptr);
Q_INVOKABLE void createPlan(const QGeoCoordinate& mapCenterCoord) final; Q_INVOKABLE void createPlan(const QGeoCoordinate& mapCenterCoord) final;
}; };
src/MissionManager/CustomPlanCreator.cc deleted 100644 → 0
View file @ 6282fe56
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
*
****************************************************************************/
#include "CustomPlanCreator.h"
#include "PlanMasterController.h"
#include "MissionSettingsItem.h"
#include "FixedWingLandingComplexItem.h"
CustomPlanCreator::CustomPlanCreator(PlanMasterController* planMasterController, QObject* parent)
: PlanCreator(planMasterController, tr("Custom"), QStringLiteral("/qmlimages/PlanCreator/CustomPlanCreator.png"), parent)
{
}
void CustomPlanCreator::createPlan(const QGeoCoordinate& mapCenterCoord)
{
_planMasterController->removeAll();
VisualMissionItem* takeoffItem = _missionController->insertSimpleMissionItem(mapCenterCoord, -1);
takeoffItem->setWizardMode(true);
_missionController->insertSimpleMissionItem(mapCenterCoord.atDistanceAndAzimuth(50, 135), -1);
_missionController->insertSimpleMissionItem(mapCenterCoord.atDistanceAndAzimuth(50, -135),-1);
if (_planMasterController->managerVehicle()->fixedWing()) {
FixedWingLandingComplexItem* landingItem = qobject_cast<FixedWingLandingComplexItem*>(_missionController->insertComplexMissionItem(MissionController::patternFWLandingName, mapCenterCoord, -1));
landingItem->setWizardMode(true);
landingItem->setLoiterDragAngleOnly(true);
} else {
MissionSettingsItem* settingsItem = _missionController->visualItems()->value<MissionSettingsItem*>(0);
settingsItem->setMissionEndRTL(true);
}
_missionController->setCurrentPlanViewIndex(takeoffItem->sequenceNumber(), true);
}
src/MissionManager/PlanMasterController.cc
View file @ a1cf6a3b
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "SurveyPlanCreator.h" #include "SurveyPlanCreator.h"
#include "StructureScanPlanCreator.h" #include "StructureScanPlanCreator.h"
#include "CorridorScanPlanCreator.h" #include "CorridorScanPlanCreator.h"
#include "CustomPlanCreator.h" #include "BlankPlanCreator.h"
#if defined(QGC_AIRMAP_ENABLED) #if defined(QGC_AIRMAP_ENABLED)
#include "AirspaceFlightPlanProvider.h" #include "AirspaceFlightPlanProvider.h"
#endif #endif
...@@ -601,19 +601,19 @@ void PlanMasterController::_updatePlanCreatorsList(void) ...@@ -601,19 +601,19 @@ void PlanMasterController::_updatePlanCreatorsList(void)
if (!_flyView) { if (!_flyView) {
if (!_planCreators) { if (!_planCreators) {
_planCreators = new QmlObjectListModel(this); _planCreators = new QmlObjectListModel(this);
_planCreators->append(new BlankPlanCreator(this, this));
_planCreators->append(new SurveyPlanCreator(this, this)); _planCreators->append(new SurveyPlanCreator(this, this));
_planCreators->append(new CorridorScanPlanCreator(this, this)); _planCreators->append(new CorridorScanPlanCreator(this, this));
_planCreators->append(new CustomPlanCreator(this, this));
emit planCreatorsChanged(_planCreators); emit planCreatorsChanged(_planCreators);
} }
if (_managerVehicle->fixedWing()) { if (_managerVehicle->fixedWing()) {
if (_planCreators->count() == 4) { if (_planCreators->count() == 4) {
_planCreators->removeAt(_planCreators->count() - 2); _planCreators->removeAt(_planCreators->count() - 1);
} }
} else { } else {
if (_planCreators->count() != 4) { if (_planCreators->count() != 4) {
_planCreators->insert(_planCreators->count() - 1, new StructureScanPlanCreator(this, this)); _planCreators->append(new StructureScanPlanCreator(this, this));
} }
} }
} }
......
src/PlanView/CameraSection.qml
View file @ a1cf6a3b
...@@ -24,6 +24,8 @@ Column { ...@@ -24,6 +24,8 @@ Column {
SectionHeader { SectionHeader {
id: cameraSectionHeader id: cameraSectionHeader
anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Camera") text: qsTr("Camera")
checked: false checked: false
} }
......
src/PlanView/CorridorScanEditor.qml
View file @ a1cf6a3b
...@@ -124,8 +124,10 @@ Rectangle { ...@@ -124,8 +124,10 @@ Rectangle {
} }
SectionHeader { SectionHeader {
id: corridorHeader id: corridorHeader
text: qsTr("Corridor") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Corridor")
} }
GridLayout { GridLayout {
...@@ -182,9 +184,11 @@ Rectangle { ...@@ -182,9 +184,11 @@ Rectangle {
} }
SectionHeader { SectionHeader {
id: terrainHeader id: terrainHeader
text: qsTr("Terrain") anchors.left: parent.left
checked: missionItem.followTerrain anchors.right: parent.right
text: qsTr("Terrain")
checked: missionItem.followTerrain
} }
ColumnLayout { ColumnLayout {
...@@ -228,8 +232,10 @@ Rectangle { ...@@ -228,8 +232,10 @@ Rectangle {
} }
SectionHeader { SectionHeader {
id: statsHeader id: statsHeader
text: qsTr("Statistics") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Statistics")
} }
TransectStyleComplexItemStats { } TransectStyleComplexItemStats { }
......
src/PlanView/FWLandingPatternEditor.qml
View file @ a1cf6a3b
...@@ -52,8 +52,10 @@ Rectangle { ...@@ -52,8 +52,10 @@ Rectangle {
visible: !editorColumnNeedLandingPoint.visible visible: !editorColumnNeedLandingPoint.visible
SectionHeader { SectionHeader {
id: loiterPointSection id: loiterPointSection
text: qsTr("Loiter point") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Loiter point")
} }
Column { Column {
...@@ -101,8 +103,10 @@ Rectangle { ...@@ -101,8 +103,10 @@ Rectangle {
} }
SectionHeader { SectionHeader {
id: landingPointSection id: landingPointSection
text: qsTr("Landing point") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Landing point")
} }
Column { Column {
...@@ -181,9 +185,11 @@ Rectangle { ...@@ -181,9 +185,11 @@ Rectangle {
} }
SectionHeader { SectionHeader {
id: cameraSection id: cameraSection
text: qsTr("Camera") anchors.left: parent.left
visible: _showCameraSection anchors.right: parent.right
text: qsTr("Camera")
visible: _showCameraSection
} }
Column { Column {
......
src/PlanView/GeoFenceEditor.qml
View file @ a1cf6a3b
...@@ -110,8 +110,10 @@ QGCFlickable { ...@@ -110,8 +110,10 @@ QGCFlickable {
} }
SectionHeader { SectionHeader {
id: insertSection id: insertSection
text: qsTr("Insert GeoFence") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Insert GeoFence")
} }
QGCButton { QGCButton {
...@@ -139,8 +141,10 @@ QGCFlickable { ...@@ -139,8 +141,10 @@ QGCFlickable {
} }
SectionHeader { SectionHeader {
id: polygonSection id: polygonSection
text: qsTr("Polygon Fences") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Polygon Fences")
} }
QGCLabel { QGCLabel {
...@@ -212,8 +216,10 @@ QGCFlickable { ...@@ -212,8 +216,10 @@ QGCFlickable {
} // GridLayout } // GridLayout
SectionHeader { SectionHeader {
id: circleSection id: circleSection
text: qsTr("Circular Fences") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Circular Fences")
} }
QGCLabel { QGCLabel {
...@@ -302,8 +308,10 @@ QGCFlickable { ...@@ -302,8 +308,10 @@ QGCFlickable {
} // GridLayout } // GridLayout
SectionHeader { SectionHeader {
id: breachReturnSection id: breachReturnSection
text: qsTr("Breach Return Point") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Breach Return Point")
} }
QGCButton { QGCButton {
......
src/PlanView/MissionSettingsEditor.qml
View file @ a1cf6a3b
...@@ -108,9 +108,11 @@ Rectangle { ...@@ -108,9 +108,11 @@ Rectangle {
} }
SectionHeader { SectionHeader {
id: missionEndHeader id: missionEndHeader
text: qsTr("Mission End") anchors.left: parent.left
checked: true anchors.right: parent.right
text: qsTr("Mission End")
checked: true
} }
Column { Column {
...@@ -128,10 +130,12 @@ Rectangle { ...@@ -128,10 +130,12 @@ Rectangle {
SectionHeader { SectionHeader {
id: vehicleInfoSectionHeader id: vehicleInfoSectionHeader
text: qsTr("Vehicle Info") anchors.left: parent.left
visible: _offlineEditing && !_waypointsOnlyMode anchors.right: parent.right
checked: false text: qsTr("Vehicle Info")
visible: _offlineEditing && !_waypointsOnlyMode
checked: false
} }
GridLayout { GridLayout {
...@@ -192,10 +196,12 @@ Rectangle { ...@@ -192,10 +196,12 @@ Rectangle {
} // GridLayout } // GridLayout
SectionHeader { SectionHeader {
id: plannedHomePositionSection id: plannedHomePositionSection
text: qsTr("Planned Home Position") anchors.left: parent.left
visible: !_vehicleHasHomePosition anchors.right: parent.right
checked: false text: qsTr("Planned Home Position")
visible: !_vehicleHasHomePosition
checked: false
} }
Column { Column {
......
src/PlanView/PlanStartOverlay.qml deleted 100644 → 0
View file @ 6282fe56
/****************************************************************************
*
* (c) 2009-2016 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
* QGroundControl is licensed according to the terms in the file
* COPYING.md in the root of the source code directory.
*
****************************************************************************/
import QtQuick 2.3
import QtQuick.Controls 2.4
import QtQuick.Layouts 1.2
import QGroundControl 1.0
import QGroundControl.ScreenTools 1.0
import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
Item {
id: _root
property var planMasterController
property var mapControl
property real _radius: ScreenTools.defaultFontPixelWidth / 2
property real _margins: ScreenTools.defaultFontPixelWidth
function _mapCenter() {
var centerPoint = Qt.point(mapControl.centerViewport.left + (mapControl.centerViewport.width / 2), mapControl.centerViewport.top + (mapControl.centerViewport.height / 2))
return mapControl.toCoordinate(centerPoint, false /* clipToViewPort */)
}
QGCPalette { id: qgcPal; colorGroupEnabled: enabled }
Rectangle {
anchors.fill: parent
radius: _radius
color: "white"
opacity: 0.75
}
// Close Icon
QGCColoredImage {
anchors.margins: ScreenTools.defaultFontPixelWidth / 2
anchors.top: parent.top
anchors.right: parent.right
width: ScreenTools.defaultFontPixelHeight
height: width
sourceSize.height: width
source: "/res/XDelete.svg"
fillMode: Image.PreserveAspectFit
mipmap: true
smooth: true
color: "black"
QGCMouseArea {
fillItem: parent
onClicked: _root.visible = false
}
}
QGCLabel {
id: title
anchors.left: parent.left
anchors.right: parent.right
horizontalAlignment: Text.AlignHCenter
text: qsTr("Create Plan")
color: "black"
}
QGCFlickable {
id: flickable
anchors.margins: _margins
anchors.top: title.bottom
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: parent.right
contentHeight: creatorFlow.height
contentWidth: creatorFlow.width
Flow {
id: creatorFlow
width: flickable.width
spacing: _margins
Repeater {
model: _planMasterController.planCreators
Rectangle {
id: button
width: ScreenTools.defaultFontPixelHeight * 10
height: width
color: button.pressed || button.highlighted ? qgcPal.buttonHighlight : qgcPal.button
property bool highlighted: mouseArea.containsMouse
property bool pressed: mouseArea.pressed
Image {
anchors.margins: _margins
anchors.left: parent.left
anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter
source: object.imageResource
fillMode: Image.PreserveAspectFit
mipmap: true
}
QGCLabel {
anchors.margins: _margins
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: parent.right
horizontalAlignment: Text.AlignHCenter
text: object.name
color: button.pressed || button.highlighted ? qgcPal.buttonHighlightText : qgcPal.buttonText
}
QGCMouseArea {
id: mouseArea
anchors.fill: parent
hoverEnabled: true
preventStealing: true
onClicked: { object.createPlan(_mapCenter()); _root.visible = false }
}
}
}
}
}
}
src/PlanView/PlanView.qml
View file @ a1cf6a3b
...@@ -28,6 +28,7 @@ import QGroundControl.Airspace 1.0 ...@@ -28,6 +28,7 @@ import QGroundControl.Airspace 1.0
import QGroundControl.Airmap 1.0 import QGroundControl.Airmap 1.0
Item { Item {
id: _root
property bool planControlColapsed: false property bool planControlColapsed: false
...@@ -110,6 +111,12 @@ Item { ...@@ -110,6 +111,12 @@ Item {
} }
} }
onVisibleChanged: {
if (visible && !_planMasterController.containsItems) {
toolStrip.simulateClick(toolStrip.fileButtonIndex)
}
}
Connections { Connections {
target: _appSettings ? _appSettings.defaultMissionItemAltitude : null target: _appSettings ? _appSettings.defaultMissionItemAltitude : null
onRawValueChanged: { onRawValueChanged: {
...@@ -330,7 +337,7 @@ Item { ...@@ -330,7 +337,7 @@ Item {
if (retList[0] == ShapeFileHelper.Error) { if (retList[0] == ShapeFileHelper.Error) {
mainWindow.showMessageDialog("Error", retList[1]) mainWindow.showMessageDialog("Error", retList[1])
} else if (retList[0] == ShapeFileHelper.Polygon) { } else if (retList[0] == ShapeFileHelper.Polygon) {
var editVehicle = activeVehicle ? activeVehicle : QGroundControl.multiVehicleManager.offlineEditingVehicle var editVehicle = activeVehicle ? activeVehicle : QGroundControl.multiVehicleManager.offlineEditingVehicle
if (editVehicle.fixedWing) { if (editVehicle.fixedWing) {
insertComplexMissionItemFromKMLOrSHP(_missionController.surveyComplexItemName, file, -1) insertComplexMissionItemFromKMLOrSHP(_missionController.surveyComplexItemName, file, -1)
} else { } else {
...@@ -476,18 +483,6 @@ Item { ...@@ -476,18 +483,6 @@ Item {
} }
} }
PlanStartOverlay {
id: startOverlay
x: editorMap.centerViewport.left
y: editorMap.centerViewport.top
width: editorMap.centerViewport.width
height: editorMap.centerViewport.height
z: QGroundControl.zOrderMapItems + 2
visible: !_planMasterController.containsItems
planMasterController: _planMasterController
mapControl: editorMap
}
// Add the mission item visuals to the map // Add the mission item visuals to the map
Repeater { Repeater {
model: _editingLayer == _layerMission ? _missionController.visualItems : undefined model: _editingLayer == _layerMission ? _missionController.visualItems : undefined
...@@ -609,6 +604,8 @@ Item { ...@@ -609,6 +604,8 @@ Item {
z: QGroundControl.zOrderWidgets z: QGroundControl.zOrderWidgets
maxHeight: mapScale.y - toolStrip.y maxHeight: mapScale.y - toolStrip.y
property int fileButtonIndex: 1
property bool _isRally: _editingLayer == _layerRallyPoints property bool _isRally: _editingLayer == _layerRallyPoints
model: [ model: [
...@@ -939,19 +936,14 @@ Item { ...@@ -939,19 +936,14 @@ Item {
} }
} }
property var createPlanRemoveAllPromptDialogMapCenter
property var createPlanRemoveAllPromptDialogPlanCreator
Component { Component {
id: removeAllPromptDialog id: createPlanRemoveAllPromptDialog
QGCViewMessage { QGCViewMessage {
message: qsTr("Are you sure you want to remove all items and create a new plan? ") + message: qsTr("Are you sure you want to remove current plan and create a new plan? ")
(_planMasterController.offline ? "" : qsTr("This will also remove all items from the vehicle."))
function accept() { function accept() {
if (_planMasterController.offline) { createPlanRemoveAllPromptDialogPlanCreator.createPlan(createPlanRemoveAllPromptDialogMapCenter)
_planMasterController.removeAll()
} else {
_planMasterController.removeAllFromVehicle()
}
_missionController.setCurrentPlanViewIndex(0, true)
startOverlay.visible = true
hideDialog() hideDialog()
} }
} }
...@@ -964,7 +956,6 @@ Item { ...@@ -964,7 +956,6 @@ Item {
function accept() { function accept() {
_planMasterController.removeAllFromVehicle() _planMasterController.removeAllFromVehicle()
_missionController.setCurrentPlanViewIndex(0, true) _missionController.setCurrentPlanViewIndex(0, true)
startOverlay.visible = true
hideDialog() hideDialog()
} }
} }
...@@ -1027,42 +1018,115 @@ Item { ...@@ -1027,42 +1018,115 @@ Item {
Component { Component {
id: syncDropPanel id: syncDropPanel
Column { ColumnLayout {
id: columnHolder id: columnHolder
spacing: _margin spacing: _margin
property string _overwriteText: (_editingLayer == _layerMission) ? qsTr("Mission overwrite") : ((_editingLayer == _layerGeoFence) ? qsTr("GeoFence overwrite") : qsTr("Rally Points overwrite")) property string _overwriteText: (_editingLayer == _layerMission) ? qsTr("Mission overwrite") : ((_editingLayer == _layerGeoFence) ? qsTr("GeoFence overwrite") : qsTr("Rally Points overwrite"))
QGCLabel { QGCLabel {
width: sendSaveGrid.width id: unsavedChangedLabel
wrapMode: Text.WordWrap Layout.fillWidth: true
text: _planMasterController.dirty ? wrapMode: Text.WordWrap
(activeVehicle ? text: activeVehicle ?
qsTr("You have unsaved changes. You should upload to your vehicle, or save to a file:") : qsTr("You have unsaved changes. You should upload to your vehicle, or save to a file.") :
qsTr("You have unsaved changes.") qsTr("You have unsaved changes.")
) : visible: _planMasterController.dirty
qsTr("Plan File:") }
SectionHeader {
id: createSection
Layout.fillWidth: true
text: qsTr("Create Plan")
showSpacer: false
} }
GridLayout { GridLayout {
id: sendSaveGrid
columns: 2 columns: 2
anchors.margins: _margin columnSpacing: _margin
rowSpacing: _margin
Layout.fillWidth: true
visible: createSection.visible
Repeater {
model: _planMasterController.planCreators
Rectangle {
id: button
width: ScreenTools.defaultFontPixelHeight * 7
height: planCreatorNameLabel.y + planCreatorNameLabel.height
color: button.pressed || button.highlighted ? qgcPal.buttonHighlight : qgcPal.button
property bool highlighted: mouseArea.containsMouse
property bool pressed: mouseArea.pressed
Image {
id: planCreatorImage
anchors.left: parent.left
anchors.right: parent.right
source: object.imageResource
sourceSize.width: width
fillMode: Image.PreserveAspectFit
mipmap: true
}
QGCLabel {
id: planCreatorNameLabel
anchors.top: planCreatorImage.bottom
anchors.left: parent.left
anchors.right: parent.right
horizontalAlignment: Text.AlignHCenter
text: object.name
color: button.pressed || button.highlighted ? qgcPal.buttonHighlightText : qgcPal.buttonText
}
QGCMouseArea {
id: mouseArea
anchors.fill: parent
hoverEnabled: true
preventStealing: true
onClicked: {
if (_planMasterController.containsItems) {
createPlanRemoveAllPromptDialogMapCenter = _mapCenter()
createPlanRemoveAllPromptDialogPlanCreator = object
mainWindow.showComponentDialog(createPlanRemoveAllPromptDialog, qsTr("Create Plan"), mainWindow.showDialogDefaultWidth, StandardButton.Yes | StandardButton.No)
} else {
object.createPlan(_mapCenter())
}
dropPanel.hide()
}
function _mapCenter() {
var centerPoint = Qt.point(editorMap.centerViewport.left + (editorMap.centerViewport.width / 2), editorMap.centerViewport.top + (editorMap.centerViewport.height / 2))
return editorMap.toCoordinate(centerPoint, false /* clipToViewPort */)
}
}
}
}
}
SectionHeader {
id: storageSection
Layout.fillWidth: true
text: qsTr("Storage")
}
GridLayout {
columns: 3
rowSpacing: _margin rowSpacing: _margin
columnSpacing: ScreenTools.defaultFontPixelWidth columnSpacing: ScreenTools.defaultFontPixelWidth
visible: storageSection.visible
QGCButton { /*QGCButton {
text: qsTr("New...") text: qsTr("New...")
Layout.fillWidth: true Layout.fillWidth: true
onClicked: { onClicked: {
dropPanel.hide() dropPanel.hide()
if (_planMasterController.containsItems) { if (_planMasterController.containsItems) {
mainWindow.showComponentDialog(removeAllPromptDialog, qsTr("New Plan"), mainWindow.showDialogDefaultWidth, StandardButton.Yes | StandardButton.No) mainWindow.showComponentDialog(removeAllPromptDialog, qsTr("New Plan"), mainWindow.showDialogDefaultWidth, StandardButton.Yes | StandardButton.No)
} else {
startOverlay.visible = true
} }
} }
} }*/
QGCButton { QGCButton {
text: qsTr("Open...") text: qsTr("Open...")
...@@ -1103,8 +1167,9 @@ Item { ...@@ -1103,8 +1167,9 @@ Item {
} }
QGCButton { QGCButton {
Layout.columnSpan: 3
Layout.fillWidth: true
text: qsTr("Save Mission Waypoints As KML...") text: qsTr("Save Mission Waypoints As KML...")
Layout.columnSpan: 2
enabled: !_planMasterController.syncInProgress && _visualItems.count > 1 enabled: !_planMasterController.syncInProgress && _visualItems.count > 1
onClicked: { onClicked: {
// First point does not count // First point does not count
...@@ -1116,16 +1181,18 @@ Item { ...@@ -1116,16 +1181,18 @@ Item {
_planMasterController.saveKmlToSelectedFile() _planMasterController.saveKmlToSelectedFile()
} }
} }
}
Rectangle { SectionHeader {
width: parent.width * 0.8 id: vehicleSection
height: 1 Layout.fillWidth: true
color: qgcPal.text text: qsTr("Vehicle")
opacity: 0.5 }
visible: !QGroundControl.corePlugin.options.disableVehicleConnection
Layout.fillWidth: true RowLayout {
Layout.columnSpan: 2 Layout.fillWidth: true
} spacing: _margin
visible: vehicleSection.visible
QGCButton { QGCButton {
text: qsTr("Upload") text: qsTr("Upload")
...@@ -1154,7 +1221,7 @@ Item { ...@@ -1154,7 +1221,7 @@ Item {
} }
QGCButton { QGCButton {
text: qsTr("Clear Vehicle Mission") text: qsTr("Clear")
Layout.fillWidth: true Layout.fillWidth: true
Layout.columnSpan: 2 Layout.columnSpan: 2
enabled: !_planMasterController.offline && !_planMasterController.syncInProgress enabled: !_planMasterController.offline && !_planMasterController.syncInProgress
...@@ -1164,8 +1231,9 @@ Item { ...@@ -1164,8 +1231,9 @@ Item {
mainWindow.showComponentDialog(clearVehicleMissionDialog, text, mainWindow.showDialogDefaultWidth, StandardButton.Yes | StandardButton.Cancel) mainWindow.showComponentDialog(clearVehicleMissionDialog, text, mainWindow.showDialogDefaultWidth, StandardButton.Yes | StandardButton.Cancel)
} }
} }
} }
} }
} }
} }
src/PlanView/StructureScanEditor.qml
View file @ a1cf6a3b
...@@ -130,8 +130,10 @@ Rectangle { ...@@ -130,8 +130,10 @@ Rectangle {
} }
SectionHeader { SectionHeader {
id: scanHeader id: scanHeader
text: qsTr("Scan") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Scan")
} }
Column { Column {
...@@ -200,8 +202,10 @@ Rectangle { ...@@ -200,8 +202,10 @@ Rectangle {
} // Column - Scan } // Column - Scan
SectionHeader { SectionHeader {
id: statsHeader id: statsHeader
text: qsTr("Statistics") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Statistics")
} }
Grid { Grid {
......
src/PlanView/SurveyItemEditor.qml
View file @ a1cf6a3b
...@@ -124,8 +124,10 @@ Rectangle { ...@@ -124,8 +124,10 @@ Rectangle {
} }
SectionHeader { SectionHeader {
id: transectsHeader id: transectsHeader
text: qsTr("Transects") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Transects")
} }
GridLayout { GridLayout {
...@@ -233,9 +235,11 @@ Rectangle { ...@@ -233,9 +235,11 @@ Rectangle {
} }
SectionHeader { SectionHeader {
id: terrainHeader id: terrainHeader
text: qsTr("Terrain") anchors.left: parent.left
checked: missionItem.followTerrain anchors.right: parent.right
text: qsTr("Terrain")
checked: missionItem.followTerrain
} }
ColumnLayout { ColumnLayout {
...@@ -280,8 +284,10 @@ Rectangle { ...@@ -280,8 +284,10 @@ Rectangle {
} }
SectionHeader { SectionHeader {
id: statsHeader id: statsHeader
text: qsTr("Statistics") anchors.left: parent.left
anchors.right: parent.right
text: qsTr("Statistics")
} }
TransectStyleComplexItemStats { TransectStyleComplexItemStats {
...@@ -357,8 +363,6 @@ Rectangle { ...@@ -357,8 +363,6 @@ Rectangle {
SectionHeader { SectionHeader {
id: presectsTransectsHeader id: presectsTransectsHeader
anchors.left: undefined
anchors.right: undefined
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Transects") text: qsTr("Transects")
} }
...@@ -400,11 +404,9 @@ Rectangle { ...@@ -400,11 +404,9 @@ Rectangle {
} }
SectionHeader { SectionHeader {
id: presetsStatsHeader id: presetsStatsHeader
anchors.left: undefined
anchors.right: undefined
Layout.fillWidth: true Layout.fillWidth: true
text: qsTr("Statistics") text: qsTr("Statistics")
} }
TransectStyleComplexItemStats { TransectStyleComplexItemStats {
......
src/QmlControls/ParameterEditor.qml
View file @ a1cf6a3b
...@@ -174,6 +174,8 @@ Item { ...@@ -174,6 +174,8 @@ Item {
SectionHeader { SectionHeader {
id: categoryHeader id: categoryHeader
anchors.left: parent.left
anchors.right: parent.right
text: category text: category
checked: controller.currentCategory === text checked: controller.currentCategory === text
exclusiveGroup: sectionGroup exclusiveGroup: sectionGroup
......
src/QmlControls/PreFlightCheckGroup.qml
View file @ a1cf6a3b
...@@ -43,8 +43,10 @@ Column { ...@@ -43,8 +43,10 @@ Column {
} }
SectionHeader { SectionHeader {
id: header id: header
text: name + (passed ? qsTr(" (passed)") : "") anchors.left: parent.left
anchors.right: parent.right
text: name + (passed ? qsTr(" (passed)") : "")
} }
Column { Column {
......
src/QmlControls/QGroundControl/Controls/qmldir
View file @ a1cf6a3b
...@@ -40,7 +40,6 @@ ParameterEditor 1.0 ParameterEditor.qml ...@@ -40,7 +40,6 @@ ParameterEditor 1.0 ParameterEditor.qml
ParameterEditorDialog 1.0 ParameterEditorDialog.qml ParameterEditorDialog 1.0 ParameterEditorDialog.qml
PIDTuning 1.0 PIDTuning.qml PIDTuning 1.0 PIDTuning.qml
PlanEditToolbar 1.0 PlanEditToolbar.qml PlanEditToolbar 1.0 PlanEditToolbar.qml
PlanStartOverlay 1.0 PlanStartOverlay.qml
PreFlightCheckButton 1.0 PreFlightCheckButton.qml PreFlightCheckButton 1.0 PreFlightCheckButton.qml
PreFlightCheckGroup 1.0 PreFlightCheckGroup.qml PreFlightCheckGroup 1.0 PreFlightCheckGroup.qml
PreFlightCheckModel 1.0 PreFlightCheckModel.qml PreFlightCheckModel 1.0 PreFlightCheckModel.qml
......
src/QmlControls/SectionHeader.qml
View file @ a1cf6a3b
...@@ -7,10 +7,8 @@ import QGroundControl.ScreenTools 1.0 ...@@ -7,10 +7,8 @@ import QGroundControl.ScreenTools 1.0
import QGroundControl.Palette 1.0 import QGroundControl.Palette 1.0
FocusScope { FocusScope {
id: _root id: _root
anchors.left: parent.left height: column.height
anchors.right: parent.right
height: column.height
property alias text: label.text property alias text: label.text
property bool checked: true property bool checked: true
......
src/QmlControls/ToolStrip.qml
View file @ a1cf6a3b
...@@ -27,6 +27,11 @@ Rectangle { ...@@ -27,6 +27,11 @@ Rectangle {
property AbstractButton lastClickedButton: null property AbstractButton lastClickedButton: null
function simulateClick(buttonIndex) {
toolStripColumn.children[buttonIndex].checked = true
toolStripColumn.children[buttonIndex].clicked()
}
// Ensure we don't get narrower than content // Ensure we don't get narrower than content
property real _idealWidth: (ScreenTools.isMobile ? ScreenTools.minTouchPixels : ScreenTools.defaultFontPixelWidth * 8) + toolStripColumn.anchors.margins * 2 property real _idealWidth: (ScreenTools.isMobile ? ScreenTools.minTouchPixels : ScreenTools.defaultFontPixelWidth * 8) + toolStripColumn.anchors.margins * 2
...@@ -73,7 +78,7 @@ Rectangle { ...@@ -73,7 +78,7 @@ Rectangle {
checked: modelData.checked !== undefined ? modelData.checked : checked checked: modelData.checked !== undefined ? modelData.checked : checked
ButtonGroup.group: buttonGroup ButtonGroup.group: buttonGroup
// Only drop pannel and toggleable are checkable // Only drop panel and toggleable are checkable
checkable: modelData.dropPanelComponent !== undefined || (modelData.toggle !== undefined && modelData.toggle) checkable: modelData.dropPanelComponent !== undefined || (modelData.toggle !== undefined && modelData.toggle)
onClicked: { onClicked: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment