diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue index a476afb..ba6d0d9 100644 --- a/src/components/FusionSettings/DensityCorrection.vue +++ b/src/components/FusionSettings/DensityCorrection.vue @@ -1,505 +1,885 @@ - + \ No newline at end of file + diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue index e958c77..71ffb4a 100644 --- a/src/components/FusionSettings/FourPointCalibration.vue +++ b/src/components/FusionSettings/FourPointCalibration.vue @@ -1,424 +1,655 @@ - + \ No newline at end of file + diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue index 690d5dc..f92783c 100644 --- a/src/components/FusionSettings/FusionLocale.vue +++ b/src/components/FusionSettings/FusionLocale.vue @@ -1,25 +1,37 @@ @@ -155,77 +236,92 @@ export default defineComponent({ { alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 }, ]); //正确的 索引编号 - let arr = [1, 0, 2, 3] + let arr = [1, 0, 2, 3]; let serverconfig = JSON.parse($store.state.fusion_configuration); const selectedprojector = computed(() => { - return $store.getters.GetTheCurrentlySelectedCamera[0] * serverconfig.col + $store.getters.GetTheCurrentlySelectedCamera[1] - }) + return ( + $store.getters.GetTheCurrentlySelectedCamera[0] * serverconfig.col + + $store.getters.GetTheCurrentlySelectedCamera[1] + ); + }); const ste_status = ref(0); const use_set_cache = () => { if (set_cache.value[selectedprojector.value] != null) { let tmp = JSON.parse(set_cache.value[selectedprojector.value]); - deepcopy(array, tmp) + deepcopy(array, tmp); } }; const deepcopy = (o1: any, o2: any) => { for (let k in o2) { - if (typeof o2[k] === 'object') { + if (typeof o2[k] === "object") { o1[k] = {}; deepcopy(o1[k], o2[k]); } else { o1[k] = o2[k]; } } - } + }; const save_set_cache = () => { set_cache.value[selectedprojector.value] = JSON.stringify(array); - } + }; let config = JSON.parse($store.state.fusion_configuration).projectors[0]; - const configselsect = computed(() => { return $store.state.selected_projector }) - watch(() => configselsect, (newVal, oldVal) => { - let tmp = JSON.parse($store.state.fusion_configuration); - let fortmp = null - let i - for (i of tmp.projectors) { - if (i.col === $store.getters.GetTheCurrentlySelectedCamera[1] && i.row === $store.getters.GetTheCurrentlySelectedCamera[0]) { - fortmp = JSON.parse(JSON.stringify(i)) + const configselsect = computed(() => { + return $store.state.selected_projector; + }); + watch( + () => configselsect, + (newVal, oldVal) => { + let tmp = JSON.parse($store.state.fusion_configuration); + let fortmp = null; + let i; + for (i of tmp.projectors) { + if ( + i.col === $store.getters.GetTheCurrentlySelectedCamera[1] && + i.row === $store.getters.GetTheCurrentlySelectedCamera[0] + ) { + fortmp = JSON.parse(JSON.stringify(i)); + } } - } - ste_status.value = 1; + ste_status.value = 1; - config = JSON.parse(JSON.stringify(fortmp)) - use_server_config() - use_set_cache() - setTimeout(() => { - ste_status.value = 0; - }, 100); - setnowindex() - }, { deep: true }) + config = JSON.parse(JSON.stringify(fortmp)); + use_server_config(); + use_set_cache(); + setTimeout(() => { + ste_status.value = 0; + }, 100); + setnowindex(); + }, + { deep: true } + ); const chang = (type: string) => { if (type == "alpha") { - if ($store.state.enablefusion) set?.setBlendingAlphaParam( - $store.getters.GetTheCurrentlySelectedCamera[0], - $store.getters.GetTheCurrentlySelectedCamera[1], - arr[group.value], - array[arr[group.value]].alpha - ); + if ($store.state.enablefusion) + set?.setBlendingAlphaParam( + $store.getters.GetTheCurrentlySelectedCamera[0], + $store.getters.GetTheCurrentlySelectedCamera[1], + arr[group.value], + array[arr[group.value]].alpha + ); } if (type == "p") { - if ($store.state.enablefusion) set?.setBlendingPowerParam( - $store.getters.GetTheCurrentlySelectedCamera[0], - $store.getters.GetTheCurrentlySelectedCamera[1], - arr[group.value], - array[arr[group.value]].p - ); + if ($store.state.enablefusion) + set?.setBlendingPowerParam( + $store.getters.GetTheCurrentlySelectedCamera[0], + $store.getters.GetTheCurrentlySelectedCamera[1], + arr[group.value], + array[arr[group.value]].p + ); } if (type == "gamma") { - if ($store.state.enablefusion) set?.setBlendingGammaParam( - $store.getters.GetTheCurrentlySelectedCamera[0], - $store.getters.GetTheCurrentlySelectedCamera[1], - arr[group.value], - array[arr[group.value]].gamma - ); + if ($store.state.enablefusion) + set?.setBlendingGammaParam( + $store.getters.GetTheCurrentlySelectedCamera[0], + $store.getters.GetTheCurrentlySelectedCamera[1], + arr[group.value], + array[arr[group.value]].gamma + ); } save_set_cache(); }; @@ -240,152 +336,212 @@ export default defineComponent({ } } if (sum == 1) { - group.value = indexx + group.value = indexx; } else { - group.value = 4 + group.value = 4; } - } + }; - - //接受 赋值 const setconfig = (config: any) => { let tmp = JSON.parse(config); - let fortmp = null - let i + let fortmp = null; + let i; for (i of tmp.projectors) { - if (i.col === $store.getters.GetTheCurrentlySelectedCamera[1] && i.row === $store.getters.GetTheCurrentlySelectedCamera[0]) { - fortmp = JSON.parse(JSON.stringify(i)) + if ( + i.col === $store.getters.GetTheCurrentlySelectedCamera[1] && + i.row === $store.getters.GetTheCurrentlySelectedCamera[0] + ) { + fortmp = JSON.parse(JSON.stringify(i)); } } ste_status.value = 1; - config = JSON.parse(JSON.stringify(fortmp)) - //手动对应数据索引 + config = JSON.parse(JSON.stringify(fortmp)); for (let index = 0; index < array.length - 1; index++) { - array[arr[index]].gamma = config.params[index].gamma.toFixed(2) - array[arr[index]].alpha = config.params[index].alpha.toFixed(2) - array[arr[index]].p = config.params[index].power.toFixed(2) - array[arr[index]].isshow = config.params[index].enable - array[arr[index]].value = Number(config.params[index].size) + array[arr[index]].gamma = config.params[index].gamma.toFixed(2); + array[arr[index]].alpha = config.params[index].alpha.toFixed(2); + array[arr[index]].p = config.params[index].power.toFixed(2); + array[arr[index]].isshow = config.params[index].enable; + array[arr[index]].value = Number(config.params[index].size); } setTimeout(() => { ste_status.value = 0; }, 100); - setnowindex() - } + setnowindex(); + }; const startconfig = () => { - //手动对应数据索引 for (let index = 0; index < array.length - 1; index++) { - array[arr[index]].gamma = config.params[index].gamma.toFixed(2) - array[arr[index]].alpha = config.params[index].alpha.toFixed(2) - array[arr[index]].p = config.params[index].power.toFixed(2) - array[arr[index]].isshow = config.params[index].enable - array[arr[index]].value = Number(config.params[index].size) + array[arr[index]].gamma = config.params[index].gamma.toFixed(2); + array[arr[index]].alpha = config.params[index].alpha.toFixed(2); + array[arr[index]].p = config.params[index].power.toFixed(2); + array[arr[index]].isshow = config.params[index].enable; + array[arr[index]].value = Number(config.params[index].size); } - if (sessionStorage.FusionLocale) set_cache.value = JSON.parse(sessionStorage.FusionLocale); use_set_cache() - setnowindex() - } + if (sessionStorage.FusionLocale) + set_cache.value = JSON.parse(sessionStorage.FusionLocale); + use_set_cache(); + setnowindex(); + }; const use_server_config = () => { for (let index = 0; index < array.length - 1; index++) { - array[arr[index]].gamma = config.params[index].gamma.toFixed(2) - array[arr[index]].alpha = config.params[index].alpha.toFixed(2) - array[arr[index]].p = config.params[index].power.toFixed(2) - array[arr[index]].isshow = config.params[index].enable - array[arr[index]].value = Number(config.params[index].size) + array[arr[index]].gamma = config.params[index].gamma.toFixed(2); + array[arr[index]].alpha = config.params[index].alpha.toFixed(2); + array[arr[index]].p = config.params[index].power.toFixed(2); + array[arr[index]].isshow = config.params[index].enable; + array[arr[index]].value = Number(config.params[index].size); } - } - startconfig() + }; + startconfig(); onBeforeUnmount(() => { - sessionStorage.FusionLocale = JSON.stringify(set_cache.value) - }) + sessionStorage.FusionLocale = JSON.stringify(set_cache.value); + }); watch( () => array[0].value, (newVal, oldVal) => { - if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 1, array[0].isshow, Number(array[0].value)); - save_set_cache() + if ($store.state.enablefusion) + set?.SetBlendingOverlap( + $store.getters.GetTheCurrentlySelectedCamera[0], + $store.getters.GetTheCurrentlySelectedCamera[1], + 1, + array[0].isshow, + Number(array[0].value) + ); + save_set_cache(); }, { deep: true } ); watch( () => array[1].value, (newVal, oldVal) => { - if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 0, array[1].isshow, Number(array[1].value)); - save_set_cache() + if ($store.state.enablefusion) + set?.SetBlendingOverlap( + $store.getters.GetTheCurrentlySelectedCamera[0], + $store.getters.GetTheCurrentlySelectedCamera[1], + 0, + array[1].isshow, + Number(array[1].value) + ); + save_set_cache(); }, { deep: true } ); watch( () => array[2].value, (newVal, oldVal) => { - if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 2, array[2].isshow, Number(array[2].value)); - save_set_cache() + if ($store.state.enablefusion) + set?.SetBlendingOverlap( + $store.getters.GetTheCurrentlySelectedCamera[0], + $store.getters.GetTheCurrentlySelectedCamera[1], + 2, + array[2].isshow, + Number(array[2].value) + ); + save_set_cache(); }, { deep: true } ); watch( () => array[3].value, (newVal, oldVal) => { - if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 3, array[3].isshow, Number(array[3].value)); - save_set_cache() + if ($store.state.enablefusion) + set?.SetBlendingOverlap( + $store.getters.GetTheCurrentlySelectedCamera[0], + $store.getters.GetTheCurrentlySelectedCamera[1], + 3, + array[3].isshow, + Number(array[3].value) + ); + save_set_cache(); }, { deep: true } ); - //// + watch( () => array[0].isshow, (newVal, oldVal) => { - if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 1, array[0].isshow, Number(array[0].value)); - save_set_cache() + if ($store.state.enablefusion) + set?.SetBlendingOverlap( + $store.getters.GetTheCurrentlySelectedCamera[0], + $store.getters.GetTheCurrentlySelectedCamera[1], + 1, + array[0].isshow, + Number(array[0].value) + ); + save_set_cache(); }, { deep: true } ); watch( () => array[1].isshow, (newVal, oldVal) => { - if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 0, array[1].isshow, Number(array[1].value)); - save_set_cache() + if ($store.state.enablefusion) + set?.SetBlendingOverlap( + $store.getters.GetTheCurrentlySelectedCamera[0], + $store.getters.GetTheCurrentlySelectedCamera[1], + 0, + array[1].isshow, + Number(array[1].value) + ); + save_set_cache(); }, { deep: true } ); watch( () => array[2].isshow, (newVal, oldVal) => { - if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 2, array[2].isshow, Number(array[2].value)); - save_set_cache() + if ($store.state.enablefusion) + set?.SetBlendingOverlap( + $store.getters.GetTheCurrentlySelectedCamera[0], + $store.getters.GetTheCurrentlySelectedCamera[1], + 2, + array[2].isshow, + Number(array[2].value) + ); + save_set_cache(); }, { deep: true } ); watch( () => array[3].isshow, (newVal, oldVal) => { - if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 3, array[3].isshow, Number(array[3].value)); - save_set_cache() + if ($store.state.enablefusion) + set?.SetBlendingOverlap( + $store.getters.GetTheCurrentlySelectedCamera[0], + $store.getters.GetTheCurrentlySelectedCamera[1], + 3, + array[3].isshow, + Number(array[3].value) + ); + save_set_cache(); }, { deep: true } ); - //// watch( () => enablefusion, (newVal, oldVal) => { - $store.commit('setenablefusion', newVal.value); + $store.commit("setenablefusion", newVal.value); set?.EnableBlending(newVal.value); - }, { deep: true } + }, + { deep: true } ); const changenablefusion = () => { - $store.commit('setenablefusion', enablefusion.value); - } + $store.commit("setenablefusion", enablefusion.value); + }; let resnewdata = null; const resetall = () => { try { - set?.GetBlendingConfig("").then((res) => { resnewdata = res?.config; setconfig(resnewdata) }) + set?.GetBlendingConfig("").then((res) => { + resnewdata = res?.config; + setconfig(resnewdata); + }); } catch (error) { - console.log("ResetBlendingConfig error") + console.log("ResetBlendingConfig error"); } - } + }; return { group, array, @@ -394,7 +550,7 @@ export default defineComponent({ changenablefusion, selectedprojector, resetall, - set_cache + set_cache, }; }, }); diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue index f4c6c51..d182277 100644 --- a/src/components/FusionSettings/SurfaceCorrection.vue +++ b/src/components/FusionSettings/SurfaceCorrection.vue @@ -1,548 +1,1052 @@ - + \ No newline at end of file + diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue index 03b730a..e7f20f7 100644 --- a/src/components/FusionSettingsDialog.vue +++ b/src/components/FusionSettingsDialog.vue @@ -1,11 +1,15 @@