From 5c7ac2a7d073dccda009747c3aa2a0e403a913f9 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Thu, 23 Feb 2023 14:35:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=8D=E7=BD=AE=E6=97=B6?=
 =?UTF-8?q?=E4=B8=8D=E4=BF=9D=E5=AD=98=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FusionSettings/DensityCorrection.vue      | 199 +++++++++---------
 .../FusionSettings/FourPointCalibration.vue   |   1 +
 .../FusionSettings/SurfaceCorrection.vue      |  20 +-
 src/i18n/en-US/index.ts                       |   1 +
 src/i18n/zh-CN/index.ts                       |   3 +-
 5 files changed, 114 insertions(+), 110 deletions(-)

diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 581746f..143d74b 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -49,66 +49,68 @@
       <div class="col-5"><q-radio v-model="now_v_h" val="vertical" :label="$t('vertical')" /></div>
     </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-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-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 == 'vertical'">
-      <div class="col-1"></div>
-      <div class="col-3 q-px-md"  @mousewheel="details_selsect_v"> <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-3 q-px-md" @mousewheel="details_selsect_val($event,'v')" > <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-3">
-        <q-btn color="white" @click="reset(options_model_v, true, 'v')" text-color="black" :label="$t('reset')" />
+    <div>
+      <div class="row" v-show="now_v_h == 'vertical'">
+        <div class="col-1"></div>
+        <div class="col-2 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-2 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-2 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 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>
+      <div class="row" v-show="now_v_h == 'vertical'">
+        <div class="col-1"></div>
+        <div class="col-2 q-px-md" @mousewheel="details_selsect_v"> <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-px-md" @mousewheel="details_selsect_val($event, 'v')"> <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">
+          <q-btn color="white" @click="reset(options_model_v, true, 'v')" text-color="black" :label="$t('reset')" />
+        </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-3 q-pt-md "><q-btn color="white" @click="add_dialog = true" text-color="black"
-          :label="$t('add 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" v-show="now_v_h == 'level'">
-      <div class="col-1"></div>
-      <div class="col-3 q-px-md"  @mousewheel="details_selsect_h"> <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-3 q-px-md" @mousewheel="details_selsect_val($event,'h')"> <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="q-pt-md q-px-md col-5"> <q-btn color="white" @click="resetall" text-color="black"
+            :label="$t('reset all')+value_v_point_amount+$t('point')" /></div>
       </div>
-      <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>
+      <div class="row" v-show="now_v_h == 'level'">
+        <div class="col-1"></div>
+        <div class="col-2 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-2 q-pt-md "><q-btn color="white" @click="add_dialog = true" text-color="black"
+            :label="$t('add control points')" /></div>
+        <div class="col-2 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="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>
+      <div class="row" v-show="now_v_h == 'level'">
+        <div class="col-1"></div>
+        <div class="col-2 q-px-md" @mousewheel="details_selsect_h"> <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-px-md" @mousewheel="details_selsect_val($event, 'h')"> <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">
+          <q-btn color="white" @click="reset(options_model_h, true, 'h')" text-color="black" :label="$t('reset')" />
+        </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 class="q-pt-md q-px-md col-5"> <q-btn color="white" @click="resetall" text-color="black"
+            :label="$t('reset all')+value_h_point_amount+$t('point')" /></div>
+      </div>
     </div>
   </div>
   <div style="position: absolute;bottom: 0;">
@@ -145,7 +147,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>
@@ -592,6 +594,7 @@ export default defineComponent({
           break;
       }
       send_value(-1, 'v', 0);
+      save_set_cache()
     }
 
     /**
@@ -898,36 +901,36 @@ export default defineComponent({
      *  滚轮切换
      * @param details
      */
-    const details_selsect_v=(details:any) => {
-        let spt=details.deltaY/100
-        if(spt<0){
-          if(options_model_v.value>=value_v_point.value.length-1){
-            options_model_v.value=0
-          }else{
-            options_model_v.value++
-          }
-        }else{
-          if(options_model_v.value<=0){
-            options_model_v.value=value_v_point.value.length-1
-          }else{
-            options_model_v.value--
-          }
+    const details_selsect_v = (details: any) => {
+      let spt = details.deltaY / 100
+      if (spt < 0) {
+        if (options_model_v.value >= value_v_point.value.length - 1) {
+          options_model_v.value = 0
+        } else {
+          options_model_v.value++
+        }
+      } else {
+        if (options_model_v.value <= 0) {
+          options_model_v.value = value_v_point.value.length - 1
+        } else {
+          options_model_v.value--
+        }
       }
     }
-    const details_selsect_h=(details:any) => {
-        let spt=details.deltaY/100
-        if(spt<0){
-          if(options_model_h.value>=value_h_point.value.length-1){
-            options_model_h.value=0
-          }else{
-            options_model_h.value++
-          }
-        }else{
-          if(options_model_h.value<=0){
-            options_model_h.value=value_h_point.value.length-1
-          }else{
-            options_model_h.value--
-          }
+    const details_selsect_h = (details: any) => {
+      let spt = details.deltaY / 100
+      if (spt < 0) {
+        if (options_model_h.value >= value_h_point.value.length - 1) {
+          options_model_h.value = 0
+        } else {
+          options_model_h.value++
+        }
+      } else {
+        if (options_model_h.value <= 0) {
+          options_model_h.value = value_h_point.value.length - 1
+        } else {
+          options_model_h.value--
+        }
       }
     }
 
@@ -935,26 +938,26 @@ export default defineComponent({
      * v数据
      */
 
-     const details_selsect_val = (details: any, type: string) => {
+    const details_selsect_val = (details: any, type: string) => {
       let spt = details.deltaY / 100
       switch (type) {
         case 'v':
-      if (spt < 0) {
-        value_v.value[options_model_v.value].y++
-      } else {
-        value_v.value[options_model_v.value].y--
+          if (spt < 0) {
+            value_v.value[options_model_v.value].y++
+          } else {
+            value_v.value[options_model_v.value].y--
+          }
+          chang(options_model_v.value, value_v.value[options_model_v.value].y, "v")
+          break;
+        default:
+          if (spt < 0) {
+            value_h.value[options_model_h.value].x++
+          } else {
+            value_h.value[options_model_h.value].x--
+          }
+          chang(options_model_h.value, value_h.value[options_model_h.value].x, "h")
+          break;
       }
-      chang(options_model_v.value,value_v.value[options_model_v.value].y,"v")
-      break;
-      default:
-      if (spt < 0) {
-        value_h.value[options_model_h.value].x++
-      } else {
-        value_h.value[options_model_h.value].x--
-      }
-      chang(options_model_h.value,value_h.value[options_model_h.value].x,"h")
-        break;
-    }
 
     }
 
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index ff94ea7..b8a2593 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -339,6 +339,7 @@ export default defineComponent({
       value_point.value[index].x = Math.round(tmp.x)
       }
       send_value(-2,0,0)
+      save_set_cache()
     }
     const recalculate_coordinates = () => {
       try {
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index e953083..2bbd2c2 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -35,6 +35,9 @@
             :disable="value_point_amount <= 9" text-color="black" :label="$t('reduce control points')" /></div>
 
       </div>
+
+          <div class="q-pt-md q-px-md col-4"> <q-btn color="white" @click="resetall_all" text-color="black"
+          :label="$t('Reset all program control points')" /></div>
     </div>
     <div class="row">
       <div class="col-1"></div>
@@ -49,19 +52,13 @@
       </div>
       <div class="q-pt-md col-2">
         <q-btn color="white" @click="reset(options_model, true, 'h')" text-color="black" :label="$t('reset')" />
+
       </div>
-      <!-- <div class="col-2 q-pt-md ">
-        <div><q-btn color="white" @click="resetall" text-color="black" :label="$t('resetall')" /></div>
-      </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 class="q-pt-md q-px-md col-3"> <q-btn color="white" @click="resetall" text-color="black"
+          :label="$t('reset all')+value_point_amount+$t('point')" /></div>
     </div>
 
+
   </div>
   <q-dialog v-model="del_dialog">
     <q-card style="width: 700px; max-width: 80vw;">
@@ -419,6 +416,7 @@ export default defineComponent({
         value_point.value[index].x = Math.trunc(tmp.x)
       }
       send_value(-1, 0, 0)
+      save_set_cache()
     }
     const resetall_all = () => {
       for (let index = 0; index < value_point.value.length; index++) {
@@ -659,7 +657,7 @@ export default defineComponent({
         }
     }
 
-        /**
+    /**
      * 滚轮改变数据
      */
      const details_selsect_val = (details: any, type: string) => {
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 3f8ada5..b7341fc 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -499,4 +499,5 @@ export default {
   "fusion out": "Out",
   "Please enter the square number": "Please enter the square number",
   "Change projector layout": "Change projector layout",
+  "reset all":"reset all"
 };
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 0e7d1e8..0c83077 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -765,5 +765,6 @@ export default {
   normal: "普通",
   "fusion out": "出",
   "Please enter the square number":"请输入平方数",
-  "Change projector layout":"更改投影机布局"
+  "Change projector layout":"更改投影机布局",
+  "reset all":"重置所有"
 };