Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
905b33f9
Commit
905b33f9
authored
Jun 05, 2017
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use generic naming for entry locations
parent
299a27e3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
Survey.SettingsGroup.json
src/MissionManager/Survey.SettingsGroup.json
+1
-1
SurveyMissionItem.h
src/MissionManager/SurveyMissionItem.h
+8
-8
No files found.
src/MissionManager/Survey.SettingsGroup.json
View file @
905b33f9
...
...
@@ -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
}
...
...
src/MissionManager/SurveyMissionItem.h
View file @
905b33f9
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment