From aadd5793278d5a9f00848fbfb1458ec44573b837 Mon Sep 17 00:00:00 2001 From: ljqing Date: Sat, 28 Jan 2023 14:12:46 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=85=B3=E9=97=AD=E7=AA=97=E5=8F=A3?= =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E8=AF=BB=E5=8F=96=E8=9E=8D=E5=90=88?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FusionSettingsDialog.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue index 2726173..4364f37 100644 --- a/src/components/FusionSettingsDialog.vue +++ b/src/components/FusionSettingsDialog.vue @@ -272,7 +272,6 @@ export default defineComponent({ sessionStorage.removeItem("FourPointCalibration"); sessionStorage.removeItem("GridSettings"); }, 500); - getconfig(); }; onBeforeMount(() => { From e7a3489054ded1801141968c88cfe49c00efdb44 Mon Sep 17 00:00:00 2001 From: ljqing Date: Mon, 30 Jan 2023 17:18:11 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9id=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FusionSettings/GridSettings.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue index 38dcb58..685762e 100644 --- a/src/components/FusionSettings/GridSettings.vue +++ b/src/components/FusionSettings/GridSettings.vue @@ -141,11 +141,11 @@ export default defineComponent({ setTimeout(() => { switch (type) { case 0: - set?.SetBlendingOption("blending_grids_hide_row", RowsColumns[type] + ""); + set?.SetBlendingOption("blending_grids_show_row", RowsColumns[type] + ""); break; case 1: if (!RowsColumns[1]) RowsColumns[2] = false; RowsColumns[3] = false - set?.SetBlendingOption("blending_grids_hide_column", RowsColumns[type] + ""); + set?.SetBlendingOption("blending_grids_show_column", RowsColumns[type] + ""); break; case 2: @@ -163,8 +163,8 @@ export default defineComponent({ model[0] = Number(server_conf.blending_grids_row) model[1] = Number(server_conf.blending_grids_column) color[0] = server_conf.blending_grids_line_color - RowsColumns[0] = server_conf.blending_grids_hide_row === "false" ? false : true - RowsColumns[1] = server_conf.blending_grids_hide_column === "false" ? false : true + RowsColumns[0] = server_conf.blending_grids_show_row === "false" ? false : true + RowsColumns[1] = server_conf.blending_grids_show_column === "false" ? false : true } use_server_config() From 104a5cead659adaa61709255347a0e0d5daa548f Mon Sep 17 00:00:00 2001 From: ljqing Date: Mon, 30 Jan 2023 18:14:33 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=9A=E4=B8=BE?= =?UTF-8?q?=E8=9E=8D=E5=90=88=E5=9C=BA=E6=99=AF=E5=90=8D=E7=A7=B0=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=8F=8A=E5=BA=94=E7=94=A8=E8=9E=8D=E5=90=88=E5=9C=BA?= =?UTF-8?q?=E6=99=AF=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/ClientConnection.ts | 12 ++++++++++ src/entities/WSProtocol.ts | 43 ++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts index 37f7795..1ab590a 100644 --- a/src/common/ClientConnection.ts +++ b/src/common/ClientConnection.ts @@ -1487,6 +1487,18 @@ export default class ClientConnection { ); } + public async EnumBlendingScene() { + return await this.doRpc( + new Protocol.EnumBlendingSceneRequestEntity() + ); + } + + public async ApplyBlendingScene(name: string) { + return await this.doRpc( + new Protocol.ApplyBlendingSceneRequestEntity(name) + ); + } + public destory() { this.ws?.close(); if (this.ws) { diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts index be1d1d2..fc74613 100644 --- a/src/entities/WSProtocol.ts +++ b/src/entities/WSProtocol.ts @@ -526,6 +526,12 @@ export namespace Protocol { public static get kSetBlendingOption() { return Commands.PROTOCOL_PREFIX + "SetBlendingOption"; } + public static get kEnumBlendingScene() { + return Commands.PROTOCOL_PREFIX + "EnumBlendingScene"; + } + public static get kApplyBlendingScene() { + return Commands.PROTOCOL_PREFIX + "ApplyBlendingScene"; + } static _all_commands = new Set([ Commands.kUnKnowCommand, @@ -659,6 +665,8 @@ export namespace Protocol { Commands.kSetBlendingVerDensity, Commands.kResetBlending, Commands.kSetBlendingOption, + Commands.kEnumBlendingScene, + Commands.kApplyBlendingScene, ]); public static get AllCommands() { return this._all_commands; @@ -3484,4 +3492,39 @@ export namespace Protocol { id; value; } + + export class EnumBlendingSceneResponseEntity extends PacketEntity { + constructor() { + super(); + super.flag = PacketEntity.FLAG_RESPONSE; + } + + scenes = []; + } + + export class EnumBlendingSceneRequestEntity extends PacketEntity { + constructor( + rpc_id = 0 + ) { + super(); + super.command = Commands.kEnumBlendingScene; + super.flag = PacketEntity.FLAG_REQUEST; + super.rpc_id = rpc_id; + } + } + + export class ApplyBlendingSceneRequestEntity extends PacketEntity { + constructor( + name: string, + rpc_id = 0 + ) { + super(); + super.command = Commands.kApplyBlendingScene; + super.flag = PacketEntity.FLAG_REQUEST; + super.rpc_id = rpc_id; + + this.name = name ?? ""; + } + name; + } } From 6723d28701fe48d2d27a9c7263cecdcf8e173221 Mon Sep 17 00:00:00 2001 From: ljqing Date: Tue, 31 Jan 2023 10:34:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9id=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FusionSettingsDialog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue index 4364f37..f2f3263 100644 --- a/src/components/FusionSettingsDialog.vue +++ b/src/components/FusionSettingsDialog.vue @@ -204,7 +204,7 @@ export default defineComponent({ const EnableBlending = ref(false); let optionsstr = ref(); optionsstr.value = "FusionLocale"; - const hide_desktop_value_id = ref("0"); + const hide_desktop_value_id = ref("debug@show_mask"); const hide_desktop_value = ref(false); const disable_blending_params_id = ref("1"); const disable_blending_params = ref(false); From 2586774c4a453f53e65cfb3c27c5c7c39e3e3b57 Mon Sep 17 00:00:00 2001 From: ljqing Date: Tue, 31 Jan 2023 10:54:20 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=80=E5=A4=A7?= =?UTF-8?q?=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FusionSettings/FusionLocale.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue index 59f4aac..2fe8eef 100644 --- a/src/components/FusionSettings/FusionLocale.vue +++ b/src/components/FusionSettings/FusionLocale.vue @@ -104,7 +104,7 @@
-

p

@@ -112,7 +112,7 @@
-

gamma