diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index f61e155..9e61992 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -67,7 +67,7 @@
@@ -87,7 +87,7 @@
-
{ del_dialog = true }" text-color="black"
+ { del_dialog = true }" :disable="value_h_point_amount<=5" text-color="black"
:label="$t('reduce control points')" />
@@ -150,7 +150,8 @@ import {
computed,
watch,
nextTick,
- onBeforeUnmount
+ onBeforeUnmount,
+ defineExpose
} from "vue";
import { useStore } from "src/store";
import { useI18n } from "vue-i18n";
@@ -208,6 +209,8 @@ export default defineComponent({
};
const use_server_config = () => {
+ value_h_point_amount.value = 5
+ value_v_point_amount.value = 5
let a = 5
value_h.value = []
value_h_point.value = []
@@ -256,8 +259,8 @@ export default defineComponent({
value_v_point.value = []
deepcopy(value_h.value, tmp.value_h)
deepcopy(value_v.value, tmp.value_v)
- value_h_point_amount.value = Number(tmp.value_h_point_amount)
- value_v_point_amount.value = Number(tmp.value_v_point_amount)
+ value_h_point_amount.value = tmp.value_h_point_amount
+ value_v_point_amount.value = tmp.value_v_point_amount
deepcopy(value_h_point.value, tmp.value_h_point)
deepcopy(value_v_point.value, tmp.value_v_point)
recalculate_coordinates()
@@ -297,7 +300,7 @@ export default defineComponent({
use_server_config();
use_set_cache();
options_value_h_point_amount.value = Object.keys(config.multi_hor_density)
- options_value_v_point_amount.value = Object.keys(config.multi_ver_density)
+ options_value_v_point_amount.value = Object.keys(config.multi_ver_density)
setTimeout(() => {
ste_status.value = 0;
}, 100);
@@ -339,6 +342,7 @@ export default defineComponent({
} else {
set?.SetBlendingOption("blending_grids_select_ui", "ver_density")
}
+ save_set_cache()
}, { deep: true })
watch(() => value_h_point_amount, (newval, oldval) => {
set?.SetBlendingOption("blending_grids_control_point_count", `${newval.value}`)
@@ -347,6 +351,7 @@ export default defineComponent({
} else {
set?.SetBlendingOption("blending_grids_select_ui", "ver_density")
}
+ save_set_cache()
}, { deep: true })
watch(() => options_model_h, (newval, oldval) => {
@@ -368,6 +373,7 @@ export default defineComponent({
const chang_point_amount = (val: number, type: string) => {
start_point(val, type)
+ save_set_cache()
}
const dragStartHandle = ($event: any, index: number, type: string) => {
@@ -570,7 +576,7 @@ export default defineComponent({
let col = $store.getters.GetTheCurrentlySelectedCamera[1]
switch (type) {
case 'v':
- set?.AddBlendingCtrlPoint('ver_density', row, col, amount).then((res) => {
+ set?.AddBlendingCtrlPoint('ver_density', row, col, Number(amount)).then((res) => {
if (res == null || typeof (res) == "undefined") return
update(res?.config)
let tmp = JSON.parse(res?.config);
@@ -615,7 +621,7 @@ export default defineComponent({
});
break;
case 'h':
- set?.AddBlendingCtrlPoint('hor_density', row, col, amount).then((res) => {
+ set?.AddBlendingCtrlPoint('hor_density', row, col, Number(amount)).then((res) => {
if (res == null || typeof (res) == "undefined") return
update(res?.config)
let tmp = JSON.parse(res?.config);
@@ -700,7 +706,7 @@ export default defineComponent({
let col = $store.getters.GetTheCurrentlySelectedCamera[1]
switch (type) {
case 'v':
- set?.DelBlendingCtrlPoint('ver_density', row, col, amount).then((res) => {
+ set?.DelBlendingCtrlPoint('ver_density', row, col, Number(amount)).then((res) => {
if (res == null || typeof (res) == "undefined") return
let tmp = JSON.parse(res?.config);
let fortmp = null;
@@ -747,7 +753,7 @@ export default defineComponent({
});
break;
case 'h':
- set?.DelBlendingCtrlPoint('hor_density', row, col, amount).then((res) => {
+ set?.DelBlendingCtrlPoint('hor_density', row, col, Number(amount)).then((res) => {
if (res == null || typeof (res) == "undefined") return
let tmp = JSON.parse(res?.config);
let fortmp = null;
@@ -830,6 +836,11 @@ export default defineComponent({
let tmp = now_v_h.value == "vertical" ? "v" : "h"
add_control_points(Number(now_amount.value), tmp);
}
+ defineExpose({
+ now_v_h,
+ options_model_v,
+ options_model_h
+ });
return {
resetall,
div,
@@ -860,7 +871,8 @@ export default defineComponent({
add,
del_dialog,
add_dialog,
- now_amount
+ now_amount,
+ set_cache
}
}
})
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 88c0f28..265b4e2 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -61,7 +61,8 @@ import {
computed,
watch,
nextTick,
- onBeforeUnmount
+ onBeforeUnmount,
+ defineExpose
} from "vue";
import { useStore } from "src/store";
import { useI18n } from "vue-i18n";
@@ -353,6 +354,9 @@ export default defineComponent({
}
}
+ defineExpose({
+ options_model,
+ });
return {
resetall,
div,
diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index 0b18b4d..bc3aa3c 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -80,7 +80,7 @@
- {{ $t("center line color") }}
+ {{ $t("center circle color") }}
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index 60e6750..b044fb4 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -17,7 +17,7 @@