From 946f2dda3f30354a099b759348e176fbaae6a9b8 Mon Sep 17 00:00:00 2001 From: miao <2514145421@qq.com> Date: Wed, 8 Mar 2023 17:28:53 +0800 Subject: [PATCH] Merge branch 'master_v2' of http://www.cloudview.work/git/fangxiang/media_player_client into master_v2 # Conflicts: # src/components/FusionSettings/FusionLocale.vue --- src/common/ClientConnection.ts | 6 +- .../FusionSettings/DensityCorrection.vue | 441 +++++++++++---- .../FusionSettings/FourPointCalibration.vue | 177 +++++- .../FusionSettings/GridSettings.vue | 44 +- .../FusionSettings/SurfaceCorrection.vue | 244 ++++++-- src/components/FusionSettingsDialog.vue | 526 ++++++++++++------ 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 + 11 files changed, 1089 insertions(+), 377 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/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue index 8504814..b3fd633 100644 --- a/src/components/FusionSettings/DensityCorrection.vue +++ b/src/components/FusionSettings/DensityCorrection.vue @@ -7,7 +7,8 @@ + @click="options_model_v = index; now_v_h = 'vertical'" :draggable="url.indexOf('pad') == -1" + @dragging="dragStartHandle($event, index, 'v')"> v{{ index + 1 }} @@ -15,7 +16,8 @@ + @activated="options_model_v = index; now_v_h = 'vertical'" :draggable="url.indexOf('pad') == -1" + @dragging="dragStartHandle($event, index, 'v')"> v{{ index + 1 }} @@ -23,7 +25,8 @@ + @click="options_model_h = index; now_v_h = 'level'" :draggable="url.indexOf('pad') == -1" + @dragging="dragStartHandle($event, index, 'h')"> h{{ index + 1 }} @@ -31,7 +34,8 @@ + @click="options_model_h = index; now_v_h = 'level'" :draggable="url.indexOf('pad') == -1" + @dragging="dragStartHandle($event, index, 'h')"> h{{ index + 1 }} @@ -40,7 +44,7 @@ -
+
@@ -55,11 +59,12 @@
-
-
@@ -68,53 +73,147 @@
-
+
+
-
+
-
-
-
-
-
+
-
+
+ + +
+
+
+
+ +
+
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+ + +
+
+ +
+ +
+
+
+ +
+
+
+
+
+
+
+
+ +
+
+
+ + +
+
+ +
+ +
+
+
+
+
-
@@ -141,21 +240,26 @@
-
+
+ :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) }" /> +
- + @@ -165,26 +269,41 @@ -
{{ $t('point') +(now_v_h == 'level'?options_model_h+1:options_model_v+1)}}
+ +
+
+ +
+
+ +
+
-
+
-
-
-
+
+
+
-
+
- + - + +