From 1eb926d0299b3c891423f23ab4c9aeebaff1472f Mon Sep 17 00:00:00 2001 From: shefengchun <1077478963@qq.com> Date: Tue, 28 Feb 2023 14:39:32 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=9B=B2=E9=9D=A2=E6=A0=A1?= =?UTF-8?q?=E6=AD=A3=E4=B8=8D=E5=8F=91=E9=80=81=E9=BB=98=E8=AE=A4=E7=82=B9?= =?UTF-8?q?=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FusionSettings/SurfaceCorrection.vue | 9 ++++++--- src/components/FusionSettingsDialog.vue | 6 +++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue index 646cfb4..cb121aa 100644 --- a/src/components/FusionSettings/SurfaceCorrection.vue +++ b/src/components/FusionSettings/SurfaceCorrection.vue @@ -278,8 +278,11 @@ export default defineComponent({ use_set_cache(); options_value_point_amount.value = Object.keys(config.multi_curved_surface) setTimeout(() => { - ste_status.value = 0; + set?.SetBlendingOption("blending_grids_control_point_count", `${value_point_amount.value}`) }, 100); + setTimeout(() => { + ste_status.value = 0; + }, 120); }, { deep: true } ); @@ -304,8 +307,8 @@ export default defineComponent({ }, { deep: true }) watch(() => value_point_amount, (newval, oldval) => { - set?.SetBlendingOption("blending_grids_control_point_count", `${newval.value}`) - save_set_cache() + if(ste_status.value==0)set?.SetBlendingOption("blending_grids_control_point_count", `${newval.value}`) + save_set_cache() }, { deep: true }) /** diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue index 87d054f..6d55253 100644 --- a/src/components/FusionSettingsDialog.vue +++ b/src/components/FusionSettingsDialog.vue @@ -419,9 +419,11 @@ export default defineComponent({ switch (newVal.value) { case 'FusionLocale': tmp = "blending" + set?.SetBlendingOption("blending_grids_select_ui", tmp) break; case 'FourPointCalibration': tmp = '4' + set?.SetBlendingOption("blending_grids_select_ui", tmp) set?.SetBlendingOption("blending_grids_control_point_count", `4`) set?.SetBlendingOption("blending_grids_select_point", `4:1`) break; @@ -430,6 +432,7 @@ export default defineComponent({ /** * 延迟发送不然获取不到值 */ + set?.SetBlendingOption("blending_grids_select_ui", tmp) setTimeout(() => { set?.SetBlendingOption("blending_grids_control_point_count", `${child.value!.value_point_amount}`) set?.SetBlendingOption("blending_grids_select_point", `${child.value!.value_point_amount}:1`) @@ -438,11 +441,12 @@ export default defineComponent({ break; case 'DensityCorrection': tmp = 'hor_density' + set?.SetBlendingOption("blending_grids_select_ui", tmp) break; default: break; } - if (tmp.length) set?.SetBlendingOption("blending_grids_select_ui", tmp) + // if (tmp.length) set?.SetBlendingOption("blending_grids_select_ui", tmp) }, { deep: true })