diff --git a/src/MissionManager/Survey.SettingsGroup.json b/src/MissionManager/Survey.SettingsGroup.json index aaf1e28ba8e69409e60dc1efab4eca4cba0670ae..d29f9231fd65f435005ab8003903fab559669f67 100644 --- a/src/MissionManager/Survey.SettingsGroup.json +++ b/src/MissionManager/Survey.SettingsGroup.json @@ -160,7 +160,7 @@ "name": "GridEntryLocation", "shortDescription": "Location for entry point into survey area", "type": "uint32", - "enumStrings": "Top Left, Top Right, Bottom Left, Bottom Right", + "enumStrings": "Position 1, Position 2, Position 3, Position 4", "enumValues": "0,1,2,3", "defaultValue": 0 } diff --git a/src/MissionManager/SurveyMissionItem.h b/src/MissionManager/SurveyMissionItem.h index 2b486d7a9b297fb4d30106eddcbfdbba7148d651..aa1d73dac30adb724dc66a0e7d8e346bd49a1497 100644 --- a/src/MissionManager/SurveyMissionItem.h +++ b/src/MissionManager/SurveyMissionItem.h @@ -129,6 +129,14 @@ public: void setTurnaroundDist (double dist) { _turnaroundDistFact.setRawValue(dist); } void save (QJsonArray& missionItems) final; + // Must match json spec for GridEntryLocation + enum EntryLocation { + EntryLocationTopLeft, + EntryLocationTopRight, + EntryLocationBottomLeft, + EntryLocationBottomRight, + }; + static const char* jsonComplexItemTypeValue; static const char* settingsGroup; @@ -178,14 +186,6 @@ private: CameraTriggerHoverAndCapture }; - // Must match json spec for GridEntryLocation - enum EntryLocation { - EntryLocationTopLeft, - EntryLocationTopRight, - EntryLocationBottomLeft, - EntryLocationBottomRight, - }; - void _setExitCoordinate(const QGeoCoordinate& coordinate); void _generateGrid(void); void _updateCoordinateAltitude(void);