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
e8e93b4f
Commit
e8e93b4f
authored
Mar 08, 2017
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
All survey Facts are now SettingsFacts
parent
54586b12
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
322 additions
and
221 deletions
+322
-221
qgroundcontrol.qrc
qgroundcontrol.qrc
+1
-1
SurveyItemEditor.qml
src/MissionEditor/SurveyItemEditor.qml
+39
-74
Survey.SettingsGroup.json
src/MissionManager/Survey.SettingsGroup.json
+151
-0
SurveyMissionItem.cc
src/MissionManager/SurveyMissionItem.cc
+65
-86
SurveyMissionItem.h
src/MissionManager/SurveyMissionItem.h
+66
-60
No files found.
qgroundcontrol.qrc
View file @
e8e93b4f
...
...
@@ -189,11 +189,11 @@
<file alias="Vehicle/VibrationFact.json">src/Vehicle/VibrationFact.json</file>
<file alias="App.SettingsGroup.json">src/Settings/App.SettingsGroup.json</file>
<file alias="AutoConnect.SettingsGroup.json">src/Settings/AutoConnect.SettingsGroup.json</file>
<file alias="Survey.SettingsGroup.json">src/MissionManager/Survey.SettingsGroup.json</file>
<file alias="Units.SettingsGroup.json">src/Settings/Units.SettingsGroup.json</file>
<file alias="Video.SettingsGroup.json">src/Settings/Video.SettingsGroup.json</file>
<file alias="RallyPoint.FactMetaData.json">src/MissionManager/RallyPoint.FactMetaData.json</file>
<file alias="FWLandingPattern.FactMetaData.json">src/MissionManager/FWLandingPattern.FactMetaData.json</file>
<file alias="Survey.FactMetaData.json">src/MissionManager/Survey.FactMetaData.json</file>
<file alias="USBBoardInfo.json">src/comm/USBBoardInfo.json</file>
<file alias="Vehicle/TemperatureFact.json">src/Vehicle/TemperatureFact.json</file>
</qresource>
...
...
src/MissionEditor/SurveyItemEditor.qml
View file @
e8e93b4f
This diff is collapsed.
Click to expand it.
src/MissionManager/Survey.
FactMetaData
.json
→
src/MissionManager/Survey.
SettingsGroup
.json
View file @
e8e93b4f
[
{
"name"
:
"Altitude"
,
"name"
:
"ManualGrid"
,
"shortDescription"
:
"Specify all parameters for grid generation."
,
"type"
:
"bool"
,
"defaultValue"
:
1
},
{
"name"
:
"GridAltitude"
,
"shortDescription"
:
"Altitude for all waypoints within the grid."
,
"type"
:
"double"
,
"units"
:
"m"
,
"decimalPlaces"
:
1
"decimalPlaces"
:
1
,
"defaultValue"
:
50
},
{
"name"
:
"GridAltitudeRelative"
,
"shortDescription"
:
"Altitude for all waypoints within the grid is relative to home."
,
"type"
:
"bool"
,
"defaultValue"
:
1
},
{
"name"
:
"Grid
a
ngle"
,
"name"
:
"Grid
A
ngle"
,
"shortDescription"
:
"Angle for parallel lines of grid."
,
"type"
:
"double"
,
"units"
:
"deg"
,
"decimalPlaces"
:
1
"decimalPlaces"
:
1
,
"defaultValue"
:
0
},
{
"name"
:
"Grid
s
pacing"
,
"name"
:
"Grid
S
pacing"
,
"shortDescription"
:
"Amount of spacing in between parallel grid lines."
,
"type"
:
"double"
,
"decimalPlaces"
:
2
,
"min"
:
0.1
,
"units"
:
"m"
"units"
:
"m"
,
"defaultValue"
:
30
},
{
"name"
:
"Turnaround
d
ist"
,
"name"
:
"Turnaround
D
ist"
,
"shortDescription"
:
"Amount of additional distance to add outside the grid area for vehicle turnaround."
,
"type"
:
"double"
,
"decimalPlaces"
:
2
,
"min"
:
0
,
"units"
:
"m"
"units"
:
"m"
,
"defaultValue"
:
30
},
{
"name"
:
"Ground
r
esolution"
,
"name"
:
"Ground
R
esolution"
,
"shortDescription"
:
"Resolution of image in relationship to ground distance."
,
"type"
:
"double"
,
"decimalPlaces"
:
2
,
"min"
:
0
,
"units"
:
"cm/px"
"units"
:
"cm/px"
,
"defaultValue"
:
3
},
{
"name"
:
"Frontal
o
verlap"
,
"name"
:
"Frontal
O
verlap"
,
"shortDescription"
:
"Amount of overlap between images in the forward facing direction."
,
"type"
:
"double"
,
"decimalPlaces"
:
0
,
"max"
:
75
,
"units"
:
"%"
"max"
:
85
,
"units"
:
"%"
,
"defaultValue"
:
10
},
{
"name"
:
"Side
o
verlap"
,
"name"
:
"Side
O
verlap"
,
"shortDescription"
:
"Amount of overlap between images in the side facing direction."
,
"type"
:
"double"
,
"decimalPlaces"
:
0
,
"max"
:
75
,
"units"
:
"%"
"max"
:
85
,
"units"
:
"%"
,
"defaultValue"
:
10
},
{
"name"
:
"Camera
sensor w
idth"
,
"name"
:
"Camera
SensorW
idth"
,
"shortDescription"
:
"Amount of overlap between images in the side facing direction."
,
"type"
:
"double"
,
"decimalPlaces"
:
2
,
"min"
:
1
,
"units"
:
"mm"
"units"
:
"mm"
,
"defaultValue"
:
6.17
},
{
"name"
:
"Camera
sensor h
eight"
,
"name"
:
"Camera
SensorH
eight"
,
"shortDescription"
:
"Amount of overlap between images in the side facing direction."
,
"type"
:
"double"
,
"decimalPlaces"
:
2
,
"min"
:
1
,
"units"
:
"mm"
"units"
:
"mm"
,
"defaultValue"
:
4.55
},
{
"name"
:
"Camera
resolution w
idth"
,
"shortDescription"
:
"
Amount of overlap between images in the side facing direction
."
,
"name"
:
"Camera
ResolutionW
idth"
,
"shortDescription"
:
"
Camera resolution width
."
,
"type"
:
"uint32"
,
"min"
:
1
,
"units"
:
"px"
"units"
:
"px"
,
"defaultValue"
:
4000
},
{
"name"
:
"Camera
resolution h
eight"
,
"shortDescription"
:
"
Amount of overlap between images in the side facing direction
."
,
"name"
:
"Camera
ResolutionH
eight"
,
"shortDescription"
:
"
Camera resolution height
."
,
"type"
:
"uint32"
,
"min"
:
1
,
"units"
:
"px"
"units"
:
"px"
,
"defaultValue"
:
3000
},
{
"name"
:
"
Focal l
ength"
,
"shortDescription"
:
"
Amount of overlap between images in the side facing direction
."
,
"name"
:
"
CameraFocalL
ength"
,
"shortDescription"
:
"
Focal length of camera lens
."
,
"type"
:
"double"
,
"decimalPlaces"
:
1
,
"min"
:
1
,
"units"
:
"mm"
"units"
:
"mm"
,
"defaultValue"
:
4.5
},
{
"name"
:
"CameraTrigger"
,
"shortDescription"
:
"Trigger the camera based on distance."
,
"type"
:
"bool"
,
"defaultValue"
:
0
},
{
"name"
:
"Camera
trigger d
istance"
,
"name"
:
"Camera
TriggerD
istance"
,
"shortDescription"
:
"Distance between each triggering of the camera."
,
"type"
:
"double"
,
"decimalPlaces"
:
2
,
"min"
:
0.1
,
"units"
:
"m"
"units"
:
"m"
,
"defaultValue"
:
25
},
{
"name"
:
"CameraOrientationLandscape"
,
"shortDescription"
:
"Camera on vehicle is in landscape orientation."
,
"type"
:
"bool"
,
"defaultValue"
:
1
},
{
"name"
:
"FixedValueIsAltitude"
,
"shortDescription"
:
"The altitude is kep constant while ground resolution changes."
,
"type"
:
"bool"
,
"defaultValue"
:
0
},
{
"name"
:
"Camera"
,
"shortDescription"
:
"Camera selected for Survey."
,
"type"
:
"string"
,
"defaultValue"
:
""
}
]
src/MissionManager/SurveyMissionItem.cc
View file @
e8e93b4f
This diff is collapsed.
Click to expand it.
src/MissionManager/SurveyMissionItem.h
View file @
e8e93b4f
This diff is collapsed.
Click to expand it.
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