zhaohuwei
/
QG4
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge pull request #8034 from DonLakeFlyer/PlanCreator 

Plan creator: Fix insertion of takeoff item
QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
9204a9f594 24a2bb697b
commit
79fe25ef26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 7 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/MissionManager/CorridorScanPlanCreator.cc
  2. 2
      src/MissionManager/StructureScanPlanCreator.cc
  3. 2
      src/MissionManager/SurveyPlanCreator.cc
  4. 7
      src/PlanView/MissionItemEditor.qml
  5. 1
      src/PlanView/PlanView.qml

2
src/MissionManager/CorridorScanPlanCreator.cc
Unescape View File

@ -21,7 +21,7 @@ CorridorScanPlanCreator::CorridorScanPlanCreator(PlanMasterController* planMaste
void CorridorScanPlanCreator::createPlan(const QGeoCoordinate& mapCenterCoord) void CorridorScanPlanCreator::createPlan(const QGeoCoordinate& mapCenterCoord)
{ {
_planMasterController->removeAll(); _planMasterController->removeAll();
VisualMissionItem* takeoffItem = _missionController->insertSimpleMissionItem(mapCenterCoord, -1); VisualMissionItem* takeoffItem = _missionController->insertTakeoffItem(mapCenterCoord, -1);
takeoffItem->setWizardMode(true); takeoffItem->setWizardMode(true);
_missionController->insertComplexMissionItem(MissionController::patternCorridorScanName, mapCenterCoord, -1)->setWizardMode(true); _missionController->insertComplexMissionItem(MissionController::patternCorridorScanName, mapCenterCoord, -1)->setWizardMode(true);
if (_planMasterController->managerVehicle()->fixedWing()) { if (_planMasterController->managerVehicle()->fixedWing()) {

2
src/MissionManager/StructureScanPlanCreator.cc
Unescape View File

@ -21,7 +21,7 @@ StructureScanPlanCreator::StructureScanPlanCreator(PlanMasterController* planMas
void StructureScanPlanCreator::createPlan(const QGeoCoordinate& mapCenterCoord) void StructureScanPlanCreator::createPlan(const QGeoCoordinate& mapCenterCoord)
{ {
_planMasterController->removeAll(); _planMasterController->removeAll();
VisualMissionItem* takeoffItem = _missionController->insertSimpleMissionItem(mapCenterCoord, -1); VisualMissionItem* takeoffItem = _missionController->insertTakeoffItem(mapCenterCoord, -1);
takeoffItem->setWizardMode(true); takeoffItem->setWizardMode(true);
_missionController->insertComplexMissionItem(MissionController::patternStructureScanName, mapCenterCoord, -1)->setWizardMode(true); _missionController->insertComplexMissionItem(MissionController::patternStructureScanName, mapCenterCoord, -1)->setWizardMode(true);
if (_planMasterController->managerVehicle()->fixedWing()) { if (_planMasterController->managerVehicle()->fixedWing()) {

2
src/MissionManager/SurveyPlanCreator.cc
Unescape View File

@ -22,7 +22,7 @@ SurveyPlanCreator::SurveyPlanCreator(PlanMasterController* planMasterController,
void SurveyPlanCreator::createPlan(const QGeoCoordinate& mapCenterCoord) void SurveyPlanCreator::createPlan(const QGeoCoordinate& mapCenterCoord)
{ {
_planMasterController->removeAll(); _planMasterController->removeAll();
VisualMissionItem* takeoffItem = _missionController->insertSimpleMissionItem(mapCenterCoord, -1); VisualMissionItem* takeoffItem = _missionController->insertTakeoffItem(mapCenterCoord, -1);
takeoffItem->setWizardMode(true); takeoffItem->setWizardMode(true);
_missionController->insertComplexMissionItem(MissionController::patternSurveyName, mapCenterCoord, -1)->setWizardMode(true); _missionController->insertComplexMissionItem(MissionController::patternSurveyName, mapCenterCoord, -1)->setWizardMode(true);
if (_planMasterController->managerVehicle()->fixedWing()) { if (_planMasterController->managerVehicle()->fixedWing()) {

7
src/PlanView/MissionItemEditor.qml
Unescape View File

@ -221,14 +221,13 @@ Rectangle {
QGCLabel { text: missionItem.commandName } QGCLabel { text: missionItem.commandName }
QGCColoredImage { QGCColoredImage {
height: ScreenTools.implicitComboBoxHeight - (ScreenTools.comboBoxPadding * 2) height: ScreenTools.defaultFontPixelWidth
width: height width: height
sourceSize.height: height
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
smooth: true smooth: true
antialiasing: true antialiasing: true
color: qgcPal.text 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 id: commandLabel
anchors.leftMargin: ScreenTools.comboBoxPadding anchors.leftMargin: ScreenTools.comboBoxPadding
anchors.fill: commandPicker anchors.fill: commandPicker
visible: (!missionItem.isCurrentItem || !missionItem.isSimpleItem || _waypointsOnlyMode) && !missionItem.isTakeoffItem visible: !missionItem.isCurrentItem || !missionItem.isSimpleItem || _waypointsOnlyMode || missionItem.isTakeoffItem
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
text: missionItem.commandName text: missionItem.commandName
color: _outerTextColor color: _outerTextColor

1
src/PlanView/PlanView.qml
Unescape View File

@ -533,6 +533,7 @@ Item {
anchorPoint.x: sourceItem.width / 2 anchorPoint.x: sourceItem.width / 2
anchorPoint.y: sourceItem.height / 2 anchorPoint.y: sourceItem.height / 2
z: QGroundControl.zOrderWaypointLines + 1 z: QGroundControl.zOrderWaypointLines + 1
visible: _editingLayer == _layerMission
sourceItem: SplitIndicator { sourceItem: SplitIndicator {
onClicked: insertSimpleMissionItem(splitSegmentItem.coordinate, _missionController.visualItemIndexFromSequenceNumber(_missionController.currentPlanViewIndex)) onClicked: insertSimpleMissionItem(splitSegmentItem.coordinate, _missionController.visualItemIndexFromSequenceNumber(_missionController.currentPlanViewIndex))

Write Preview
Loading…
Cancel
Save