@@ -95,7 +95,7 @@
-
+ {preview(Math.sqrt(value_point_amount_tmp))}" color="primary" v-close-popup />
@@ -419,6 +419,7 @@ export default defineComponent({
save_set_cache()
}
const resetall_all = () => {
+ let amount_tmp=value_point_amount.value
for (let index = 0; index < value_point.value.length; index++) {
value.value[index].x = value.value[index].def_x
value.value[index].y = value.value[index].def_y
@@ -435,8 +436,8 @@ export default defineComponent({
}
start_point(Number(key))
}
- value_point_amount.value = 9
- start_point(Number(9))
+ value_point_amount.value = amount_tmp
+ start_point(Number(value_point_amount.value))
}
const recalculate_coordinates = () => {
@@ -480,7 +481,7 @@ export default defineComponent({
}
ste_status.value = 1;
tmpconfig = JSON.parse(JSON.stringify(fortmp));
- config = JSON.parse(JSON.stringify(fortmp));
+ config = fortmp
options_value_point_amount.value = []
for (let key in tmpconfig.multi_curved_surface) {
options_value_point_amount.value.push(key)
@@ -680,11 +681,15 @@ export default defineComponent({
}
chang(options_model.value,"","")
}
-
+ /**
+ * 在增加时 实现回退
+ */
+ const value_point_amount_tmp=ref(0)
defineExpose({
options_model,
});
return {
+ value_point_amount_tmp,
details_selsect,
resetall_all,
resetall,
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 094501d..431b9fd 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -50,10 +50,10 @@
{ set_resolution(val) }" :dense="true" filled v-model="now_resolution"
+ @update:model-value="(val) => { dialog(val,set_resolution) }" :dense="true" filled v-model="now_resolution"
:options="options_resolution" emit-value map-options />
{ send_projectorlayout(val) }" :dense="true" filled v-model="now_select_projectorlayout"
+ @update:model-value="(val) => { dialog(val,send_projectorlayout) }" :dense="true" filled v-model="now_select_projectorlayout"
:options="projectorlayout" emit-value map-options />
@@ -165,6 +165,22 @@
+
+
+
+
+ {{ $t('Do you confirm the modification') }}
+
+
+ {{ $t('Whether to delete') + name_to_be_deleted }}
+
+
+
+
+
+
+
+
@@ -450,7 +466,11 @@ export default defineComponent({
clear_sessionStorage()
}, 500);
//getconfig()
- options.value = "FusionLocale"
+ if (config.value.col == 1 && config.value.row == 1) {
+ optionsstr.value = "FourPointCalibration"
+ } else {
+ optionsstr.value = "FusionLocale";
+ }
};
/**
@@ -488,8 +508,12 @@ export default defineComponent({
config.value.col = tmp.col;
config.value.row = tmp.row;
$store.commit("setfusion_configuration", res?.config);
- config.value.col=tmp.col
- config.value.row=tmp.row
+
+ if(config.value.col==1&&config.value.row==1){
+ optionsstr.value = "FourPointCalibration"
+ }else{
+ optionsstr.value = "FusionLocale";
+ }
allconfig = JSON.parse($store.state.fusion_configuration);
if(allconfig.resolution){
for (let index = 0; index < allconfig.resolution.length; index++) {
@@ -511,7 +535,7 @@ export default defineComponent({
});
get_scenes()
set?.SetBlendingOption("blending_grids_select_ui", "blending")
- optionsstr.value = "FusionLocale";
+
}, 1000);
});
const save_cover_name = ref("")
@@ -624,13 +648,13 @@ export default defineComponent({
const btn_options = computed(() => {
let tmp=[]
+ tmp.push({label: $t.t('FourPointCalibration'), value: 'FourPointCalibration'})
+ tmp.push({label: $t.t('SurfaceCorrection'),value: 'SurfaceCorrection',})
if(now_select_projectorlayout.value!=0){
tmp.push({ label: $t.t('FusionLocale'), value: 'FusionLocale' })
}else{
optionsstr.value = "FourPointCalibration";
}
- tmp.push({label: $t.t('FourPointCalibration'), value: 'FourPointCalibration'})
- tmp.push({label: $t.t('SurfaceCorrection'),value: 'SurfaceCorrection',})
tmp.push({label: $t.t('DensityCorrection'),value: 'DensityCorrection',})
tmp.push({ label: $t.t('GridSettings'), value: 'GridSettings' })
return tmp
@@ -643,7 +667,39 @@ export default defineComponent({
let col = allconfig.projectors.length
return {col}
})
+ /**
+ * 弹窗
+ * 浅拷贝
+ */
+ const confirm=ref(false)
+ let dialog_data:any=null
+ const dialog=(parameter:any,fun:any)=>{
+ confirm.value=true
+ dialog_data={parameter,fun}
+ }
+ const trigger_dialog=()=>{
+ dialog_data.fun(dialog_data.parameter)
+ }
+ const re_match_data=()=>{
+ let tmp=allconfig
+ for (let index = 0; index < options_resolution.value.length; index++) {
+ let arr = options_resolution.value[index].label.split('*');
+ if(tmp.projector_width==Number(arr[0])&&tmp.projector_height==Number(arr[1])){
+ now_resolution.value=index
+ }
+ }
+ for (let index = 0; index < projectorlayout.length; index++) {
+ let arr = projectorlayout[index].label.split('x');
+ if(tmp.row==Number(arr[0])&&tmp.col==Number(arr[1])){
+ now_select_projectorlayout.value=index
+ }
+ }
+ }
return {
+ re_match_data,
+ trigger_dialog,
+ confirm,
+ dialog,
currently_selected_projector,
name_to_be_deleted,
dialog_del_scenes,
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index b7341fc..4941719 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -499,5 +499,6 @@ 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"
+ "reset all":"reset all",
+ "Do you confirm the modification":"Do you confirm the modification"
};
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 0c83077..634f544 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -766,5 +766,6 @@ export default {
"fusion out": "出",
"Please enter the square number":"请输入平方数",
"Change projector layout":"更改投影机布局",
- "reset all":"重置所有"
+ "reset all":"重置所有",
+ "Do you confirm the modification":"是否确认修改"
};