From 5675ec3d3bad81185c727146353b76be4bb690bc Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Mon, 31 Dec 2018 11:14:50 -0800 Subject: [PATCH 1/2] Better defaults --- src/MissionManager/CameraCalc.FactMetaData.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MissionManager/CameraCalc.FactMetaData.json b/src/MissionManager/CameraCalc.FactMetaData.json index 9860f54..2addaa8 100644 --- a/src/MissionManager/CameraCalc.FactMetaData.json +++ b/src/MissionManager/CameraCalc.FactMetaData.json @@ -18,7 +18,7 @@ "min": 0.1, "units": "m", "decimalPlaces": 2, - "defaultValue": 10.0 + "defaultValue": 50.0 }, { "name": "ImageDensity", @@ -27,7 +27,7 @@ "min": 0, "units": "cm/px", "decimalPlaces": 1, - "defaultValue": 25 + "defaultValue": 1.2 }, { "name": "FrontalOverlap", From 919e2eadddf0685c454330ae2927601838ee6a5f Mon Sep 17 00:00:00 2001 From: Don Gagne Date: Mon, 31 Dec 2018 11:15:37 -0800 Subject: [PATCH 2/2] Fix valueSetIsDistance when manual camera change --- src/MissionManager/CameraCalc.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MissionManager/CameraCalc.cc b/src/MissionManager/CameraCalc.cc index 5f15bb2..c775c1b 100644 --- a/src/MissionManager/CameraCalc.cc +++ b/src/MissionManager/CameraCalc.cc @@ -127,8 +127,8 @@ void CameraCalc::_cameraNameChanged(void) // These values are unknown for these types fixedOrientation()->setRawValue(false); minTriggerInterval()->setRawValue(0); - if (isManualCamera()) { - valueSetIsDistance()->setRawValue(false); + if (isManualCamera() && !valueSetIsDistance()->rawValue().toBool()) { + valueSetIsDistance()->setRawValue(true); } } else { qWarning() << "Internal Error: Not known camera, but now manual or custom either";