Skip to content

Q
qgroundcontrol
Commit e8e93b4f authored by Don Gagne's avatar Don Gagne
Browse files
Options

All survey Facts are now SettingsFacts

parent 54586b12
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 322 additions and 221 deletions
qgroundcontrol.qrc
View file @ e8e93b4f
...@@ -189,11 +189,11 @@ ...@@ -189,11 +189,11 @@
<file alias="Vehicle/VibrationFact.json">src/Vehicle/VibrationFact.json</file> <file alias="Vehicle/VibrationFact.json">src/Vehicle/VibrationFact.json</file>
<file alias="App.SettingsGroup.json">src/Settings/App.SettingsGroup.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="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="Units.SettingsGroup.json">src/Settings/Units.SettingsGroup.json</file>
<file alias="Video.SettingsGroup.json">src/Settings/Video.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="RallyPoint.FactMetaData.json">src/MissionManager/RallyPoint.FactMetaData.json</file>
<file alias="FWLandingPattern.FactMetaData.json">src/MissionManager/FWLandingPattern.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="USBBoardInfo.json">src/comm/USBBoardInfo.json</file>
<file alias="Vehicle/TemperatureFact.json">src/Vehicle/TemperatureFact.json</file> <file alias="Vehicle/TemperatureFact.json">src/Vehicle/TemperatureFact.json</file>
</qresource> </qresource>
......
src/MissionEditor/SurveyItemEditor.qml
View file @ e8e93b4f
This diff is collapsed.
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.", "shortDescription": "Altitude for all waypoints within the grid.",
"type": "double", "type": "double",
"units": "m", "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 angle", "name": "GridAngle",
"shortDescription": "Angle for parallel lines of grid.", "shortDescription": "Angle for parallel lines of grid.",
"type": "double", "type": "double",
"units": "deg", "units": "deg",
"decimalPlaces": 1 "decimalPlaces": 1,
"defaultValue": 0
}, },
{ {
"name": "Grid spacing", "name": "GridSpacing",
"shortDescription": "Amount of spacing in between parallel grid lines.", "shortDescription": "Amount of spacing in between parallel grid lines.",
"type": "double", "type": "double",
"decimalPlaces": 2, "decimalPlaces": 2,
"min": 0.1, "min": 0.1,
"units": "m" "units": "m",
"defaultValue": 30
}, },
{ {
"name": "Turnaround dist", "name": "TurnaroundDist",
"shortDescription": "Amount of additional distance to add outside the grid area for vehicle turnaround.", "shortDescription": "Amount of additional distance to add outside the grid area for vehicle turnaround.",
"type": "double", "type": "double",
"decimalPlaces": 2, "decimalPlaces": 2,
"min": 0, "min": 0,
"units": "m" "units": "m",
"defaultValue": 30
}, },
{ {
"name": "Ground resolution", "name": "GroundResolution",
"shortDescription": "Resolution of image in relationship to ground distance.", "shortDescription": "Resolution of image in relationship to ground distance.",
"type": "double", "type": "double",
"decimalPlaces": 2, "decimalPlaces": 2,
"min": 0, "min": 0,
"units": "cm/px" "units": "cm/px",
"defaultValue": 3
}, },
{ {
"name": "Frontal overlap", "name": "FrontalOverlap",
"shortDescription": "Amount of overlap between images in the forward facing direction.", "shortDescription": "Amount of overlap between images in the forward facing direction.",
"type": "double", "type": "double",
"decimalPlaces": 0, "decimalPlaces": 0,
"max": 75, "max": 85,
"units": "%" "units": "%",
"defaultValue": 10
}, },
{ {
"name": "Side overlap", "name": "SideOverlap",
"shortDescription": "Amount of overlap between images in the side facing direction.", "shortDescription": "Amount of overlap between images in the side facing direction.",
"type": "double", "type": "double",
"decimalPlaces": 0, "decimalPlaces": 0,
"max": 75, "max": 85,
"units": "%" "units": "%",
"defaultValue": 10
}, },
{ {
"name": "Camera sensor width", "name": "CameraSensorWidth",
"shortDescription": "Amount of overlap between images in the side facing direction.", "shortDescription": "Amount of overlap between images in the side facing direction.",
"type": "double", "type": "double",
"decimalPlaces": 2, "decimalPlaces": 2,
"min": 1, "min": 1,
"units": "mm" "units": "mm",
"defaultValue": 6.17
}, },
{ {
"name": "Camera sensor height", "name": "CameraSensorHeight",
"shortDescription": "Amount of overlap between images in the side facing direction.", "shortDescription": "Amount of overlap between images in the side facing direction.",
"type": "double", "type": "double",
"decimalPlaces": 2, "decimalPlaces": 2,
"min": 1, "min": 1,
"units": "mm" "units": "mm",
"defaultValue": 4.55
}, },
{ {
"name": "Camera resolution width", "name": "CameraResolutionWidth",
"shortDescription": "Amount of overlap between images in the side facing direction.", "shortDescription": "Camera resolution width.",
"type": "uint32", "type": "uint32",
"min": 1, "min": 1,
"units": "px" "units": "px",
"defaultValue": 4000
}, },
{ {
"name": "Camera resolution height", "name": "CameraResolutionHeight",
"shortDescription": "Amount of overlap between images in the side facing direction.", "shortDescription": "Camera resolution height.",
"type": "uint32", "type": "uint32",
"min": 1, "min": 1,
"units": "px" "units": "px",
"defaultValue": 3000
}, },
{ {
"name": "Focal length", "name": "CameraFocalLength",
"shortDescription": "Amount of overlap between images in the side facing direction.", "shortDescription": "Focal length of camera lens.",
"type": "double", "type": "double",
"decimalPlaces": 1, "decimalPlaces": 1,
"min": 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 distance", "name": "CameraTriggerDistance",
"shortDescription": "Distance between each triggering of the camera.", "shortDescription": "Distance between each triggering of the camera.",
"type": "double", "type": "double",
"decimalPlaces": 2, "decimalPlaces": 2,
"min": 0.1, "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.
src/MissionManager/SurveyMissionItem.h
View file @ e8e93b4f
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment