-
{ options_model = val }" :options="options" emit-value
map-options />
-
-
@@ -358,10 +358,61 @@ export default defineComponent({
}
}
+ /**
+ * 滚轮切换
+ * @param details
+ */
+ const is_active=ref(false);
+ const details_selsect=(details:any) => {
+ if(is_active){
+ let spt=details.deltaY/100
+ if(spt>0){
+ if(options_model.value>=value_point.value.length-1){
+ options_model.value=0
+ }else{
+ options_model.value++
+ }
+ }else{
+ if(options_model.value<=1){
+ options_model.value=value_point.value.length-1
+ }else{
+ options_model.value--
+ }
+
+ }
+ }
+ }
+
+ /**
+ * 滚轮改变数据
+ */
+ const details_selsect_val = (details: any, type: string) => {
+ let spt = details.deltaY / 100
+ switch (type) {
+ case 'x':
+ if (spt > 0) {
+ value.value[options_model.value].x++
+ } else {
+ value.value[options_model.value].x--
+ }
+ break;
+ default:
+ if (spt > 0) {
+ value.value[options_model.value].y++
+ } else {
+ value.value[options_model.value].y--
+ }
+ break;
+ }
+ chang(options_model.value,"","")
+ }
+
defineExpose({
options_model,
});
return {
+ is_active,
+ details_selsect,
resetall,
div,
max,
@@ -374,7 +425,8 @@ export default defineComponent({
reset,
value_point_amount,
chang_point_amount,
- options
+ options,
+ details_selsect_val
}
}
})
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index ad31408..7c4d431 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -257,6 +257,7 @@ export default defineComponent({
const save_set_cache = () => {
set_cache.value[selectedprojector.value] = JSON.stringify(array);
};
+
let config = JSON.parse($store.state.fusion_configuration).projectors[0];
const configselsect = computed(() => {
return $store.state.selected_projector;
@@ -387,11 +388,18 @@ export default defineComponent({
}
};
onMounted(() => {
- ste_status.value = 1;
- startconfig();
- setTimeout(() => {
+ set?.GetBlendingConfig("").then((res) => {
+ let tmp = JSON.parse(res ? res.config : "");
+ config = tmp.projectors[0];
+ ste_status.value = 1;
+ startconfig();
+ setTimeout(() => {
ste_status.value = 0;
}, 100);
+ })
+
+
+
}),
onBeforeUnmount(() => {
sessionStorage.FusionLocale = JSON.stringify(set_cache.value);
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index eb72f2f..c65fe3a 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -38,13 +38,13 @@
-
{ options_model = val }" :options="options" emit-value
map-options />
-
-
@@ -636,10 +636,62 @@ export default defineComponent({
value_point_amount.value = val ** 2
options_model.value = 1
}
+
+ /**
+ * 滚轮切换
+ * @param details
+ */
+ const is_active=ref(false);
+ const details_selsect=(details:any) => {
+ if(is_active){
+ let spt=details.deltaY/100
+ if(spt>0){
+ if(options_model.value>=value_point.value.length-1){
+ options_model.value=0
+ }else{
+ options_model.value++
+ }
+ }else{
+ if(options_model.value<=1){
+ options_model.value=value_point.value.length-1
+ }else{
+ options_model.value--
+ }
+
+ }
+ }
+ }
+
+ /**
+ * 滚轮改变数据
+ */
+ const details_selsect_val = (details: any, type: string) => {
+ let spt = details.deltaY / 100
+ switch (type) {
+ case 'x':
+ if (spt > 0) {
+ value.value[options_model.value].x++
+ } else {
+ value.value[options_model.value].x--
+ }
+ break;
+ default:
+ if (spt > 0) {
+ value.value[options_model.value].y++
+ } else {
+ value.value[options_model.value].y--
+ }
+ break;
+ }
+ chang(options_model.value,"","")
+ }
+
defineExpose({
options_model,
});
return {
+ is_active,
+ details_selsect,
resetall_all,
resetall,
div,
@@ -661,7 +713,8 @@ export default defineComponent({
add_dialog,
add,
now_amount,
- preview
+ preview,
+ details_selsect_val
}
}
})
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 709c472..687ea26 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -409,9 +409,11 @@ export default defineComponent({
break;
case 'FourPointCalibration':
tmp = '4'
+ set?.SetBlendingOption("blending_grids_control_point_count", `4`)
break;
case 'SurfaceCorrection':
tmp = '9'
+ //set?.SetBlendingOption("blending_grids_control_point_count", `${child.value!.value_point_amount}`)
set?.SetBlendingOption("blending_grids_select_point", `9:1`)
break;
case 'DensityCorrection':
@@ -489,11 +491,14 @@ 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
allconfig = JSON.parse($store.state.fusion_configuration);
if(allconfig.resolution){
for (let index = 0; index < allconfig.resolution.length; index++) {
- if(allconfig.resolution.width==allconfig.projector_width&&allconfig.resolution.height==allconfig.projector_height){
+ if(allconfig.resolution[index].width==allconfig.projector_width&&allconfig.resolution[index].height==allconfig.projector_height){
now_resolution.value=index
+
}
}
}else{
@@ -503,8 +508,11 @@ export default defineComponent({
});
get_scenes()
set?.SetBlendingOption("blending_grids_select_ui", "blending")
+
+ }, 100);
+ // setTimeout(() => {
optionsstr.value = "FusionLocale";
- }, 1000);
+ // }, 1000);
});
const save_cover_name = ref("")
const plan_list = [