From 4ddd39864e4178b50aa46e32bf8d534fcc3fb9af Mon Sep 17 00:00:00 2001 From: miao <2514145421@qq.com> Date: Thu, 9 Mar 2023 16:33:46 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=97=B6=E5=BC=82=E5=B8=B8?= =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E6=AF=94=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/ClientConnection.ts | 6 ++- .../FusionSettings/GridSettings.vue | 44 +++++-------------- src/entities/WSProtocol.ts | 4 ++ src/i18n/en-US/index.ts | 8 +++- src/i18n/zh-CN/index.ts | 8 +++- src/pad/TopToolbar.vue | 4 ++ src/pages/TopToolBar.vue | 4 ++ 7 files changed, 39 insertions(+), 39 deletions(-) diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts index 6e4fa17..c675c29 100644 --- a/src/common/ClientConnection.ts +++ b/src/common/ClientConnection.ts @@ -1457,7 +1457,8 @@ export default class ClientConnection { column: number, location: number, enable: boolean, - width: number + width: number, + auto_sync: boolean, ) { return await this.doRpc( new Protocol.SetBlendingOverlapRequestEntity( @@ -1465,7 +1466,8 @@ export default class ClientConnection { column, location, enable, - width + width, + auto_sync ) ); } diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue index 6660458..2d3896c 100644 --- a/src/components/FusionSettings/GridSettings.vue +++ b/src/components/FusionSettings/GridSettings.vue @@ -4,8 +4,8 @@
-
-
+
@@ -13,8 +13,8 @@
-
-
+
@@ -22,16 +22,16 @@
-
-
+
-
-
+
+
{{ $t("line color") }} @@ -51,33 +51,11 @@
+
-
-
- - - {{ $t("background color") }} - - - - - - - -
-
-
-
-
-
-
+
+
{{ $t("center circle color") }} diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts index 6957679..37d5c33 100644 --- a/src/entities/WSProtocol.ts +++ b/src/entities/WSProtocol.ts @@ -3460,6 +3460,7 @@ export namespace Protocol { location: number, enable: boolean, width: number, + auto_sync:boolean, rpc_id = 0 ) { super(); @@ -3472,12 +3473,15 @@ export namespace Protocol { this.location = location ?? 0; this.enable = enable ?? false; this.width = width ?? 0; + this.auto_sync = auto_sync ?? false; + } row = 0; column = 0; location = 0; //0：左融合带，1：上融合带，2：右融合带，3：下融合带 enable = false; width = 0; + auto_sync=false; } export class GetBlendingConfigResponseEntity extends PacketEntity { diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts index d59a7ff..60d5d27 100644 --- a/src/i18n/en-US/index.ts +++ b/src/i18n/en-US/index.ts @@ -417,7 +417,7 @@ export default { FourPointCalibration: "Four Pint Calibration", SurfaceCorrection: "Surface Correction", DensityCorrection: "Density Correction", - GridSettings: "Grid Settings", + GridSettings: "Auxiliary Settings", point: "dot", reset: "reset", "upper fusion zone parameters": "Upper Fusion Zone Parameters", @@ -509,5 +509,9 @@ export default { "Whether to change the projector layout to", "after upgrade, please clear browser cache Or refresh hard (Ctrl/Shift + F5 Or Ctrl + Shift + R)": "After Upgrade, Please Clear Browser Cache Or Refresh Hard (Ctrl/Shift + F5 Or Ctrl + Shift + R)", - "fusion zone":"fusion zone" + "fusion zone":"fusion zone", + "up":"up", + "left":"left", + "right":"right", + "down":"down" }; diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts index d7e0bcf..2de153c 100644 --- a/src/i18n/zh-CN/index.ts +++ b/src/i18n/zh-CN/index.ts @@ -686,7 +686,7 @@ export default { FourPointCalibration: "四点校正", SurfaceCorrection: "曲面校正", DensityCorrection: "疏密校正", - GridSettings: "网格设置", + GridSettings: "辅助设置", point: "点", reset: "重置", "upper fusion zone parameters": "上融合带参数", @@ -776,5 +776,9 @@ export default { "Whether to change the projector layout to": "是否更改投影机布局为", "after upgrade, please clear browser cache Or refresh hard (Ctrl/Shift + F5 Or Ctrl + Shift + R)": "升级完成后请清空浏览器缓存或者进行硬刷新(Ctrl/Shift + F5 或者 CTRL + SHIFT + R)", - "fusion zone":"融合带" + "fusion zone":"融合带", + "up":"上", + "left":"左", + "right":"右", + "down":"下" }; diff --git a/src/pad/TopToolbar.vue b/src/pad/TopToolbar.vue index eb714f7..58c2bc8 100644 --- a/src/pad/TopToolbar.vue +++ b/src/pad/TopToolbar.vue @@ -314,6 +314,10 @@ export default defineComponent({ } ); const getconfig = () => { + set?.SetBlendingOption("blending_grids_select_ui", '4') + set?.SetBlendingOption('blending_grids_select_projector',"0-0"); + set?.SetBlendingOption("blending_grids_select_point", `4:1`) + set?.SetBlendingOption("blending_grids_show", "1"); try { set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue index c36afba..c29ae8a 100644 --- a/src/pages/TopToolBar.vue +++ b/src/pages/TopToolBar.vue @@ -653,6 +653,10 @@ export default defineComponent({ return "rotate " + sulv + "s linear infinite"; }); const getconfig = () => { + set?.SetBlendingOption("blending_grids_select_ui", '4') + set?.SetBlendingOption('blending_grids_select_projector',"0-0"); + set?.SetBlendingOption("blending_grids_select_point", `4:1`) + set?.SetBlendingOption("blending_grids_show", "1"); try { set?.GetBlendingConfig("").then((res) => {}); set?.GetBlendingConfig("").then((res) => {