From cb69cc82544698c57b217d5c5d3d67c5cf541e72 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 3 Jun 2017 21:09:39 -0700 Subject: [PATCH 1/5] Remove mission dialog shows image count --- src/FlightDisplay/FlightDisplayView.qml | 35 ++++++++++++++++++++++++++------- 1 file changed, 28 insertions(+), 7 deletions(-) diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index b0cbf5f..f740e10 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/src/FlightDisplay/FlightDisplayView.qml @@ -148,7 +148,7 @@ QGCView { } } else { if (promptForMissionRemove && (_missionController.containsItems || _geoFenceController.containsItems || _rallyPointController.containsItems)) { - root.showDialog(removeMissionDialogComponent, qsTr("Flight complete"), showDialogDefaultWidth, StandardButton.No | StandardButton.Yes) + root.showDialog(missionCompleteDialogComponent, qsTr("Flight Plan complete"), showDialogDefaultWidth, StandardButton.Close) } promptForMissionRemove = false } @@ -161,14 +161,35 @@ QGCView { } Component { - id: removeMissionDialogComponent + id: missionCompleteDialogComponent - QGCViewMessage { - message: qsTr("Do you want to remove the mission from the vehicle?") + QGCViewDialog { + QGCFlickable { + anchors.fill: parent + contentHeight: column.height + + Column { + id: column + anchors.margins: _margins + anchors.left: parent.left + anchors.right: parent.right + spacing: ScreenTools.defaultFontPixelHeight + + QGCLabel { + text: qsTr("%1 Images Taken").arg(_activeVehicle.cameraTriggerPoints.count) + anchors.horizontalCenter: parent.horizontalCenter + visible: _activeVehicle.cameraTriggerPoints.count != 0 + } - function accept() { - _planMasterController.removeAllFromVehicle() - hideDialog() + QGCButton { + text: qsTr("Remove plan from vehicle") + anchors.horizontalCenter: parent.horizontalCenter + onClicked: { + _planMasterController.removeAllFromVehicle() + hideDialog() + } + } + } } } } From 25f078983a49159f251466e9c7457065d74ce1a5 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 3 Jun 2017 21:09:52 -0700 Subject: [PATCH 2/5] Tweak signaling to pop Start Mission on new mission upload --- src/MissionManager/MissionController.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/MissionManager/MissionController.cc b/src/MissionManager/MissionController.cc index 0b3a40b..14d99fb 100644 --- a/src/MissionManager/MissionController.cc +++ b/src/MissionManager/MissionController.cc @@ -170,6 +170,8 @@ void MissionController::_newMissionItemsAvailableFromVehicle(bool removeAllReque _deinitAllVisualItems(); _visualItems->deleteLater(); _settingsItem = NULL; + _visualItems = NULL; + _updateContainsItems(); // This will clear containsItems which will be set again below. This will re-pop Start Mission confirmation. _visualItems = newControllerMissionItems; if (!_controllerVehicle->firmwarePlugin()->sendHomePositionToVehicle() || _visualItems->count() == 0) { @@ -181,6 +183,7 @@ void MissionController::_newMissionItemsAvailableFromVehicle(bool removeAllReque } _initAllVisualItems(); + _updateContainsItems(); emit newItemsFromVehicle(); } _itemsRequested = false; From ba3889acac71ad216fd4a76abc429b9b94bd24ed Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 3 Jun 2017 21:10:09 -0700 Subject: [PATCH 3/5] Fix IMAGE_START_CAPTURE usage for hover and capture --- src/MissionManager/SurveyMissionItem.cc | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/MissionManager/SurveyMissionItem.cc b/src/MissionManager/SurveyMissionItem.cc index 8c2555b..5d312e2 100644 --- a/src/MissionManager/SurveyMissionItem.cc +++ b/src/MissionManager/SurveyMissionItem.cc @@ -949,16 +949,18 @@ int SurveyMissionItem::_appendWaypointToMission(QList& items, int item = new MissionItem(seqNum++, MAV_CMD_IMAGE_START_CAPTURE, MAV_FRAME_MISSION, - 0, // Interval - 1, // Take 1 photo - -1, // Mav resolution - 0, 0, // Param 4-5 unused - 0, // Camera ID - 7, // Param 7 unused - true, // autoContinue - false, // isCurrentItem + 0, // Camera ID, all cameras + 0, // Interval (none) + 1, // Take 1 photo + -1, // Max horizontal resolution + -1, // Max vertical resolution + 0, 0, // param 6-7 not used + true, // autoContinue + false, // isCurrentItem missionItemParent); items.append(item); +#if 0 + // This generates too many commands. Pulling out for now, to see if image quality is still high enough. item = new MissionItem(seqNum++, MAV_CMD_NAV_DELAY, MAV_FRAME_MISSION, @@ -969,6 +971,7 @@ int SurveyMissionItem::_appendWaypointToMission(QList& items, int false, // isCurrentItem missionItemParent); items.append(item); +#endif default: break; } From d778534534d8e19f06769ec5f45f7b36f373e4a3 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 3 Jun 2017 21:10:22 -0700 Subject: [PATCH 4/5] Switch to primary coloring when upload required --- src/PlanView/PlanToolBar.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/PlanView/PlanToolBar.qml b/src/PlanView/PlanToolBar.qml index a956724..5cba454 100644 --- a/src/PlanView/PlanToolBar.qml +++ b/src/PlanView/PlanToolBar.qml @@ -281,6 +281,7 @@ Rectangle { text: _controllerDirty ? qsTr("Upload Required") : qsTr("Upload") enabled: !_controllerSyncInProgress visible: !_controllerOffline + primary: _controllerDirty onClicked: planMasterController.upload() PropertyAnimation on opacity { From 452d88a7682f6378c6f828bd680b81940e009bb2 Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Sat, 3 Jun 2017 21:10:39 -0700 Subject: [PATCH 5/5] Change naming of overlap values --- src/PlanView/SurveyItemEditor.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/PlanView/SurveyItemEditor.qml b/src/PlanView/SurveyItemEditor.qml index 7c914a2..9cc9052 100644 --- a/src/PlanView/SurveyItemEditor.qml +++ b/src/PlanView/SurveyItemEditor.qml @@ -364,11 +364,11 @@ Rectangle { Item { Layout.fillWidth: true } QGCLabel { Layout.preferredWidth: _root._fieldWidth - text: qsTr("Frontal") + text: qsTr("Front Lap") } QGCLabel { Layout.preferredWidth: _root._fieldWidth - text: qsTr("Side") + text: qsTr("Side Lap") } }