From b35ac51556327f3ea77b68fd65cf1bc21143ff27 Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Wed, 13 Nov 2019 18:43:26 -0800 Subject: [PATCH 1/2] Only show split indicator on mission layer --- src/PlanView/PlanView.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/PlanView/PlanView.qml b/src/PlanView/PlanView.qml index 71aa7b0..5d9e591 100644 --- a/src/PlanView/PlanView.qml +++ b/src/PlanView/PlanView.qml @@ -533,6 +533,7 @@ Item { anchorPoint.x: sourceItem.width / 2 anchorPoint.y: sourceItem.height / 2 z: QGroundControl.zOrderWaypointLines + 1 + visible: _editingLayer == _layerMission sourceItem: SplitIndicator { onClicked: insertSimpleMissionItem(splitSegmentItem.coordinate, _missionController.visualItemIndexFromSequenceNumber(_missionController.currentPlanViewIndex)) From 24a2bb697bd9d784f6214327cecea61c43157f5d Mon Sep 17 00:00:00 2001 From: DonLakeFlyer Date: Wed, 13 Nov 2019 18:44:23 -0800 Subject: [PATCH 2/2] Fix takeoff item insertion in plan creators --- src/MissionManager/CorridorScanPlanCreator.cc | 2 +- src/MissionManager/StructureScanPlanCreator.cc | 2 +- src/MissionManager/SurveyPlanCreator.cc | 2 +- src/PlanView/MissionItemEditor.qml | 7 +++---- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/MissionManager/CorridorScanPlanCreator.cc b/src/MissionManager/CorridorScanPlanCreator.cc index c52ba07..4ca876a 100644 --- a/src/MissionManager/CorridorScanPlanCreator.cc +++ b/src/MissionManager/CorridorScanPlanCreator.cc @@ -21,7 +21,7 @@ CorridorScanPlanCreator::CorridorScanPlanCreator(PlanMasterController* planMaste void CorridorScanPlanCreator::createPlan(const QGeoCoordinate& mapCenterCoord) { _planMasterController->removeAll(); - VisualMissionItem* takeoffItem = _missionController->insertSimpleMissionItem(mapCenterCoord, -1); + VisualMissionItem* takeoffItem = _missionController->insertTakeoffItem(mapCenterCoord, -1); takeoffItem->setWizardMode(true); _missionController->insertComplexMissionItem(MissionController::patternCorridorScanName, mapCenterCoord, -1)->setWizardMode(true); if (_planMasterController->managerVehicle()->fixedWing()) { diff --git a/src/MissionManager/StructureScanPlanCreator.cc b/src/MissionManager/StructureScanPlanCreator.cc index 5f1b09e..566de61 100644 --- a/src/MissionManager/StructureScanPlanCreator.cc +++ b/src/MissionManager/StructureScanPlanCreator.cc @@ -21,7 +21,7 @@ StructureScanPlanCreator::StructureScanPlanCreator(PlanMasterController* planMas void StructureScanPlanCreator::createPlan(const QGeoCoordinate& mapCenterCoord) { _planMasterController->removeAll(); - VisualMissionItem* takeoffItem = _missionController->insertSimpleMissionItem(mapCenterCoord, -1); + VisualMissionItem* takeoffItem = _missionController->insertTakeoffItem(mapCenterCoord, -1); takeoffItem->setWizardMode(true); _missionController->insertComplexMissionItem(MissionController::patternStructureScanName, mapCenterCoord, -1)->setWizardMode(true); if (_planMasterController->managerVehicle()->fixedWing()) { diff --git a/src/MissionManager/SurveyPlanCreator.cc b/src/MissionManager/SurveyPlanCreator.cc index e2715ae..872fc75 100644 --- a/src/MissionManager/SurveyPlanCreator.cc +++ b/src/MissionManager/SurveyPlanCreator.cc @@ -22,7 +22,7 @@ SurveyPlanCreator::SurveyPlanCreator(PlanMasterController* planMasterController, void SurveyPlanCreator::createPlan(const QGeoCoordinate& mapCenterCoord) { _planMasterController->removeAll(); - VisualMissionItem* takeoffItem = _missionController->insertSimpleMissionItem(mapCenterCoord, -1); + VisualMissionItem* takeoffItem = _missionController->insertTakeoffItem(mapCenterCoord, -1); takeoffItem->setWizardMode(true); _missionController->insertComplexMissionItem(MissionController::patternSurveyName, mapCenterCoord, -1)->setWizardMode(true); if (_planMasterController->managerVehicle()->fixedWing()) { diff --git a/src/PlanView/MissionItemEditor.qml b/src/PlanView/MissionItemEditor.qml index 3c43cde..ac8f834 100644 --- a/src/PlanView/MissionItemEditor.qml +++ b/src/PlanView/MissionItemEditor.qml @@ -221,14 +221,13 @@ Rectangle { QGCLabel { text: missionItem.commandName } QGCColoredImage { - height: ScreenTools.implicitComboBoxHeight - (ScreenTools.comboBoxPadding * 2) + height: ScreenTools.defaultFontPixelWidth width: height - sourceSize.height: height fillMode: Image.PreserveAspectFit smooth: true antialiasing: true color: qgcPal.text - source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/images/double-arrow.png" + source: "/qmlimages/arrow-down.png" } } @@ -252,7 +251,7 @@ Rectangle { id: commandLabel anchors.leftMargin: ScreenTools.comboBoxPadding anchors.fill: commandPicker - visible: (!missionItem.isCurrentItem || !missionItem.isSimpleItem || _waypointsOnlyMode) && !missionItem.isTakeoffItem + visible: !missionItem.isCurrentItem || !missionItem.isSimpleItem || _waypointsOnlyMode || missionItem.isTakeoffItem verticalAlignment: Text.AlignVCenter text: missionItem.commandName color: _outerTextColor