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/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

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() diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue index 2726173..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); @@ -272,7 +272,6 @@ export default defineComponent({ sessionStorage.removeItem("FourPointCalibration"); sessionStorage.removeItem("GridSettings"); }, 500); - getconfig(); }; onBeforeMount(() => { 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; + } }