From 14076866ec68f9e3079eef84cd1a67806669db88 Mon Sep 17 00:00:00 2001 From: shefengchun <1077478963@qq.com> Date: Wed, 1 Mar 2023 11:19:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E8=9E=8D=E5=90=88?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=8F=82=E6=95=B0=E5=90=8C=E6=AD=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20=E6=8A=95=E5=BD=B1=E6=9C=BA=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E4=BB=8E=E5=90=8E=E7=AB=AF=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FusionSettings/DensityCorrection.vue | 1 - .../FusionSettings/FusionLocale.vue | 11 ++--- src/components/FusionSettingsDialog.vue | 47 +++++++++++-------- 3 files changed, 33 insertions(+), 26 deletions(-) diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue index 4b7d531..522aa94 100644 --- a/src/components/FusionSettings/DensityCorrection.vue +++ b/src/components/FusionSettings/DensityCorrection.vue @@ -398,7 +398,6 @@ export default defineComponent({ } }, { deep: true }) watch(() => value_v_point_amount, (newval, oldval) => { - console.log("🚀 ~ file: DensityCorrection.vue:401 ~ watch ~ newval:", newval) setTimeout(() => { if (now_v_h.value != 'level') { diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue index 5cf9d02..be7a391 100644 --- a/src/components/FusionSettings/FusionLocale.vue +++ b/src/components/FusionSettings/FusionLocale.vue @@ -8,7 +8,7 @@
- +
- +
- +
{ let tmpobjall = JSON.parse($store.state.fusion_configuration) - if ($store.getters.GetTheCurrentlySelectedCamera[1] == 0) { - + if ($store.getters.GetTheCurrentlySelectedCamera[1] == 0&&group.value==2) { let tmp = set_cache.value[1] == null ? tmpobjall.projectors[1].params : JSON.parse(set_cache.value[1]); let set_cache_tmp: any = [] if (tmp[1].hasOwnProperty("power")) { @@ -574,7 +573,7 @@ export default defineComponent({ set_cache.value[1] = JSON.stringify(set_cache_tmp); } } - if ($store.getters.GetTheCurrentlySelectedCamera[1] == 1) { + if ($store.getters.GetTheCurrentlySelectedCamera[1] == 1&&group.value==1) { let tmp = set_cache.value[0] == null ? tmpobjall.projectors[0].params : JSON.parse(set_cache.value[0]); let set_cache_tmp: any = [] diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue index 3ad0572..3278650 100644 --- a/src/components/FusionSettingsDialog.vue +++ b/src/components/FusionSettingsDialog.vue @@ -538,9 +538,21 @@ export default defineComponent({ allconfig = {resolution: [{width: tmp.projector_width,height: tmp.projector_height}]}; now_resolution.value=0 } - for (let index = 0; index < projectorlayout.length; index++) { - let arr = projectorlayout[index].label.split('x'); - if(tmp.col==Number(arr[0])&&tmp.row==Number(arr[1])){ + + projectorlayout.value=[] + for (let index = 0; index < tmp.max_projector_count; index++) { + for (let indexx = 0; indexx < tmp.max_projector_count; indexx++) { + if(index*tmp.max_projector_count+indexx>tmp.max_projector_count){ + continue + }else{ + projectorlayout.value.push({ label: `${index+1}x${indexx+1}`, value: index*tmp.max_projector_count+indexx }) + } + } + } + + for (let index = 0; index < projectorlayout.value.length; index++) { + let arr = projectorlayout.value[index].label.split('x'); + if(tmp.col==Number(arr[1])&&tmp.row==Number(arr[0])){ now_select_projectorlayout.value=index } } @@ -568,13 +580,13 @@ export default defineComponent({ allconfig = tmp for (let index = 0; index < options_resolution.value.length; index++) { let arr = options_resolution.value[index].label.split('*'); - if(tmp.projector_width==Number(arr[0])&&tmp.projector_height==Number(arr[1])){ + if(tmp.projector_width==Number(arr[1])&&tmp.projector_height==Number(arr[0])){ now_resolution.value=index } } - for (let index = 0; index < projectorlayout.length; index++) { - let arr = projectorlayout[index].label.split('x'); - if(tmp.row==Number(arr[0])&&tmp.col==Number(arr[1])){ + for (let index = 0; index < projectorlayout.value.length; index++) { + let arr = projectorlayout.value[index].label.split('x'); + if(tmp.row==Number(arr[1])&&tmp.col==Number(arr[0])){ now_select_projectorlayout.value=index } } @@ -635,13 +647,10 @@ export default defineComponent({ * 依赖注入 */ provide("now_selsect_projector",now_selsect_projector); - /** - * 设置投影机布局 - */ - const projectorlayout=[{label:'1x1',value:0},{label:'1x2',value:1}] + let projectorlayout=ref([{label:'1x1',value:0},{label:'1x2',value:1}]) const now_select_projectorlayout=ref(1) const send_projectorlayout=(val:number) => { - let arr = projectorlayout[val].label.split('x'); + let arr = projectorlayout.value[val].label.split('x'); set?.SetProjectorLayout(Number(arr[0]),Number(arr[1])).then(res => { let tmpp=JSON.parse(res!.config) config.value.row = tmpp.row; @@ -650,9 +659,9 @@ export default defineComponent({ message: 'Loading please wait' }) $store.commit("setfusion_configuration", res?.config); - for (let index = 0; index < projectorlayout.length; index++) { - let arr = projectorlayout[index].label.split('x'); - if(tmpp.col==Number(arr[0])&&tmpp.row==Number(arr[1])){ + for (let index = 0; index < projectorlayout.value.length; index++) { + let arr = projectorlayout.value[index].label.split('x'); + if(tmpp.col==Number(arr[1])&&tmpp.row==Number(arr[0])){ now_select_projectorlayout.value=index } } @@ -708,14 +717,14 @@ export default defineComponent({ let tmp = JSON.parse($store.state.fusion_configuration); for (let index = 0; index < options_resolution.value.length; index++) { let arr = options_resolution.value[index].label.split('*'); - if(tmp.projector_width==Number(arr[0])&&tmp.projector_height==Number(arr[1])){ + if(tmp.projector_width==Number(arr[1])&&tmp.projector_height==Number(arr[0])){ now_resolution.value=index } } - for (let index = 0; index < projectorlayout.length; index++) { - let arr = projectorlayout[index].label.split('x'); + for (let index = 0; index < projectorlayout.value.length; index++) { + let arr = projectorlayout.value[index].label.split('x'); - if(tmp.row==Number(arr[0])&&tmp.col==Number(arr[1])){ + if(tmp.row==Number(arr[1])&&tmp.col==Number(arr[0])){ now_select_projectorlayout.value=index } }