+
@@ -97,7 +97,8 @@ import {
computed,
watch,
nextTick,
- onBeforeUnmount
+ onBeforeUnmount,
+ defineExpose
} from "vue";
import { useStore } from "src/store";
import { useI18n } from "vue-i18n";
@@ -158,6 +159,7 @@ export default defineComponent({
};
const use_server_config = () => {
+ value_point_amount.value=9
let a = 9
value.value = []
value_point.value = []
@@ -241,6 +243,7 @@ export default defineComponent({
watch(() => value_point_amount, (newval, oldval) => {
set?.SetBlendingOption("blending_grids_control_point_count", `${newval.value}`)
+ save_set_cache()
}, { deep: true })
/**
@@ -423,6 +426,7 @@ export default defineComponent({
}
ste_status.value = 1;
tmpconfig = JSON.parse(JSON.stringify(fortmp));
+ config = JSON.parse(JSON.stringify(fortmp));
options_value_point_amount.value = []
for (let key in tmpconfig.multi_curved_surface) {
options_value_point_amount.value.push(key)
@@ -449,6 +453,7 @@ export default defineComponent({
});
}
const del_control_points = (amount: number) => {
+ let tmp=amount
if (amount <= 9) return
let cardinality = Math.sqrt(amount)
amount = (cardinality + -1) ** 2
@@ -456,7 +461,7 @@ export default defineComponent({
let row = $store.getters.GetTheCurrentlySelectedCamera[0]
let col = $store.getters.GetTheCurrentlySelectedCamera[1]
- set?.DelBlendingCtrlPoint('9', row, col, amount).then((res) => {
+ set?.DelBlendingCtrlPoint('9', row, col, Number(tmp)).then((res) => {
if (res == null || typeof (res) == "undefined") return
let tmp = JSON.parse(res?.config);
let fortmp = null;
@@ -471,12 +476,13 @@ export default defineComponent({
}
ste_status.value = 1;
tmpconfig = JSON.parse(JSON.stringify(fortmp));
+ config = JSON.parse(JSON.stringify(fortmp));
options_value_point_amount.value = []
for (let key in tmpconfig.multi_curved_surface) {
options_value_point_amount.value.push(key)
}
- value_point_amount.value = amount
- config = tmpconfig
+ value_point_amount.value = 9
+ amount=9
$store.commit("setfusion_configuration", res?.config);
value.value = []
value_point.value = []
@@ -494,8 +500,12 @@ export default defineComponent({
}
value_point.value.push(tmp_point)
}
+
});
}
+ defineExpose({
+ options_model,
+ });
return {
resetall,
div,
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 5e7abdc..4f9ea05 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -70,7 +70,7 @@
]" />
-
+
@@ -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 = ""
switch (optionsstr.value) {
@@ -246,7 +247,12 @@ export default defineComponent({
tmp = '9'
break;
case 'DensityCorrection':
- tmp = 'density'
+ if(child.value!.now_v_h=='vertical'){
+ tmp = 'ver_density'
+ }else{
+ tmp = 'hor_density'
+ }
+
break;
default:
break;
@@ -254,6 +260,29 @@ export default defineComponent({
set?.SetBlendingOption("blending_grids_select_ui", tmp)
set?.SetBlendingOption('blending_grids_select_projector', now_selsect_projector.value);
set?.SetBlendingOption(show_blending_grids_id.value, show_blending_grids.value ? "1" : "0");
+
+ switch (optionsstr.value) {
+ case 'FusionLocale':
+
+ break;
+ case 'FourPointCalibration':
+ set?.SetBlendingOption("blending_grids_select_point", `4:${child.value!.options_model+1}`)
+ break;
+ case 'SurfaceCorrection':
+ set?.SetBlendingOption("blending_grids_select_point", `9:${child.value!.options_model+1}`)
+ break;
+ case 'DensityCorrection':
+ 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}`)
+ }else{
+ set?.SetBlendingOption("blending_grids_select_point", `${child.value!.options_model_h+1}`)
+ }
+ break;
+ default:
+ break;
+ }
+
};
const resetall = () => {
set?.ResetBlendingConfig().then((res) => {
@@ -490,7 +519,8 @@ export default defineComponent({
record_times,
saveconfig,
isdebug,
- del_dialog
+ del_dialog,
+ child
};
},
});
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 184cc91..6df0ffd 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -458,7 +458,7 @@ export default {
"vertical point ":"vertical point amount",
"point amount":"point amount",
"add control points":"add control points",
- "reduce control points":"reduce control points",
+ "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"
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index ffc897e..028f14a 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -727,7 +727,7 @@ export default {
"vertical point":"垂直点数量",
"point amount":"点数量",
"add control points":"增加",
- "reduce control points":"减少",
+ "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":"是否添加控制点"