Browse Source

Use generic naming for entry locations

QGC4.4
Don Gagne 8 years ago
parent
commit
905b33f994
  1. 2
      src/MissionManager/Survey.SettingsGroup.json
  2. 16
      src/MissionManager/SurveyMissionItem.h

2
src/MissionManager/Survey.SettingsGroup.json

@ -160,7 +160,7 @@
"name": "GridEntryLocation", "name": "GridEntryLocation",
"shortDescription": "Location for entry point into survey area", "shortDescription": "Location for entry point into survey area",
"type": "uint32", "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", "enumValues": "0,1,2,3",
"defaultValue": 0 "defaultValue": 0
} }

16
src/MissionManager/SurveyMissionItem.h

@ -129,6 +129,14 @@ public:
void setTurnaroundDist (double dist) { _turnaroundDistFact.setRawValue(dist); } void setTurnaroundDist (double dist) { _turnaroundDistFact.setRawValue(dist); }
void save (QJsonArray& missionItems) final; void save (QJsonArray& missionItems) final;
// Must match json spec for GridEntryLocation
enum EntryLocation {
EntryLocationTopLeft,
EntryLocationTopRight,
EntryLocationBottomLeft,
EntryLocationBottomRight,
};
static const char* jsonComplexItemTypeValue; static const char* jsonComplexItemTypeValue;
static const char* settingsGroup; static const char* settingsGroup;
@ -178,14 +186,6 @@ private:
CameraTriggerHoverAndCapture CameraTriggerHoverAndCapture
}; };
// Must match json spec for GridEntryLocation
enum EntryLocation {
EntryLocationTopLeft,
EntryLocationTopRight,
EntryLocationBottomLeft,
EntryLocationBottomRight,
};
void _setExitCoordinate(const QGeoCoordinate& coordinate); void _setExitCoordinate(const QGeoCoordinate& coordinate);
void _generateGrid(void); void _generateGrid(void);
void _updateCoordinateAltitude(void); void _updateCoordinateAltitude(void);

Loading…
Cancel
Save