|
|
@@ -85,6 +85,12 @@ namespace ivf_tl_UtilHelper
|
|
|
TLSetting.focusLayerDown = tlSetting.focusLayerDown;
|
|
|
TLSetting.focusPeakRatioThreshold = tlSetting.focusPeakRatioThreshold;
|
|
|
|
|
|
+ // 自动对焦重构:设备级搜索半幅默认 + 对焦曝光二分上下限 服务器下发 → 运行态。
|
|
|
+ TLSetting.focusHRangeDefault = tlSetting.focusHRangeDefault;
|
|
|
+ TLSetting.focusVRangeDefault = tlSetting.focusVRangeDefault;
|
|
|
+ TLSetting.focusExposureMin = tlSetting.focusExposureMin;
|
|
|
+ TLSetting.focusExposureMax = tlSetting.focusExposureMax;
|
|
|
+
|
|
|
return TLSetting;
|
|
|
}
|
|
|
|
|
|
@@ -156,6 +162,12 @@ namespace ivf_tl_UtilHelper
|
|
|
TLSetting.focusLayerDown = tLSettingDB.focusLayerDown;
|
|
|
TLSetting.focusPeakRatioThreshold = tLSettingDB.focusPeakRatioThreshold;
|
|
|
|
|
|
+ // 自动对焦重构:设备级搜索半幅默认 + 对焦曝光二分上下限 本地缓存 → 运行时。
|
|
|
+ TLSetting.focusHRangeDefault = tLSettingDB.focusHRangeDefault;
|
|
|
+ TLSetting.focusVRangeDefault = tLSettingDB.focusVRangeDefault;
|
|
|
+ TLSetting.focusExposureMin = tLSettingDB.focusExposureMin;
|
|
|
+ TLSetting.focusExposureMax = tLSettingDB.focusExposureMax;
|
|
|
+
|
|
|
TLSetting.saveSourcePic = TLSetting.saveSourcePic;
|
|
|
|
|
|
if (tLSettingDB.compositeVideo == 1)
|
|
|
@@ -236,6 +248,12 @@ namespace ivf_tl_UtilHelper
|
|
|
tLSettingDB.focusLayerDown = tLSetting.focusLayerDown;
|
|
|
tLSettingDB.focusPeakRatioThreshold = tLSetting.focusPeakRatioThreshold;
|
|
|
|
|
|
+ // 自动对焦重构:设备级搜索半幅默认 + 对焦曝光二分上下限 运行时 → 本地缓存,跨重启保留。
|
|
|
+ tLSettingDB.focusHRangeDefault = tLSetting.focusHRangeDefault;
|
|
|
+ tLSettingDB.focusVRangeDefault = tLSetting.focusVRangeDefault;
|
|
|
+ tLSettingDB.focusExposureMin = tLSetting.focusExposureMin;
|
|
|
+ tLSettingDB.focusExposureMax = tLSetting.focusExposureMax;
|
|
|
+
|
|
|
tLSettingDB.saveSourcePic = tLSetting.saveSourcePic;
|
|
|
|
|
|
if (tLSetting.buildVideo)
|
|
|
@@ -353,6 +371,9 @@ namespace ivf_tl_UtilHelper
|
|
|
// V-047 对焦配置下发链:well 级覆盖 服务器 init JSON → DTO → 运行态(空=继承设备级)。
|
|
|
houseWellSetting.focusLayerSpacingPulse = houseWellSettingDTO.focusLayerSpacingPulse;
|
|
|
houseWellSetting.focusLayerCount = houseWellSettingDTO.focusLayerCount;
|
|
|
+ // 自动对焦重构:well 级搜索半幅覆盖 服务器下发 → 运行态(空=继承设备级)。
|
|
|
+ houseWellSetting.horizontalFocusRange = houseWellSettingDTO.horizontalFocusRange;
|
|
|
+ houseWellSetting.verticalFocusRange = houseWellSettingDTO.verticalFocusRange;
|
|
|
return houseWellSetting;
|
|
|
}
|
|
|
|
|
|
@@ -371,6 +392,9 @@ namespace ivf_tl_UtilHelper
|
|
|
// V-047 取数链:well 级拍照层覆盖 本地缓存 → 运行时(空=继承设备级,喂 PhotoLayerCalculator)。
|
|
|
houseWellSetting.focusLayerSpacingPulse = houseWellSettingDB.focusLayerSpacingPulse;
|
|
|
houseWellSetting.focusLayerCount = houseWellSettingDB.focusLayerCount;
|
|
|
+ // 自动对焦重构:well 级搜索半幅覆盖 本地缓存 → 运行时(空=继承设备级)。
|
|
|
+ houseWellSetting.horizontalFocusRange = houseWellSettingDB.horizontalFocusRange;
|
|
|
+ houseWellSetting.verticalFocusRange = houseWellSettingDB.verticalFocusRange;
|
|
|
return houseWellSetting;
|
|
|
}
|
|
|
|
|
|
@@ -389,6 +413,9 @@ namespace ivf_tl_UtilHelper
|
|
|
// V-047 取数链:well 级拍照层覆盖 运行时 → 本地缓存,跨重启保留。
|
|
|
houseWellSettingDB.focusLayerSpacingPulse = houseWellSetting.focusLayerSpacingPulse;
|
|
|
houseWellSettingDB.focusLayerCount = houseWellSetting.focusLayerCount;
|
|
|
+ // 自动对焦重构:well 级搜索半幅覆盖 运行时 → 本地缓存,跨重启保留。
|
|
|
+ houseWellSettingDB.horizontalFocusRange = houseWellSetting.horizontalFocusRange;
|
|
|
+ houseWellSettingDB.verticalFocusRange = houseWellSetting.verticalFocusRange;
|
|
|
return houseWellSettingDB;
|
|
|
}
|
|
|
|