融合代码调整

src/components/FusionSettings/DensityCorrection.vue

@@ -314,29 +314,41 @@ export default defineComponent({
         index < config.hor_density.length + config.ver_density.length;
         index++
       ) {
-        reset(index);
-      }
+        reset(index, false);
+      }	  
+	  set?.SetBlendingVerDensity(
+          $store.getters.GetTheCurrentlySelectedCamera[0],
+          $store.getters.GetTheCurrentlySelectedCamera[1],
+          -1, 0
+        );
     };
-    const reset = (index: number) => {
+    const reset = (index: number, send: boolean) => {
+	  send = send?? true;
       if (index > 4) {
         value[index].x = config.hor_density[index - 5].def_x;
         value[index].y = config.hor_density[index - 5].def_y;
 
-        set?.SetBlendingHorDensity(
-          $store.getters.GetTheCurrentlySelectedCamera[0],
-          $store.getters.GetTheCurrentlySelectedCamera[1],
-          index - 5 + 1,
-          Number(value[index].x)
-        );
+        if (send)
+		{
+		  set?.SetBlendingHorDensity(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            index - 5 + 1,
+            Number(value[index].x)
+          );
+		}
       } else {
         value[index].x = config.ver_density[index].def_x;
         value[index].y = config.ver_density[index].def_y;
-        set?.SetBlendingVerDensity(
-          $store.getters.GetTheCurrentlySelectedCamera[0],
-          $store.getters.GetTheCurrentlySelectedCamera[1],
-          index + 1,
-          Number(value[index].y)
-        );
+		if (send)
+		{
+          set?.SetBlendingVerDensity(
+            $store.getters.GetTheCurrentlySelectedCamera[0],
+            $store.getters.GetTheCurrentlySelectedCamera[1],
+            index + 1,
+            Number(value[index].y)
+          );
+		}
       }
 
       point_postion[index].y = default_location[index].y;

src/components/FusionSettings/FourPointCalibration.vue

@@ -489,21 +489,25 @@ export default defineComponent({
         isshowarray.value[index] = true;
       }, 100);
     };
-    const reset = (index: number) => {
+    const reset = (index: number, send: boolean) => {
+	  send = send?? true;
       fourpostion.value[index].x = defaultfourpostion.value[index].x;
       fourpostion.value[index].y = defaultfourpostion.value[index].y;
 
       four[index].x = config.point4[index].def_x;
       four[index].y = config.point4[index].def_y;
 
-      set?.setBlendingCorrection(
-        $store.getters.GetTheCurrentlySelectedCamera[0],
-        $store.getters.GetTheCurrentlySelectedCamera[1],
-        4,
-        index + 1,
-        Number(config.point4[index].def_x),
-        Number(config.point4[index].def_y)
-      );
+	  if (send)
+	  {
+         set?.setBlendingCorrection(
+           $store.getters.GetTheCurrentlySelectedCamera[0],
+           $store.getters.GetTheCurrentlySelectedCamera[1],
+           4,
+           index + 1,
+           Number(config.point4[index].def_x),
+           Number(config.point4[index].def_y)
+         );
+	  }
 
       isshowarray.value[index] = false;
       setTimeout(() => {
@@ -513,8 +517,13 @@ export default defineComponent({
 
     const resetall = () => {
       for (let index = 0; index < fourpostion.value.length; index++) {
-        reset(index);
+        reset(index, false);
       }
+	  set?.setBlendingCorrection(
+        $store.getters.GetTheCurrentlySelectedCamera[0],
+        $store.getters.GetTheCurrentlySelectedCamera[1],
+        4, 0, 0, 0
+      );
     };
 
     const moveHandler_1 = (data: any) => {

src/components/FusionSettings/GridSettings.vue

@@ -141,7 +141,7 @@ export default defineComponent({
           set?.SetBlendingOption("blending_grids_background_color", color[index.value]);
           break;
         case 2:
-          set?.SetBlendingOption("blending_grids_center_line_color",color[index.value]);
+          set?.SetBlendingOption("blending_grids_ellipse_line_color",color[index.value]);
           break;
         case 3:
           //set?.SetBlendingOption("blending_grids_line_color",color[index.value]);
@@ -192,8 +192,8 @@ export default defineComponent({
       model[1] = server_conf.blending_grids_column ?? 40;
       model[2] = server_conf.blending_grids_line_width ?? 6;
       color[0] = server_conf.blending_grids_line_color ?? "#ffffff"
-      color[1] = server_conf.blending_grids_background_color ?? "#00ff5e"
-      color[2] = server_conf.blending_grids_center_line_color ?? "#3358de"
+      color[1] = server_conf.blending_grids_background_color ?? "#7f7f7f"
+      color[2] = server_conf.blending_grids_ellipse_line_color ?? "#0000ff"
       RowsColumns[0] = server_conf.blending_grids_show_row === "false" ? false : true
       RowsColumns[1] = server_conf.blending_grids_show_column === "false" ? false : true
       RowsColumns[2] = server_conf.blending_grids_show_center_line === "false" ? false : true

src/components/FusionSettings/SurfaceCorrection.vue

@@ -531,19 +531,23 @@ export default defineComponent({
         nine[index].y = config.point9[index].y;
       }
     };
-    const reset = (index: number) => {
+    const reset = (index: number, send: boolean) => {
+	  send = send?? true;
 
       nine[index].x = config.point9[index].def_x;
       nine[index].y = config.point9[index].def_y;
 
-      set?.setBlendingCorrection(
-        $store.getters.GetTheCurrentlySelectedCamera[0],
-        $store.getters.GetTheCurrentlySelectedCamera[1],
-        9,
-        index + 1,
-        Number(config.point9[index].def_x),
-        Number(config.point9[index].def_y)
-      );
+	  if (send)
+	  {
+        set?.setBlendingCorrection(
+          $store.getters.GetTheCurrentlySelectedCamera[0],
+          $store.getters.GetTheCurrentlySelectedCamera[1],
+          9,
+          index + 1,
+          Number(config.point9[index].def_x),
+          Number(config.point9[index].def_y)
+        );
+	  }
 
       isshowarray.value[index] = false;
       setTimeout(() => {
@@ -552,8 +556,13 @@ export default defineComponent({
     };
     const resetall = () => {
       for (let index = 0; index < nine.length; index++) {
-        reset(index);
+        reset(index, false);
       }
+      set?.setBlendingCorrection(
+        $store.getters.GetTheCurrentlySelectedCamera[0],
+        $store.getters.GetTheCurrentlySelectedCamera[1],
+        9, 0, 0, 0
+      );
     };
     watch(
       () => nine[0],

src/components/FusionSettingsDialog.vue

@@ -285,7 +285,7 @@ export default defineComponent({
     const EnableBlending = ref(false);
     let optionsstr = ref();
     optionsstr.value = "FusionLocale";
-    const disable_blending_params_id = ref("1");
+    const disable_blending_params_id = ref("blending@disable_blending_params");
     const disable_blending_params = ref(false);
     const show_blending_grids_id = ref("blending_grids_show");
     const show_blending_grids = ref(false);
@@ -312,7 +312,7 @@ export default defineComponent({
         let tmp = ""
         switch (newVal.value) {
           case 'FusionLocale':
-            tmp = '0'
+            tmp = "blending"
             break;
           case 'FourPointCalibration':
             tmp = '4'
@@ -326,7 +326,7 @@ export default defineComponent({
           default:
             break;
         }
-        set?.SetBlendingOption("blending_grids_select_ui", tmp)
+		if (tmp.length) set?.SetBlendingOption("blending_grids_select_ui", tmp)
       },
       { deep: true })
 
@@ -393,7 +393,7 @@ export default defineComponent({
 
         });
         get_scenes()
-        set?.SetBlendingOption("blending_grids_select_ui", '0')
+        set?.SetBlendingOption("blending_grids_select_ui", "blending")
       }, 1000);
     });
     const save_cover_name = ref("")