diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts index c675c29..6e4fa17 100644 --- a/src/common/ClientConnection.ts +++ b/src/common/ClientConnection.ts @@ -1457,8 +1457,7 @@ export default class ClientConnection { column: number, location: number, enable: boolean, - width: number, - auto_sync: boolean, + width: number ) { return await this.doRpc( new Protocol.SetBlendingOverlapRequestEntity( @@ -1466,8 +1465,7 @@ export default class ClientConnection { column, location, enable, - width, - auto_sync + width ) ); } diff --git a/src/components/ControlPanelDialog.vue b/src/components/ControlPanelDialog.vue index e312c2a..d320891 100644 --- a/src/components/ControlPanelDialog.vue +++ b/src/components/ControlPanelDialog.vue @@ -981,8 +981,10 @@ export default defineComponent({ if (wall_dom) { lcm.value = (wall_dom.offsetWidth * 0.5) / 1214; test_monitor_list.value.forEach((ele) => { - ele.cmw = Math.round(ele.w / lcm.value); - ele.cmh = Math.round(ele.h / lcm.value); + ele.cmw = 1214; + ele.cmh = 684; + ele.w = wall_dom.offsetWidth * 0.5; + ele.h = wall_dom.offsetHeight * 0.5; }); } }; @@ -1100,7 +1102,7 @@ export default defineComponent({ const wall_dom = wall.value; if (wall_dom) { const point_list = four_point(item); - if (item.angle != 0 && point_list) { + if (item && item.angle != 0 && point_list) { let minx = 0; point_list.forEach((element) => { if (minx > element.x) { @@ -1365,7 +1367,9 @@ export default defineComponent({ multiple_select.value = []; multiple.value = false; loading.value = false; - test_monitor_list.value = JSON.parse(list_magic); + if (list_magic) { + test_monitor_list.value = JSON.parse(list_magic); + } realtime_upload(last_wall.value, last_percenter.value, 2); }; let sort_index: any = ref([]); @@ -1461,8 +1465,8 @@ export default defineComponent({ }); } test_monitor_list.value.forEach((ele) => { - ele.isHide = false; - }); + ele.isHide = false; + }); const wall_dom = wall.value; if (a && wall_dom) { test_monitor_wall.value = []; @@ -1642,11 +1646,9 @@ export default defineComponent({ realtime_upload(); }; let list_magic: any = []; - const detect=(list:any)=>{ - list.forEach((ele:any)=>{ - - }) - } + const detect = (list: any) => { + list.forEach((ele: any) => {}); + }; EventBus.getInstance().on( EventNamesDefine.NotifyMessage, (notify: NotifyMessage) => { @@ -1723,7 +1725,7 @@ export default defineComponent({ console.log(a); }, async showDialog() { - console.log(1) + console.log(1); initialize(); monitor_list_current_index.value = -1; show_dialog.value = true; @@ -1743,18 +1745,14 @@ export default defineComponent({ const SetMagicWallGridState = await client.setMagicWallGridState( magic_switch.value ); - list_magic = (await client.getApplicationSettins())?.config - ?.magic_list; - if (list_magic) { - test_monitor_list.value = JSON.parse(list_magic); - } + if (wall_dom) { offsetHeight.value = wall_dom.offsetHeight; offsetWidth.value = wall_dom.offsetWidth; getpx(); } test_monitor_list.value.forEach((element) => { - element.isHide = false; + element.isHide = false; }); if (response && settings) { const a = response?.config.windows; @@ -1773,6 +1771,14 @@ export default defineComponent({ } getpx(); } + list_magic = (await client.getApplicationSettins())?.config + ?.magic_list; + if (list_magic) { + test_monitor_list.value = JSON.parse(list_magic); + } + test_monitor_list.value.forEach((element) => { + element.isHide = false; + }); if ( output_length.value != response.config.col * response.config.row @@ -1787,7 +1793,7 @@ export default defineComponent({ $store.commit("setShowMonitorList", []); loading.value = false; - } else if (a && wall_dom) { + } else if (a && wall_dom) { a.forEach((element) => { let item: test_monitor = new test_monitor(0, "0", 0, 0, 0); extend(true, item, test_monitor_list.value[element.index]); @@ -1996,6 +2002,12 @@ export default defineComponent({ const wall_dom = wall.value; item.isShow = true; if (wall_dom) { + if(item.cmw==1214){ + item.w=wall_dom.offsetWidth*0.5 + } + if(item.cmh==684){ + item.h=wall_dom.offsetHeight*0.5 + } item.InitialH = item.h; item.InitialW = item.w; item.resizew = item.w / wall_dom.offsetWidth; @@ -2038,7 +2050,6 @@ export default defineComponent({ } } }, - onDragEnter(e: DragEvent, index: string) { e.stopPropagation(); let target: HTMLElement | null = e.target as HTMLElement; @@ -2209,12 +2220,22 @@ export default defineComponent({ }, changewidth() { + const wall_dom = wall.value; let item = test_monitor_list.value[monitor_list_current_index.value]; - item.w = Number(item.cmw) * lcm.value; + // if (wall_dom) { + // if(item.cmw==1214){ + // item.w = 0.5 * wall_dom.offsetWidth; + // } + // } }, changeHeight() { + const wall_dom = wall.value; let item = test_monitor_list.value[monitor_list_current_index.value]; - item.h = item.cmh * lcm.value; + // if (wall_dom) { + // if(item.cmh==684){ + // item.h = 0.5 * wall_dom?.offsetHeight; + // } + // } }, alignTop() { let item = test_monitor_wall.value[multiple_select.value[0]]; @@ -2224,7 +2245,7 @@ export default defineComponent({ tep_item.currenty = item.currenty; } }); - multiple_select.value=[] + multiple_select.value = []; realtime_upload(); }, alignBottom() { @@ -2235,7 +2256,7 @@ export default defineComponent({ tep_item.currenty = item.currenty + item.h - tep_item.h; } }); - multiple_select.value=[] + multiple_select.value = []; realtime_upload(); }, alignRight() { @@ -2246,7 +2267,7 @@ export default defineComponent({ tep_item.currentx = item.currentx + item.w - tep_item.w; } }); - multiple_select.value=[] + multiple_select.value = []; realtime_upload(); }, alignLeft() { @@ -2257,7 +2278,7 @@ export default defineComponent({ tep_item.currentx = item.currentx; } }); - multiple_select.value=[] + multiple_select.value = []; realtime_upload(); }, testLog(a: any) { diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue index b3fd633..8504814 100644 --- a/src/components/FusionSettings/DensityCorrection.vue +++ b/src/components/FusionSettings/DensityCorrection.vue @@ -7,8 +7,7 @@ + @click="options_model_v = index; now_v_h = 'vertical'" :draggable="url.indexOf('pad')==-1" @dragging="dragStartHandle($event, index, 'v')"> v{{ index + 1 }} @@ -16,8 +15,7 @@ + @activated="options_model_v = index; now_v_h = 'vertical'" :draggable="url.indexOf('pad')==-1" @dragging="dragStartHandle($event, index, 'v')"> v{{ index + 1 }} @@ -25,8 +23,7 @@ + @click="options_model_h = index; now_v_h = 'level'" :draggable="url.indexOf('pad')==-1" @dragging="dragStartHandle($event, index, 'h')"> h{{ index + 1 }} @@ -34,8 +31,7 @@ + @click="options_model_h = index; now_v_h = 'level'" :draggable="url.indexOf('pad')==-1" @dragging="dragStartHandle($event, index, 'h')"> h{{ index + 1 }} @@ -44,7 +40,7 @@ -
+
@@ -59,12 +55,11 @@
-
-
@@ -73,147 +68,53 @@
-
- +
-
+
-
-
-
-
-
+
-
+
- - -
-
-
-
- -
-
-
- -
-
-
-
-
-
-
-
- -
-
-
- - -
-
- -
- -
-
-
- -
-
-
-
-
-
-
-
- -
-
-
- - -
-
- -
- -
-
-
-
-
-
@@ -240,26 +141,21 @@
-
+
+ :label="$t('Please enter the points you need to add')" @update:model-value="(val: any) => { }" />
-
+ @click="() => {now_v_h=='vertical'?preview_v(Number(value_v_point_amount)+1):preview_h(Number(value_h_point_amount)+1)}" />
-
+ @click="() => {now_v_h=='vertical'?preview_v(Number(value_v_point_amount)-1):preview_h(Number(value_h_point_amount)-1)}" />
- + @@ -269,41 +165,26 @@ - -
-
- -
-
- -
-
+
{{ $t('point') +(now_v_h == 'level'?options_model_h+1:options_model_v+1)}}
-
+
-
-
-
+
+
+
-
+
- + + - -