From 06dfea081553fefbe9dc2980f2a1551fcdbc1fad Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Thu, 16 Feb 2023 14:53:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A8=E6=80=81=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/DensityCorrection.vue      | 143 ++++++++++++------
 .../FusionSettings/FourPointCalibration.vue   |  10 +-
 .../FusionSettings/SurfaceCorrection.vue      |   9 +-
 src/components/FusionSettingsDialog.vue       |   6 +-
 src/i18n/en-US/index.ts                       |   4 +-
 src/i18n/zh-CN/index.ts                       |   4 +-
 6 files changed, 124 insertions(+), 52 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 9fa6dbc..fad4600 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -4,22 +4,20 @@
     <div class="col-10 q-pt-md">
       <div ref="div" style="width: 100%; background-color: #646464; height: 40vh">
         <div style="position: absolute">
-          <Vue3DraggableResizable v-show="now_v_h == 'vertical'"
-            :class="[options_model_v == index ? 'action' : 'point']" v-for="(item, index) in value_v_point.length"
-            :initW="point.w" :initH="point.h" :resizable="false" :x="0" v-model:y="value_v_point[index].y"
-            @activated="options_model_v = index; now_v_h = 'vertical'"
+          <Vue3DraggableResizable v-show="now_v_h == 'vertical'" :class="[options_model_v == index ? 'action' : 'point']"
+            v-for="(item, index) in value_v_point.length" :initW="point.w" :initH="point.h" :resizable="false" :x="0"
+            v-model:y="value_v_point[index].y" @activated="options_model_v = index; now_v_h = 'vertical'"
             @click="options_model_v = index; now_v_h = 'vertical'" @dragging="dragStartHandle($event, index, 'v')">
             <span>v{{
-              index+ 1
+              index + 1
             }}</span>
           </Vue3DraggableResizable>
-          <Vue3DraggableResizable v-show="now_v_h == 'vertical'"
-            :class="[options_model_v == index ? 'action' : 'point']" v-for="(item, index) in value_v_point.length"
-            :initW="point.w" :initH="point.h" :resizable="false" :x="max.x - 20"
-            @click="options_model_v = index; now_v_h = 'vertical'" v-model:y="value_v_point[index].y"
+          <Vue3DraggableResizable v-show="now_v_h == 'vertical'" :class="[options_model_v == index ? 'action' : 'point']"
+            v-for="(item, index) in value_v_point.length" :initW="point.w" :initH="point.h" :resizable="false"
+            :x="max.x - 20" @click="options_model_v = index; now_v_h = 'vertical'" v-model:y="value_v_point[index].y"
             @activated="options_model_v = index; now_v_h = 'vertical'" @dragging="dragStartHandle($event, index, 'v')">
             <span>v{{
-              index+ 1
+              index + 1
             }}</span>
           </Vue3DraggableResizable>
           <Vue3DraggableResizable v-show="now_v_h == 'level'" :class="[options_model_h == index ? 'action' : 'point']"
@@ -27,7 +25,7 @@
             v-model:x="value_h_point[index].x" :y="0" @activated="options_model_h = index; now_v_h = 'level'"
             @click="options_model_h = index; now_v_h = 'level'" @dragging="dragStartHandle($event, index, 'h')">
             <span>h{{
-              index+ 1
+              index + 1
             }}</span>
           </Vue3DraggableResizable>
           <Vue3DraggableResizable v-show="now_v_h == 'level'" :class="[options_model_h == index ? 'action' : 'point']"
@@ -35,7 +33,7 @@
             v-model:x="value_h_point[index].x" @activated="options_model_h = index; now_v_h = 'level'" :y="max.y - 20"
             @click="options_model_h = index; now_v_h = 'level'" @dragging="dragStartHandle($event, index, 'h')">
             <span>h{{
-              index+ 1
+              index + 1
             }}</span>
           </Vue3DraggableResizable>
         </div>
@@ -52,45 +50,60 @@
     </div>
     <div class="row" v-show="now_v_h == 'vertical'">
       <div class="col-1"></div>
-      <div class="col-2"> <q-select class="q-pt-md" :label="$t('vertical')"
+      <div class="col-3 q-px-md"> <q-select class="q-pt-md " :label="$t('vertical')"
           @update:model-value="(val) => { options_v = val }" :dense="true" filled v-model="options_model_v"
           :options="options_v" emit-value map-options /></div>
-      <div class="col-2"> <q-input v-if="value_v[options_model_v]" filled type="number" class="q-pt-md" :dense="true"
-          v-model="value_v[options_model_v].y" @update:model-value="chang(options_model_v, $event, 'v')" lazy-rules />
+      <div class="col-3 q-px-md"> <q-input v-if="value_v[options_model_v]" filled type="number" class="q-pt-md"
+          :dense="true" v-model="value_v[options_model_v].y" @update:model-value="chang(options_model_v, $event, 'v')"
+          lazy-rules />
       </div>
-      <div class="q-pt-md col-2">
+      <div class="q-pt-md  col-3">
         <q-btn color="white" @click="reset(options_model_v, true, 'v')" text-color="black" :label="$t('reset')" />
       </div>
-      <div class="col-2"> <q-select class="q-pt-md" :label="$t('vertical point')"
+
+    </div>
+    <div class="row" v-show="now_v_h == 'vertical'">
+      <div class="col-1"></div>
+      <div class="col-3 q-px-md"> <q-select class="q-pt-md" :label="$t('vertical point')"
           @update:model-value="(val) => { chang_point_amount(val, 'v') }" :dense="true" filled
           v-model="value_v_point_amount" :options="options_value_v_point_amount" emit-value map-options /></div>
-      <div class="col-1 q-pt-md "><q-btn color="white"
-          @click="add_dialog=true" text-color="black"
+      <div class="col-3 q-pt-md  q-px-md"><q-btn color="white" @click="add_dialog = true" text-color="black"
           :label="$t('add control points')" /></div>
-      <div class="col-1 q-pt-md "><q-btn color="white" @click="() => { del_dialog = true }" :disable="value_v_point_amount<=5" text-color="black"
-          :label="$t('reduce control points')" /></div>
+      <div class="col-3 q-pt-md q-px-md"><q-btn color="white" @click="() => { del_dialog = true }"
+          :disable="value_v_point_amount <= 5" text-color="black" :label="$t('reduce control points')" /></div>
     </div>
     <div class="row" v-show="now_v_h == 'level'">
       <div class="col-1"></div>
-      <div class="col-2"> <q-select class="q-pt-md" :label="$t('level')"
+      <div class="col-3 q-px-md"> <q-select class="q-pt-md" :label="$t('level')"
           @update:model-value="(val) => { options_h = val }" :dense="true" filled v-model="options_model_h"
           :options="options_h" emit-value map-options /></div>
-      <div class="col-2"> <q-input v-if="value_h[options_model_h]" filled type="number" class="q-pt-md" :dense="true"
-          v-model="value_h[options_model_h].x" @update:model-value="chang(options_model_h, $event, 'h')" lazy-rules />
+      <div class="col-3 q-px-md"> <q-input v-if="value_h[options_model_h]" filled type="number" class="q-pt-md"
+          :dense="true" v-model="value_h[options_model_h].x" @update:model-value="chang(options_model_h, $event, 'h')"
+          lazy-rules />
       </div>
-      <div class="q-pt-md col-2">
+      <div class="q-pt-md col-3">
         <q-btn color="white" @click="reset(options_model_h, true, 'h')" text-color="black" :label="$t('reset')" />
       </div>
-      <div class="col-2"> <q-select class="q-pt-md" :label="$t('level point')"
+
+    </div>
+    <div class="row" v-show="now_v_h == 'level'">
+      <div class="col-1"></div>
+      <div class="col-3 q-px-md"> <q-select class="q-pt-md" :label="$t('level point')"
           @update:model-value="(val) => { chang_point_amount(val, 'h') }" :dense="true" filled
           v-model="value_h_point_amount" :options="options_value_h_point_amount" emit-value map-options /></div>
-      <div class="col-1 q-pt-md "><q-btn color="white"
-          @click="add_dialog=true" text-color="black"
+      <div class="col-3 q-pt-md "><q-btn color="white" @click="add_dialog = true" text-color="black"
           :label="$t('add control points')" /></div>
-      <div class="col-1 q-pt-md "><q-btn color="white" @click="() => { del_dialog = true }" :disable="value_h_point_amount<=5" text-color="black"
-          :label="$t('reduce control points')" /></div>
+      <div class="col-3 q-pt-md "><q-btn color="white" @click="() => { del_dialog = true }"
+          :disable="value_h_point_amount <= 5" text-color="black" :label="$t('reduce control points')" /></div>
+
+    </div>
+    <div class="row">
+      <div class="col-1"></div>
+      <div class="q-pt-md q-px-md col-5"> <q-btn color="white" @click="resetall" text-color="black"
+          :label="$t('Reset the current program control point')" /></div>
+      <div class="q-pt-md q-px-md col-5"> <q-btn color="white" @click="resetall_all" text-color="black"
+          :label="$t('Reset all program control points')" /></div>
     </div>
-    <div class="q-pt-md"> <q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall')" /></div>
   </div>
   <div style="position: absolute;bottom: 0;">
     <q-checkbox v-model="auxiliary_line" @update:model-value="(value, evt) => { send_auxiliary_line(value) }"
@@ -126,8 +139,7 @@
         <q-btn flat :label="$t('ok')" @click="add" color="primary" v-close-popup />
       </q-card-actions>
     </q-card>
-  </q-dialog>
-
+</q-dialog>
 </template>
 
 <style scoped>
@@ -192,8 +204,8 @@ export default defineComponent({
     const now_v_h = ref("")
     const value_h_point_amount = ref(5)
     const value_v_point_amount = ref(5)
-    const add_dialog=ref(false)
-    const now_amount=ref(0)
+    const add_dialog = ref(false)
+    const now_amount = ref(0)
 
     const options_value_h_point_amount = ref(<string[]>[])
     const options_value_v_point_amount = ref(<string[]>[])
@@ -331,8 +343,12 @@ export default defineComponent({
     watch(() => now_v_h, (newval, oldval) => {
       if (newval.value == 'level') {
         set?.SetBlendingOption("blending_grids_select_ui", "hor_density")
+        set?.SetBlendingOption("blending_grids_control_point_count", `${value_h_point_amount.value}`)
+        set?.SetBlendingOption("blending_grids_select_point", `${options_model_h.value + 1}`)
       } else {
         set?.SetBlendingOption("blending_grids_select_ui", "ver_density")
+        set?.SetBlendingOption("blending_grids_control_point_count", `${value_v_point_amount.value}`)
+        set?.SetBlendingOption("blending_grids_select_point", `${options_model_v.value + 1}`)
       }
     }, { deep: true })
     watch(() => value_v_point_amount, (newval, oldval) => {
@@ -391,7 +407,7 @@ export default defineComponent({
       save_set_cache()
     }
 
-    const chang = (index: number, $event: any, type: string, send: boolean) => {
+    const chang = (index: number, $event: any, type: string, send?: boolean) => {
       $event = Number($event)
       if (type == 'v') {
         let tmp = coordinate_transformation_value_to_xy(0, $event)
@@ -541,7 +557,7 @@ export default defineComponent({
       save_set_cache()
     }
     const send_value = (index: number, type: string, value: number, send: boolean = true) => {
-	  if (!send) return;
+      if (!send) return;
       let row = $store.getters.GetTheCurrentlySelectedCamera[0]
       let col = $store.getters.GetTheCurrentlySelectedCamera[1]
       if (type == 'v') {
@@ -557,16 +573,52 @@ export default defineComponent({
           for (let index = 0; index < value_v_point_amount.value; index++) {
             reset(index, false, 'v')
           }
+          send_value(-1, 'v', 0);
           break;
         case 'level':
           for (let index = 0; index < value_h_point_amount.value; index++) {
             reset(index, false, 'h')
           }
+          send_value(-1, 'h', 0);
+          break;
+        default:
+          break;
+      }
+      send_value(-1, 'v', 0);
+    }
+
+    /**
+     * 重置全部为默认值
+     */
+    const resetall_all = () => {
+      switch (now_v_h.value) {
+        case 'vertical':
+          for (let key in config.multi_ver_density) {
+            for (let index = 0; index < config.multi_ver_density[key].length; index++) {
+              config.multi_ver_density[key][index].x = config.multi_ver_density[key][index].def_x
+              config.multi_ver_density[key][index].y = config.multi_ver_density[key][index].def_y
+            }
+            start_point(Number(key), 'v')
+          }
+          value_v_point_amount.value = 5
+          start_point(Number(5), 'v')
+          send_value(-2, 'v', 0);
+          break;
+        case 'level':
+          for (let key in config.multi_hor_density) {
+            for (let index = 0; index < config.multi_hor_density[key].length; index++) {
+              config.multi_hor_density[key][index].x = config.multi_hor_density[key][index].def_x
+              config.multi_hor_density[key][index].y = config.multi_hor_density[key][index].def_y
+            }
+            start_point(Number(key), 'h')
+          }
+          value_h_point_amount.value = 5
+          start_point(Number(5), 'h')
+          send_value(-2, 'h', 0);
           break;
         default:
           break;
       }
-	  send_value(-2, 'v', 0);
     }
     const del_dialog = ref(false)
     const add_control_points = (amount: number, type: string) => {
@@ -726,8 +778,8 @@ export default defineComponent({
             for (let key in tmpconfig.multi_ver_density) {
               options_value_v_point_amount.value.push(key)
             }
-            value_v_point_amount.value = Number(options_value_v_point_amount.value[options_value_v_point_amount.value.length-1])
-            amount=Number(options_value_v_point_amount.value[options_value_v_point_amount.value.length-1])
+            value_v_point_amount.value = Number(options_value_v_point_amount.value[options_value_v_point_amount.value.length - 1])
+            amount = Number(options_value_v_point_amount.value[options_value_v_point_amount.value.length - 1])
             // console.log(tmpconfig.multi_ver_density)
             // console.log(value_v_point_amount.value)
             // console.log(amount,'a')
@@ -749,7 +801,7 @@ export default defineComponent({
               }
               value_v_point.value.push(tmp_point)
             }
-            options_model_v.value=0
+            options_model_v.value = 0
           });
           break;
         case 'h':
@@ -773,8 +825,8 @@ export default defineComponent({
             for (let key in tmpconfig.multi_hor_density) {
               options_value_h_point_amount.value.push(key)
             }
-            value_h_point_amount.value = Number(options_value_h_point_amount.value[options_value_h_point_amount.value.length-1])
-            amount=Number(options_value_h_point_amount.value[options_value_h_point_amount.value.length-1])
+            value_h_point_amount.value = Number(options_value_h_point_amount.value[options_value_h_point_amount.value.length - 1])
+            amount = Number(options_value_h_point_amount.value[options_value_h_point_amount.value.length - 1])
             //value_h_point_amount.value = amount
             $store.commit("setfusion_configuration", res?.config);
             value_h.value = []
@@ -795,7 +847,7 @@ export default defineComponent({
               }
               value_h_point.value.push(tmp_point)
             }
-            options_model_h.value=0
+            options_model_h.value = 0
           });
           break;
         default:
@@ -872,7 +924,8 @@ export default defineComponent({
       del_dialog,
       add_dialog,
       now_amount,
-      set_cache
+      set_cache,
+      resetall_all
     }
   }
 })
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 265b4e2..98b417d 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -231,10 +231,8 @@ export default defineComponent({
     const chang = (index: number, $event: any, type: string) => {
       index = Number(index)
       let tmp = coordinate_transformation_value_to_xy(value.value[index].x, value.value[index].y)
-      console.log(tmp)
       value_point.value[index].y = Math.round(tmp.y)
       value_point.value[index].x = Math.round(tmp.x)
-      console.log(value_point.value[index])
       send_value(index, Math.round(value.value[index].x), Math.round(value.value[index].y))
 
       save_set_cache()
@@ -333,8 +331,14 @@ export default defineComponent({
     }
     const resetall = () => {
       for (let index = 0; index < value_point.value.length; index++) {
-        reset(index, true, 'v')
+        value.value[index].x = value.value[index].def_x
+      value.value[index].y = value.value[index].def_y
+      let tmp = coordinate_transformation_value_to_xy(value.value[index].x, value.value[index].y)
+      value_point.value[index].y = Math.round(tmp.y)
+      value_point.value[index].x = Math.round(tmp.x)
+        //reset(index, true, 'v')
       }
+      send_value(-2,0,0)
     }
     const recalculate_coordinates = () => {
       try {
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index b044fb4..bccdff5 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -381,9 +381,16 @@ export default defineComponent({
     }
     const resetall = () => {
       for (let index = 0; index < value_point.value.length; index++) {
-        reset(index, true, 'v')
+        value.value[index].x = value.value[index].def_x
+        value.value[index].y = value.value[index].def_y
+        let tmp = coordinate_transformation_value_to_xy(value.value[index].x, value.value[index].y)
+        value_point.value[index].y = Math.trunc(tmp.y)
+        value_point.value[index].x = Math.trunc(tmp.x)
+        // reset(index, true, 'v')
+
 
       }
+      send_value(-2,0,0)
     }
     const recalculate_coordinates = () => {
       try {
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 4f9ea05..d6bfbe5 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -233,6 +233,7 @@ export default defineComponent({
     const send_disable_blending_params = () => {
       set?.SetBlendingOption(disable_blending_params_id.value, disable_blending_params.value ? "1" : "0");
     };
+
     const child :any = ref(null);
     const send_show_blending_grids = () => {
       let tmp = ""
@@ -272,11 +273,14 @@ export default defineComponent({
           set?.SetBlendingOption("blending_grids_select_point", `9:${child.value!.options_model+1}`)
             break;
           case 'DensityCorrection':
-            console.log(child.value!.now_v_h)
+            //console.log(child.value!.now_v_h)
             if(child.value!.now_v_h=='vertical'){
               set?.SetBlendingOption("blending_grids_select_point", `${child.value!.options_model_v+1}`)
+              //value_h_point_amount
+              set?.SetBlendingOption("blending_grids_control_point_count", `${child.value!.value_v_point_amount}`)
             }else{
               set?.SetBlendingOption("blending_grids_select_point", `${child.value!.options_model_h+1}`)
+              set?.SetBlendingOption("blending_grids_control_point_count", `${child.value!.value_h_point_amount}`)
             }
             break;
           default:
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 6df0ffd..cfdad82 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -461,5 +461,7 @@ export default {
   "reduce control points":"delete control points",
   "OK to delete you will lose the data you adjusted now":"OK to delete you will lose the data you adjusted now",
   "Please enter the points you need to add":"Please enter the points you need to add",
-  "Whether to add control points":"Whether to add control points"
+  "Whether to add control points":"Whether to add control points",
+  "Reset all program control points":"Reset all program control points",
+  "Reset the current program control point":"Reset the current program control point"
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 028f14a..aa0d512 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -730,5 +730,7 @@ export default {
   "reduce control points":"删除",
   "OK to delete you will lose the data you adjusted now":"确定删除你将失去现在调整的数据",
   "Please enter the points you need to add":"请输入你所需要添加的点数",
-  "Whether to add control points":"是否添加控制点"
+  "Whether to add control points":"是否添加控制点",
+  "Reset all program control points":"重置全部方案控制点",
+  "Reset the current program control point":"重置当前方案控制点"
 };