Merge pull request #4732 from DonLakeFlyer/SurveySettings

Plan:Survey: All survey values are now SettingsFacts

qgroundcontrol.qrc

@@ -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/MissionManager/Survey.FactMetaData.json → src/MissionManager/Survey.SettingsGroup.json

 [
 {
-    "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 angle",
+    "name":             "GridAngle",
     "shortDescription": "Angle for parallel lines of grid.",
     "type":             "double",
     "units":            "deg",
-    "decimalPlaces":    1
+    "decimalPlaces":    1,
+    "defaultValue":     0
 },
 {
-    "name":             "Grid spacing",
+    "name":             "GridSpacing",
     "shortDescription": "Amount of spacing in between parallel grid lines.",
     "type":             "double",
     "decimalPlaces":    2,
     "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.",
     "type":             "double",
     "decimalPlaces":    2,
     "min":              0,
-    "units":            "m"
+    "units":            "m",
+    "defaultValue":     30
 },
 {
-    "name":             "Ground resolution",
+    "name":             "GroundResolution",
     "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 overlap",
+    "name":             "FrontalOverlap",
     "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 overlap",
+    "name":             "SideOverlap",
     "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 width",
+    "name":             "CameraSensorWidth",
     "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 height",
+    "name":             "CameraSensorHeight",
     "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 width",
-    "shortDescription": "Amount of overlap between images in the side facing direction.",
+    "name":             "CameraResolutionWidth",
+    "shortDescription": "Camera resolution width.",
     "type":             "uint32",
     "min":              1,
-    "units":            "px"
+    "units":            "px",
+    "defaultValue":     4000
 },
 {
-    "name":             "Camera resolution height",
-    "shortDescription": "Amount of overlap between images in the side facing direction.",
+    "name":             "CameraResolutionHeight",
+    "shortDescription": "Camera resolution height.",
     "type":             "uint32",
     "min":              1,
-    "units":            "px"
+    "units":            "px",
+    "defaultValue":     3000
 },
 {
-    "name":             "Focal length",
-    "shortDescription": "Amount of overlap between images in the side facing direction.",
+    "name":             "CameraFocalLength",
+    "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 distance",
+    "name":             "CameraTriggerDistance",
     "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":     ""
 }
 ]