diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index ada101b..4311aca 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -43,7 +43,7 @@
-
@@ -56,7 +56,7 @@
-
@@ -74,7 +74,7 @@
v-model="value[options_model_v].y" @update:model-value="chang(options_model_v, $event,'v')" lazy-rules />
-
+
@@ -85,7 +85,7 @@
v-model="value[options_model_h].x" @update:model-value="chang(options_model_h, $event,'h')" lazy-rules />
-
+
@@ -321,29 +321,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;
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index faa7db8..7820a74 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -5,7 +5,7 @@
@focus="isactivearray[0] = false" v-model="four[0].x" label="x" lazy-rules />
-
@@ -14,7 +14,7 @@
label="x" lazy-rules />
-
@@ -52,7 +52,7 @@
label="x" lazy-rules />
-
@@ -63,7 +63,7 @@
label="x" lazy-rules />
-
@@ -483,22 +483,26 @@ export default defineComponent({
isshowarray.value[index] = true;
}, 100);
};
- const reset = (index: number) => {
- isactivearray.value[index] = false;
+ const reset = (index: number, send: boolean) => {
+ send = send?? true;
+ isactivearray.value[index] = false;
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(() => {
@@ -508,8 +512,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) => {
diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index 56a2a81..0b18b4d 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/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]);
@@ -176,7 +176,7 @@ export default defineComponent({
set?.SetBlendingOption("blending_grids_show_column", RowsColumns[type] + "");
break;
case 2:
- set?.SetBlendingOption("blending_grids_show_center_line", RowsColumns[type] + "");
+ set?.SetBlendingOption("blending_grids_show_ellipse", RowsColumns[type] + "");
break;
case 3:
@@ -192,11 +192,11 @@ 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 ?? "#00000"
+ 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
+ RowsColumns[2] = server_conf.blending_grids_show_ellipse === "false" ? false : true
}
use_server_config()
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index f1bfb75..df319a9 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -8,7 +8,7 @@
v-model="nine[0].x" label="x" lazy-rules />
-
+
@@ -20,7 +20,7 @@
v-model="nine[1].x" label="x" lazy-rules />
-
+
@@ -28,7 +28,7 @@
@focus="isactivearray[4] = false" lazy-rules />
-
+
@@ -40,7 +40,7 @@
v-model="nine[2].x" label="x" lazy-rules />
-
+
@@ -52,7 +52,7 @@
v-model="nine[3].x" label="x" lazy-rules />
-
+
@@ -105,7 +105,7 @@
v-model="nine[5].x" label="x" lazy-rules />
-
+
@@ -119,7 +119,7 @@
v-model="nine[6].x" label="x" lazy-rules />
-
+
@@ -131,7 +131,7 @@
v-model="nine[7].x" label="x" lazy-rules />
-
+
@@ -143,7 +143,7 @@
v-model="nine[8].x" label="x" lazy-rules />
-
+
@@ -532,19 +532,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(() => {
@@ -553,8 +557,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],
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index a5461ed..8d555a8 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/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("")