From 584f228c91895918644b71022cf9664c7df8a27b Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 6 Jan 2023 12:14:17 +0800
Subject: [PATCH 01/78] =?UTF-8?q?=E6=9B=B4=E6=94=B9=20=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FusionSettings/FourPointCalibration.vue | 85 ++++++++-----
.../FusionSettings/FusionLocale.vue | 38 +++---
.../FusionSettings/SurfaceCorrection.vue | 114 ++++++++++--------
src/components/FusionSettingsDialog.vue | 55 +++------
src/pages/TopToolBar.vue | 14 ++-
src/store/index.ts | 16 +--
6 files changed, 179 insertions(+), 143 deletions(-)
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 80f355e..1ab3fe4 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -70,6 +70,7 @@ import { useStore } from "src/store";
import { useI18n } from "vue-i18n";
import ClientConnection from "src/common/ClientConnection"
import GlobalData from "src/common/GlobalData";
+import { json } from "body-parser";
export default defineComponent({
name: "ComponentFourPointCalibration",
@@ -82,14 +83,15 @@ export default defineComponent({
const setIndexProjector = () => {
console.log($store.state.selected_projector);
};
+ let config=JSON.parse($store.state.fusion_configuration).projectors[0];
let set = GlobalData.getInstance().getCurrentClient();
- const for_1 = computed(() => { })
- let four = ref([{ x: 0, y: 1080 }, { x: 1920, y: 1080 }, { x: 0, y: 0 }, { x: 1920, y: 0 }]);
+ const configselsect = computed(() => {return $store.state.selected_projector})
+ let four = ref([{ x: config.point4[0].x, y: config.point4[0].y }, { x: config.point4[1].x, y: config.point4[1].y }, { x: config.point4[2].x, y: config.point4[2].x }, { x: config.point4[3].x, y: config.point4[3].y }]);
let defaultfour = ref([{ x: 0, y: 1080 }, { x: 1920, y: 1080 }, { x: 0, y: 0 }, { x: 1920, y: 0 }]);
let defaultfourpostion: any = ref([{ x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }]);
let fourpostion: any = ref([{ x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }, { x: 0, y: 0 }]);
let div: any = ref(null);
- let div2: any = ref(null);
+ // let div2: any = ref(null);
let options = ref(['10', '20', '30', '40', '50']);
let Proportion = ref({ x: 0, y: 0 });
let point1 = reactive({ x: 0, y: 0 });
@@ -103,7 +105,7 @@ export default defineComponent({
const { offset } = dom
const save=()=>{
-
+ set?.SaveBlendingConfig("")
}
const activeMouseDown = (index: number) => {
@@ -118,6 +120,7 @@ export default defineComponent({
})
const setpoa = () => {
+ console.log(config);
point1.x = 0
point1.y = 0
@@ -145,22 +148,22 @@ export default defineComponent({
fourpostion.value[3].x = div.value.offsetWidth - 25
fourpostion.value[3].y = div.value.offsetHeight - 25
-
- Proportion.value.x = 1920 / (div.value.offsetWidth - 25)
- Proportion.value.y = 1080 / (div.value.offsetHeight - 25)
+
+ Proportion.value.x = config.width / (div.value.offsetWidth - 25)
+ Proportion.value.y = config.height / (div.value.offsetHeight - 25)
for (let index = 0; index < fourpostion.value.length; index++) {
defaultfourpostion.value[index].x = fourpostion.value[index].x ;
defaultfourpostion.value[index].y = fourpostion.value[index].y;
- defaultfour.value[index].x=four.value[index].x
- defaultfour.value[index].y=four.value[index].y
+ defaultfour.value[index].x=config.point4[index].def_x
+ defaultfour.value[index].y=config.point4[index].def_y
}
}
watch(() => four.value[0], (newVal, oldVal) => {
- if($store.state.EnableBlending)set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 1, Number(newVal.x), Number(newVal.y));
+ if($store.state.enablefusion)set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 1, Number(newVal.x), Number(newVal.y));
///
if (!isactivearray.value[0]) {
let x = Math.ceil(newVal.x / Proportion.value.x);
- let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+ let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
x1.value = x
y1.value = y
isshowarray.value[0] = false
@@ -172,11 +175,11 @@ export default defineComponent({
}
}, { deep: true })
watch(() => four.value[1], (newVal, oldVal) => {
- if($store.state.EnableBlending)set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 2, Number(newVal.x), Number(newVal.y));
+ if($store.state.enablefusion)set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 2, Number(newVal.x), Number(newVal.y));
///
if (!isactivearray.value[1]) {
let x = Math.ceil(newVal.x / Proportion.value.x);
- let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+ let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
point2.value.x = x
point2.value.y = y
isshowarray.value[1] = false
@@ -188,11 +191,11 @@ export default defineComponent({
///
}, { deep: true })
watch(() => four.value[2], (newVal, oldVal) => {
- if($store.state.EnableBlending)set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 3, Number(newVal.x), Number(newVal.y));
+ if($store.state.enablefusion)set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 3, Number(newVal.x), Number(newVal.y));
///
if (!isactivearray.value[2]) {
let x = Math.ceil(newVal.x / Proportion.value.x);
- let y = Math.ceil((1080 / Proportion.value.y) - (newVal.y / Proportion.value.y));
+ let y = Math.ceil((config.height / Proportion.value.y) - (newVal.y / Proportion.value.y));
point3.value.x = x
point3.value.y = y
@@ -204,11 +207,11 @@ export default defineComponent({
///
}, { deep: true })
watch(() => four.value[3], (newVal, oldVal) => {
- if($store.state.EnableBlending)set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 4, Number(newVal.x), Number(newVal.y));
+ if($store.state.enablefusion)set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 4, 4, Number(newVal.x), Number(newVal.y));
///
if (!isactivearray.value[3]) {
let x = Math.ceil(newVal.x / Proportion.value.x);
- let y = Math.ceil((1080 / Proportion.value.y) - (newVal.y / Proportion.value.y));
+ let y = Math.ceil((config.height / Proportion.value.y) - (newVal.y / Proportion.value.y));
point4.value.x = x
point4.value.y = y
@@ -221,9 +224,23 @@ export default defineComponent({
}, { deep: true })
///
+
+ watch(() => configselsect, (newVal, oldVal) => {
+ //console.log(newVal);
+ let tmp=JSON.parse($store.state.fusion_configuration);
+ let fortmp=null
+ let i
+ for(i of tmp.projectors){
+ if(i.col===$store.getters.GetTheCurrentlySelectedCamera[0]&&i.row===$store.getters.GetTheCurrentlySelectedCamera[1]){
+ fortmp=JSON.parse(JSON.stringify(i))
+ }
+ }
+ config=JSON.parse(JSON.stringify(fortmp))
+ console.log(config)
+ }, { deep: true })
+
const reset = (index: number) => {
if (index == 0) {
- console.log(x1.value + "," + y1.value)
four.value[0].x = 0
four.value[0].y = 1080
point1.x = 0
@@ -249,6 +266,10 @@ export default defineComponent({
fourpostion.value[3].x = div.value.offsetWidth - 25
fourpostion.value[3].y = div.value.offsetHeight - 25
}
+ // auto set config
+ four.value[index].x = config.point4[index].def_x
+ four.value[index].y = config.point4[index].def_y
+
isshowarray.value[index] = false
setTimeout(() => {
isshowarray.value[index] = true
@@ -260,7 +281,6 @@ export default defineComponent({
for (let index = 0; index < fourpostion.value.length; index++) {
fourpostion.value[index].x=defaultfourpostion.value[index].x
fourpostion.value[index].y=defaultfourpostion.value[index].y
- console.log("ok");
four.value[index].x=defaultfour.value[index].x
four.value[index].y=defaultfour.value[index].y
@@ -273,38 +293,37 @@ export default defineComponent({
const moveHandler_1 = (data: any) => {
let x = Math.ceil((data.left - fourpostion.value[0].x) * Proportion.value.x + 0);
- let y = Math.ceil((1080 - data.top * Proportion.value.y - fourpostion.value[0].y));
+ let y = Math.ceil((config.height - data.top * Proportion.value.y - fourpostion.value[0].y));
- four.value[0].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
- four.value[0].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y;
+ four.value[0].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+ four.value[0].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
isactivearray.value[0] = true
}
const moveHandler_2 = (data: any) => {
- //y0 x1920
- let x = Math.ceil((data.left - fourpostion.value[1].x) * Proportion.value.x + 1920);
- let y = Math.ceil((1080 - data.top * Proportion.value.y - fourpostion.value[1].y));
- four.value[1].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
- four.value[1].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y;
+ //y0 xconfig.width
+ let x = Math.ceil((data.left - fourpostion.value[1].x) * Proportion.value.x + config.width);
+ let y = Math.ceil((config.height - data.top * Proportion.value.y - fourpostion.value[1].y));
+ four.value[1].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+ four.value[1].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
//console.log("x :"+x+" y:"+y)
}
const moveHandler_3 = (data: any) => {
let x = Math.ceil((data.left - fourpostion.value[2].x) * Proportion.value.x);
let y = Math.abs(Math.ceil((data.top - fourpostion.value[2].y) * Proportion.value.y));
- four.value[2].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
- four.value[2].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y;
+ four.value[2].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+ four.value[2].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
console.log("x :" + x + " y:" + y)
//console.log("x :" + data.left + " y:" + (1370-data.top));
}
const moveHandler_4 = (data: any) => {
- let x = Math.ceil((data.left - fourpostion.value[3].x) * Proportion.value.x + 1920);
+ let x = Math.ceil((data.left - fourpostion.value[3].x) * Proportion.value.x + config.width);
let y = Math.abs(Math.ceil((data.top - fourpostion.value[3].y) * Proportion.value.y));
- four.value[3].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
- four.value[3].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y;
+ four.value[3].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+ four.value[3].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
//console.log("x :"+x+" y:"+y)
}
return {
div,
- div2,
options,
fourpostion,
reset,
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 3ff5a22..b3d0e37 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -208,7 +208,7 @@ export default defineComponent({
const age = ref(0);
const standard = ref(0);
const group = ref(4);
- const EnableBlending=ref(false);
+ const enablefusion=ref(false);
let array: any = ref([
{ alpha: 0, p: 0, gamma: 0 },
{ alpha: 0, p: 0, gamma: 0 },
@@ -260,7 +260,7 @@ export default defineComponent({
});
const chang = (type: string) => {
if (type == "alpha") {
- if($store.state.EnableBlending)set?.setBlendingAlphaParam(
+ if($store.state.enablefusion)set?.setBlendingAlphaParam(
$store.getters.GetTheCurrentlySelectedCamera[0],
$store.getters.GetTheCurrentlySelectedCamera[1],
group.value,
@@ -268,15 +268,15 @@ export default defineComponent({
);
}
if (type == "p") {
- if($store.state.EnableBlending)set?.setBlendingPowerParam(
+ if($store.state.enablefusion)set?.setBlendingPowerParam(
$store.getters.GetTheCurrentlySelectedCamera[0],
$store.getters.GetTheCurrentlySelectedCamera[1],
group.value,
array.value[group.value].p
);
}
- if($store.state.EnableBlending)if (type == "gamma") {
- set?.setBlendingGammaParam(
+ if (type == "gamma") {
+ if($store.state.enablefusion)set?.setBlendingGammaParam(
$store.getters.GetTheCurrentlySelectedCamera[0],
$store.getters.GetTheCurrentlySelectedCamera[1],
group.value,
@@ -289,7 +289,7 @@ export default defineComponent({
watch(
() => array2[0][0],
(newVal, oldVal) => {
- if($store.state.EnableBlending)set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],1,array2[0][0].isshow,Number(array2[0][0].value));
+ if($store.state.enablefusion)set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],1,array2[0][0].isshow,Number(array2[0][0].value));
if(!array2[0][0].isshow){
array2[0][0].value=0
}
@@ -299,7 +299,7 @@ export default defineComponent({
watch(
() => array2[0][1],
(newVal, oldVal) => {
- if($store.state.EnableBlending)set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],0,array2[0][1].isshow,Number(array2[0][1].value));
+ if($store.state.enablefusion)set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],0,array2[0][1].isshow,Number(array2[0][1].value));
if(!array2[0][1].isshow){
array2[0][1].value=0
}
@@ -309,7 +309,7 @@ export default defineComponent({
watch(
() => array2[0][2],
(newVal, oldVal) => {
- if($store.state.EnableBlending)set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],2,array2[0][2].isshow,Number(array2[0][2].value));
+ if($store.state.enablefusion)set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],2,array2[0][2].isshow,Number(array2[0][2].value));
if(!array2[0][2].isshow){
array2[0][2].value=0
}
@@ -319,7 +319,7 @@ export default defineComponent({
watch(
() => array2[0][3],
(newVal, oldVal) => {
- if($store.state.EnableBlending)set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],3,array2[0][3].isshow,Number(array2[0][3].value));
+ if($store.state.enablefusion)set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],3,array2[0][3].isshow,Number(array2[0][3].value));
if(!array2[0][3].isshow){
array2[0][3].value=0
}
@@ -332,7 +332,7 @@ export default defineComponent({
watch(
() => array2[1][0],
(newVal, oldVal) => {
- if($store.state.EnableBlending) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],1,array2[1][0].isshow,Number(array2[1][0].value));
+ if($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],1,array2[1][0].isshow,Number(array2[1][0].value));
if(!array2[1][0].isshow){
array2[1][0].value=0
}
@@ -342,7 +342,7 @@ watch(
watch(
() => array2[1][1],
(newVal, oldVal) => {
- if($store.state.EnableBlending) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],0,array2[1][1].isshow,Number(array2[1][2].value));
+ if($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],0,array2[1][1].isshow,Number(array2[1][1].value));
if(!array2[1][1].isshow){
array2[1][1].value=0
}
@@ -352,7 +352,7 @@ watch(
watch(
() => array2[1][2],
(newVal, oldVal) => {
- if($store.state.EnableBlending) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],2,array2[1][2].isshow,Number(array2[1][2].value));
+ if($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],2,array2[1][2].isshow,Number(array2[1][2].value));
if(!array2[1][2].isshow){
array2[1][2].value=0
}
@@ -362,7 +362,7 @@ watch(
watch(
() => array2[1][3],
(newVal, oldVal) => {
- if($store.state.EnableBlending) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],3,array2[1][3].isshow,Number(array2[1][3].value));
+ if($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1],3,array2[1][3].isshow,Number(array2[1][3].value));
if(!array2[1][3].isshow){
array2[1][3].value=0
}
@@ -372,14 +372,14 @@ watch(
///
watch(
- () => EnableBlending,
+ () => enablefusion,
(newVal, oldVal) => {
- $store.commit('setEnableBlending',newVal.value);
+ $store.commit('setenablefusion',newVal.value);
set?.EnableBlending(newVal.value);
},{ deep: true }
);
- const changEnableBlending=()=>{
- $store.commit('setEnableBlending',EnableBlending.value);
+ const changenablefusion=()=>{
+ $store.commit('setenablefusion',enablefusion.value);
}
return {
model,
@@ -391,9 +391,9 @@ watch(
text,
array,
chang,
- EnableBlending,
+ enablefusion,
array2,
- changEnableBlending,
+ changenablefusion,
selectedprojector
};
},
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index a7b86a1..c433680 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -162,6 +162,8 @@ export default defineComponent({
const setIndexProjector = () => {
console.log($store.state.selected_projector);
};
+ let config=JSON.parse($store.state.fusion_configuration).projectors[0];
+ const configselsect = computed(() => {return $store.state.selected_projector})
let Proportion = ref({ x: 0, y: 0 });
let centor = ref({ x: 0, y: 0 });
const div = ref();
@@ -177,67 +179,80 @@ export default defineComponent({
let defaultninepostion: any = ref([{ x: 0, y: 1920 }, { x: 960, y: 1920 }, { x: 1080, y: 1920 }, { x: 0, y: 540 }, { x: 960, y: 540 }, { x: 1080, y: 540 }, { x: 0, y: 0 }, { x: 540, y: 0 }, { x: 1080, y: 0 }]);
const moveHandler_1 = (data: any) => {
let x = Math.ceil((data.left - ninepostion.value[0].x) * Proportion.value.x);
- let y = 1080 - Math.ceil((data.top - ninepostion.value[0].y) * Proportion.value.y);
+ let y = config.height - Math.ceil((data.top - ninepostion.value[0].y) * Proportion.value.y);
- nine.value[0].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
- nine.value[0].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y
+ nine.value[0].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+ nine.value[0].y = y > config.height ? config.height : y && y < 0 ? 0 : y
}
const moveHandler_2 = (data: any) => {
let x = 960 + Math.ceil((data.left - ninepostion.value[1].x) * centor.value.x);
- let y = 1080 - Math.ceil((data.top - ninepostion.value[1].y) * Proportion.value.y);
+ let y = config.height - Math.ceil((data.top - ninepostion.value[1].y) * Proportion.value.y);
- nine.value[1].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
- nine.value[1].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y
+ nine.value[1].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+ nine.value[1].y = y > config.height ? config.height : y && y < 0 ? 0 : y
}
const moveHandler_3 = (data: any) => {
- let x = 1920 + Math.ceil((data.left - ninepostion.value[2].x) * Proportion.value.x);
- let y = 1080 - Math.ceil((data.top - ninepostion.value[2].y) * Proportion.value.y);
+ let x = config.width + Math.ceil((data.left - ninepostion.value[2].x) * Proportion.value.x);
+ let y = config.height - Math.ceil((data.top - ninepostion.value[2].y) * Proportion.value.y);
- nine.value[2].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
- nine.value[2].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y
+ nine.value[2].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+ nine.value[2].y = y > config.height ? config.height : y && y < 0 ? 0 : y
}
const moveHandler_4 = (data: any) => {
let x = Math.ceil((data.left - ninepostion.value[3].x) * Proportion.value.x);
let y = 530 - Math.ceil((data.top - ninepostion.value[3].y) * Proportion.value.y);
- nine.value[3].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
- nine.value[3].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y
+ nine.value[3].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+ nine.value[3].y = y > config.height ? config.height : y && y < 0 ? 0 : y
}
const moveHandler_5 = (data: any) => {
let x = 960 + Math.ceil((data.left - ninepostion.value[4].x) * centor.value.x);
let y = 530 - Math.ceil((data.top - ninepostion.value[4].y) * Proportion.value.y);
- nine.value[4].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
- nine.value[4].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y
+ nine.value[4].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+ nine.value[4].y = y > config.height ? config.height : y && y < 0 ? 0 : y
}
const moveHandler_6 = (data: any) => {
- let x = 1920 + Math.ceil((data.left - ninepostion.value[5].x) * Proportion.value.x);
+ let x = config.width + Math.ceil((data.left - ninepostion.value[5].x) * Proportion.value.x);
let y = 530 - Math.ceil((data.top - ninepostion.value[5].y) * Proportion.value.y);
- nine.value[5].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
- nine.value[5].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y
+ nine.value[5].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+ nine.value[5].y = y > config.height ? config.height : y && y < 0 ? 0 : y
}
const moveHandler_7 = (data: any) => {
let x = Math.ceil((data.left - ninepostion.value[6].x) * Proportion.value.x);
let y = Math.abs(Math.ceil((data.top - ninepostion.value[6].y) * Proportion.value.y));
- nine.value[6].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
- nine.value[6].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y
+ nine.value[6].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+ nine.value[6].y = y > config.height ? config.height : y && y < 0 ? 0 : y
}
const moveHandler_8 = (data: any) => {
let x = 960 + Math.ceil((data.left - ninepostion.value[7].x) * Proportion.value.x);
let y = Math.abs(Math.ceil((data.top - ninepostion.value[7].y) * Proportion.value.y));;
- nine.value[7].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
- nine.value[7].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y
+ nine.value[7].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+ nine.value[7].y = y > config.height ? config.height : y && y < 0 ? 0 : y
}
const moveHandler_9 = (data: any) => {
- let x = 1920 + Math.ceil((data.left - ninepostion.value[8].x) * Proportion.value.x);
+ let x = config.width + Math.ceil((data.left - ninepostion.value[8].x) * Proportion.value.x);
let y = Math.abs(Math.ceil((data.top - ninepostion.value[8].y) * Proportion.value.y));
- nine.value[8].x = x > 1920 ? 1920 : x && x < 0 ? 0 : x;
- nine.value[8].y = y > 1080 ? 1080 : y && y < 0 ? 0 : y
+ nine.value[8].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
+ nine.value[8].y = y > config.height ? config.height : y && y < 0 ? 0 : y
}
+ watch(() => configselsect, (newVal, oldVal) => {
+ //console.log(newVal);
+ let tmp=JSON.parse($store.state.fusion_configuration);
+ let fortmp=null
+ let i
+ for(i of tmp.projectors){
+ if(i.col===$store.getters.GetTheCurrentlySelectedCamera[1]&&i.row===$store.getters.GetTheCurrentlySelectedCamera[0]){
+ fortmp=JSON.parse(JSON.stringify(i))
+ }
+ }
+ config=JSON.parse(JSON.stringify(fortmp))
+ console.log(config)
+ }, { deep: true })
onMounted(() => {
startpostion();
@@ -270,11 +285,11 @@ export default defineComponent({
ninepostion.value[8].x = div.value.offsetWidth - 25
ninepostion.value[8].y = div.value.offsetHeight - 25
- Proportion.value.x = 1920 / (div.value.offsetWidth - 25)
- Proportion.value.y = 1080 / (div.value.offsetHeight - 25)
+ Proportion.value.x = config.width / (div.value.offsetWidth - 25)
+ Proportion.value.y = config.height / (div.value.offsetHeight - 25)
- centor.value.x = 2160 / (div.value.offsetWidth + 25)
- centor.value.y = 3840 / (div.value.offsetHeight + 25)
+ centor.value.x = config.width *2 / (div.value.offsetWidth + 25)
+ centor.value.y = config.height*2 / (div.value.offsetHeight + 25)
for (let index = 0; index < defaultninepostion.value.length; index++) {
defaultninepostion.value[index].x = ninepostion.value[index].x;
@@ -344,6 +359,9 @@ export default defineComponent({
ninepostion.value[8].x = div.value.offsetWidth - 25
ninepostion.value[8].y = div.value.offsetHeight - 25
}
+ //data is flase
+ // nine.value[index].x = config.point9[index].def_x
+ // nine.value[index].y = config.point9[index].def_y
isshowarray.value[index] = false
setTimeout(() => {
isshowarray.value[index] = true
@@ -366,78 +384,78 @@ export default defineComponent({
}
///
watch(() => nine.value[0], (newVal, oldVal) => {
- if($store.state.EnableBlending) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 1, Number(newVal.x), Number(newVal.y));
+ if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 1, Number(newVal.x), Number(newVal.y));
///
if (!isactivearray.value[0]) {
let x = Math.ceil(newVal.x / Proportion.value.x);
- let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+ let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
setdianposin(0, x, y)
}
///
}, { deep: true })
watch(() => nine.value[1], (newVal, oldVal) => {
- if($store.state.EnableBlending) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 2, Number(newVal.x), Number(newVal.y));
+ if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 2, Number(newVal.x), Number(newVal.y));
///
if (!isactivearray.value[1]) {
let x = Math.ceil(newVal.x / Proportion.value.x);
- let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+ let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
setdianposin(1, x, y)
}
///
}, { deep: true })
watch(() => nine.value[2], (newVal, oldVal) => {
- if($store.state.EnableBlending) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 3, Number(newVal.x), Number(newVal.y));
+ if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 3, Number(newVal.x), Number(newVal.y));
if (!isactivearray.value[2]) {
let x = Math.ceil(newVal.x / Proportion.value.x);
- let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+ let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
setdianposin(2, x, y)
}
}, { deep: true })
watch(() => nine.value[3], (newVal, oldVal) => {
- if($store.state.EnableBlending) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 4, Number(newVal.x), Number(newVal.y));
+ if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 4, Number(newVal.x), Number(newVal.y));
if (!isactivearray.value[3]) {
let x = Math.ceil(newVal.x / Proportion.value.x);
- let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+ let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
setdianposin(3, x, y)
}
}, { deep: true })
watch(() => nine.value[4], (newVal, oldVal) => {
- if($store.state.EnableBlending) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 5, Number(newVal.x), Number(newVal.y));
+ if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 5, Number(newVal.x), Number(newVal.y));
if (!isactivearray.value[4]) {
let x = Math.ceil(newVal.x / Proportion.value.x);
- let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+ let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
setdianposin(4, x, y)
}
}, { deep: true })
watch(() => nine.value[5], (newVal, oldVal) => {
- if($store.state.EnableBlending) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 6, Number(newVal.x), Number(newVal.y));
+ if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 6, Number(newVal.x), Number(newVal.y));
if (!isactivearray.value[5]) {
let x = Math.ceil(newVal.x / Proportion.value.x);
- let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+ let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
setdianposin(5, x, y)
}
}, { deep: true })
watch(() => nine.value[6], (newVal, oldVal) => {
- if($store.state.EnableBlending) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 7, Number(newVal.x), Number(newVal.y));
+ if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 7, Number(newVal.x), Number(newVal.y));
if (!isactivearray.value[6]) {
let x = Math.ceil(newVal.x / Proportion.value.x);
- let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+ let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
setdianposin(6, x, y)
}
}, { deep: true })
watch(() => nine.value[7], (newVal, oldVal) => {
- if($store.state.EnableBlending) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 8, Number(newVal.x), Number(newVal.y));
+ if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 8, Number(newVal.x), Number(newVal.y));
if (!isactivearray.value[7]) {
let x = Math.ceil(newVal.x / Proportion.value.x);
- let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+ let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
setdianposin(7, x, y)
}
}, { deep: true })
watch(() => nine.value[8], (newVal, oldVal) => {
- if($store.state.EnableBlending) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 9, Number(newVal.x), Number(newVal.y));
+ if($store.state.enablefusion) set?.setBlendingCorrection($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 9, 9, Number(newVal.x), Number(newVal.y));
if (!isactivearray.value[8]) {
let x = Math.ceil(newVal.x / Proportion.value.x);
- let y = Math.ceil(((1080 - newVal.y) / Proportion.value.y));
+ let y = Math.ceil(((config.height - newVal.y) / Proportion.value.y));
setdianposin(8, x, y)
}
}, { deep: true })
@@ -457,8 +475,8 @@ export default defineComponent({
}
- const save = () => {
-
+ const save=()=>{
+ set?.SaveBlendingConfig("")
}
return {
model,
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 4d71de5..b693e5d 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -1,15 +1,11 @@
- {
- if (evt.keyCode == 27) {
- show_dialog = false;
- }
+ {
+ if (evt.keyCode == 27) {
+ show_dialog = false;
}
- "
- >
+ }
+ ">
@@ -35,27 +31,15 @@
{{ $t("Projector") }}
-
-
+
+
- {{$t('Whether to enable mixing')}}
+ {{ $t('Whether to enable mixing') }}
-
+ ]" />
@@ -84,13 +67,7 @@
-
+
@@ -115,6 +92,8 @@ import {
watch,
computed,
onMounted,
+ onBeforeMount,
+ onUpdated,
onBeforeUnmount,
nextTick,
} from "vue";
@@ -174,6 +153,12 @@ export default defineComponent({
{ deep: true }
);
let data = ref({});
+
+ onBeforeMount(() => {
+ setTimeout(() => {
+ set?.GetBlendingConfig("").then((res)=>{let tmp=JSON.parse(res?res.config:"");EnableBlending.value=tmp.enable;$store.commit("setEnableBlending", tmp.enable);;$store.commit("setfusion_configuration", res?.config);})
+ }, 1000);
+ })
return {
show_dialog,
options,
diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue
index 647036b..39d11bc 100644
--- a/src/pages/TopToolBar.vue
+++ b/src/pages/TopToolBar.vue
@@ -409,7 +409,19 @@
-
+
+
+
+
+
+
+ {{ $t("fusion settings") }}
+
+
boolean;
isSpecialVideo: () => boolean;
- //
selected_projector: string;
- EnableBlending:boolean
+ enablefusion:boolean
}
// provide typings for `this.$store`
@@ -340,12 +339,12 @@ export default store(function (/* { ssrContext } */) {
landspace: window.innerWidth > window.innerHeight,
device_attribute: 0,
power_state: false,
- fusion_configuration:{},
+ fusion_configuration:"",
product_name: EProductNames.LED_PLAYER,
custom_defines: new CustomDefines(),
selected_projector: "0/0",
- EnableBlending:false,
+ enablefusion:false,
isLedPlayer: () => {
return (
Store.state.product_name == EProductNames.LED_PLAYER ||
@@ -607,8 +606,8 @@ export default store(function (/* { ssrContext } */) {
setSelectedProjector(state: StateInterface, playload?: any){
state.selected_projector = playload;
},
- setEnableBlending(state: StateInterface, playload?: any){
- state.EnableBlending = playload;
+ setEnablefusion(state: StateInterface, playload?: any){
+ state.enablefusion = playload;
},
clearSignalSourceTree(state: StateInterface, playload?: any) {
state.signal_source_tree = [];
@@ -999,6 +998,9 @@ export default store(function (/* { ssrContext } */) {
state.connect_list.slice(index, 1);
}
},
+ setfusion_configuration(state: StateInterface, playload?: any){
+ state.fusion_configuration=playload
+ }
},
getters:{
GetTheCurrentlySelectedCamera(state){
From a6a4a0860d659de4c7e91db8ff773c5023ddff78 Mon Sep 17 00:00:00 2001
From: ljqing
Date: Mon, 9 Jan 2023 16:51:15 +0800
Subject: [PATCH 02/78] =?UTF-8?q?=E7=96=8F=E5=AF=86=E8=B0=83=E8=8A=82?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/common/ClientConnection.ts | 32 +++++++++++++++++++
src/entities/WSProtocol.ts | 58 +++++++++++++++++++++++++++++++++-
2 files changed, 89 insertions(+), 1 deletion(-)
diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts
index 3d05b64..94113e0 100644
--- a/src/common/ClientConnection.ts
+++ b/src/common/ClientConnection.ts
@@ -1437,6 +1437,38 @@ export default class ClientConnection {
);
}
+ public async SetBlendingHorDensity(
+ row: number,
+ column: number,
+ control_point: number,
+ value: number
+ ) {
+ return await this.doRpc(
+ new Protocol.SetBlendingHoDensityRequestEntity(
+ row,
+ column,
+ control_point,
+ value
+ )
+ );
+ }
+
+ public async SetBlendingVerDensity(
+ row: number,
+ column: number,
+ control_point: number,
+ value: number
+ ) {
+ return await this.doRpc(
+ new Protocol.SetBlendingVerDensityRequestEntity(
+ row,
+ column,
+ control_point,
+ value
+ )
+ );
+ }
+
public destory() {
this.ws?.close();
if (this.ws) {
diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts
index a6e3fd4..31d02e8 100644
--- a/src/entities/WSProtocol.ts
+++ b/src/entities/WSProtocol.ts
@@ -514,6 +514,12 @@ export namespace Protocol {
public static get kSaveBlendingConfig() {
return Commands.PROTOCOL_PREFIX + "SaveBlendingConfig";
}
+ public static get kSetBlendingHorDensity() {
+ return Commands.PROTOCOL_PREFIX + "SetBlendingHorDensity";
+ }
+ public static get kSetBlendingVerDensity() {
+ return Commands.PROTOCOL_PREFIX + "SetBlendingVerDensity";
+ }
static _all_commands = new Set([
Commands.kUnKnowCommand,
@@ -642,7 +648,9 @@ export namespace Protocol {
Commands.kEnableBlending,
Commands.kSetBlendingOverlap,
Commands.kGetBlendingConfig,
- Commands.kSaveBlendingConfig,
+ Commands.kSaveBlendingConfig,
+ Commands.SetBlendingHorDensity,
+ Commands.SetBlendingVerDensity,
]);
public static get AllCommands() {
return this._all_commands;
@@ -3391,4 +3399,52 @@ export namespace Protocol {
}
name = "";
}
+
+ export class SetBlendingHorDensityRequestEntity extends PacketEntity {
+ constructor(
+ row: number,
+ column: number,
+ control_point: number,
+ value: number,
+ rpc_id = 0
+ ) {
+ super();
+ super.command = Commands.kSetBlendingHorDensity;
+ super.flag = PacketEntity.FLAG_REQUEST;
+ super.rpc_id = rpc_id;
+
+ this.row = row ?? 0;
+ this.column = column ?? 0;
+ this.control_point = control_point ?? 0;
+ this.value = value ?? 0;
+ }
+ row = 0;
+ column = 0;
+ control_point = 0; //控制点编号,1开始,从上到下从左到右
+ value = 0;
+ }
+
+ export class SetBlendingVerDensityRequestEntity extends PacketEntity {
+ constructor(
+ row: number,
+ column: number,
+ control_point: number,
+ value: number,
+ rpc_id = 0
+ ) {
+ super();
+ super.command = Commands.kSetBlendingVerDensity;
+ super.flag = PacketEntity.FLAG_REQUEST;
+ super.rpc_id = rpc_id;
+
+ this.row = row ?? 0;
+ this.column = column ?? 0;
+ this.control_point = control_point ?? 0;
+ this.value = value ?? 0;
+ }
+ row = 0;
+ column = 0;
+ control_point = 0; //控制点编号,1开始,从上到下从左到右
+ value = 0;
+ }
}
From 6defd6ffad96c0469c66d048d527cb44b4033efc Mon Sep 17 00:00:00 2001
From: ljqing
Date: Wed, 11 Jan 2023 10:44:15 +0800
Subject: [PATCH 03/78] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=BD=E4=BB=A4?=
=?UTF-8?q?=E5=AD=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/entities/WSProtocol.ts | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts
index 31d02e8..6fe811f 100644
--- a/src/entities/WSProtocol.ts
+++ b/src/entities/WSProtocol.ts
@@ -648,9 +648,9 @@ export namespace Protocol {
Commands.kEnableBlending,
Commands.kSetBlendingOverlap,
Commands.kGetBlendingConfig,
- Commands.kSaveBlendingConfig,
- Commands.SetBlendingHorDensity,
- Commands.SetBlendingVerDensity,
+ Commands.kSaveBlendingConfig,
+ Commands.kSetBlendingHorDensity,
+ Commands.kSetBlendingVerDensity,
]);
public static get AllCommands() {
return this._all_commands;
From 4ec209def67f346a0a14135f91308ed1134495f5 Mon Sep 17 00:00:00 2001
From: ljqing
Date: Wed, 11 Jan 2023 10:53:05 +0800
Subject: [PATCH 04/78] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B1=BB=E5=90=8D?=
=?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/common/ClientConnection.ts | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts
index 94113e0..726403f 100644
--- a/src/common/ClientConnection.ts
+++ b/src/common/ClientConnection.ts
@@ -1444,7 +1444,7 @@ export default class ClientConnection {
value: number
) {
return await this.doRpc(
- new Protocol.SetBlendingHoDensityRequestEntity(
+ new Protocol.SetBlendingHorDensityRequestEntity(
row,
column,
control_point,
From 9545a4c45d4c7e7e27de00c426bf97f7a75c4464 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Thu, 12 Jan 2023 11:37:40 +0800
Subject: [PATCH 05/78] =?UTF-8?q?=E5=AE=8C=E6=88=90=E6=8E=A5=E5=8F=A3?=
=?UTF-8?q?=E5=AF=B9=E6=8E=A5=20=E5=8F=8A=E4=B8=80=E4=BA=9B=E5=B0=8F?=
=?UTF-8?q?=E7=BB=86=E8=8A=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FusionSettings/DensityCorrection.vue | 501 +++++++++++++++---
.../FusionSettings/FourPointCalibration.vue | 305 ++++++-----
.../FusionSettings/FusionLocale.vue | 366 +++++--------
.../FusionSettings/SurfaceCorrection.vue | 352 ++++++------
src/components/FusionSettingsDialog.vue | 53 +-
src/i18n/en-US/index.ts | 2 +-
src/i18n/zh-CN/index.ts | 2 +-
src/pages/TopToolBar.vue | 13 +-
8 files changed, 964 insertions(+), 630 deletions(-)
diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 8651eed..2c73544 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -1,71 +1,138 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
+
+ {{ $t('point') }}1
+
+ {{ $t('point') }}2
+
+ {{ $t('point') }}3
+
+ {{ $t('point') }}4
+
+ {{ $t('point') }}5
+
+ {{ $t('point') }}6
+
+ {{ $t('point') }}7
+
+ {{ $t('point') }}8
+
+ {{ $t('point') }}9
+
+ {{ $t('point') }}10
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -74,23 +141,327 @@
\ No newline at end of file
+
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index e958c77..71ffb4a 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -1,424 +1,655 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t('point') }}1
-
- {{ $t('point') }}2
-
- {{ $t('point') }}3
-
- {{ $t('point') }}4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t("point") }}1
+
+ {{ $t("point") }}2
+
+ {{ $t("point") }}3
+
+ {{ $t("point") }}4
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
\ No newline at end of file
+
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 690d5dc..f92783c 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -1,25 +1,37 @@
-
-
+
@@ -30,34 +42,60 @@
@@ -68,51 +106,94 @@
-
-
{{ $t('Set Fusion Band Parameters') }}
+
{{ $t("Set Fusion Band Parameters") }}
-
-
+
@@ -155,77 +236,92 @@ export default defineComponent({
{ alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
]);
//正确的 索引编号
- let arr = [1, 0, 2, 3]
+ let arr = [1, 0, 2, 3];
let serverconfig = JSON.parse($store.state.fusion_configuration);
const selectedprojector = computed(() => {
- return $store.getters.GetTheCurrentlySelectedCamera[0] * serverconfig.col + $store.getters.GetTheCurrentlySelectedCamera[1]
- })
+ return (
+ $store.getters.GetTheCurrentlySelectedCamera[0] * serverconfig.col +
+ $store.getters.GetTheCurrentlySelectedCamera[1]
+ );
+ });
const ste_status = ref(0);
const use_set_cache = () => {
if (set_cache.value[selectedprojector.value] != null) {
let tmp = JSON.parse(set_cache.value[selectedprojector.value]);
- deepcopy(array, tmp)
+ deepcopy(array, tmp);
}
};
const deepcopy = (o1: any, o2: any) => {
for (let k in o2) {
- if (typeof o2[k] === 'object') {
+ if (typeof o2[k] === "object") {
o1[k] = {};
deepcopy(o1[k], o2[k]);
} else {
o1[k] = o2[k];
}
}
- }
+ };
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 })
- watch(() => configselsect, (newVal, oldVal) => {
- let tmp = JSON.parse($store.state.fusion_configuration);
- let fortmp = null
- let i
- for (i of tmp.projectors) {
- if (i.col === $store.getters.GetTheCurrentlySelectedCamera[1] && i.row === $store.getters.GetTheCurrentlySelectedCamera[0]) {
- fortmp = JSON.parse(JSON.stringify(i))
+ const configselsect = computed(() => {
+ return $store.state.selected_projector;
+ });
+ watch(
+ () => configselsect,
+ (newVal, oldVal) => {
+ let tmp = JSON.parse($store.state.fusion_configuration);
+ let fortmp = null;
+ let i;
+ for (i of tmp.projectors) {
+ if (
+ i.col === $store.getters.GetTheCurrentlySelectedCamera[1] &&
+ i.row === $store.getters.GetTheCurrentlySelectedCamera[0]
+ ) {
+ fortmp = JSON.parse(JSON.stringify(i));
+ }
}
- }
- ste_status.value = 1;
+ ste_status.value = 1;
- config = JSON.parse(JSON.stringify(fortmp))
- use_server_config()
- use_set_cache()
- setTimeout(() => {
- ste_status.value = 0;
- }, 100);
- setnowindex()
- }, { deep: true })
+ config = JSON.parse(JSON.stringify(fortmp));
+ use_server_config();
+ use_set_cache();
+ setTimeout(() => {
+ ste_status.value = 0;
+ }, 100);
+ setnowindex();
+ },
+ { deep: true }
+ );
const chang = (type: string) => {
if (type == "alpha") {
- if ($store.state.enablefusion) set?.setBlendingAlphaParam(
- $store.getters.GetTheCurrentlySelectedCamera[0],
- $store.getters.GetTheCurrentlySelectedCamera[1],
- arr[group.value],
- array[arr[group.value]].alpha
- );
+ if ($store.state.enablefusion)
+ set?.setBlendingAlphaParam(
+ $store.getters.GetTheCurrentlySelectedCamera[0],
+ $store.getters.GetTheCurrentlySelectedCamera[1],
+ arr[group.value],
+ array[arr[group.value]].alpha
+ );
}
if (type == "p") {
- if ($store.state.enablefusion) set?.setBlendingPowerParam(
- $store.getters.GetTheCurrentlySelectedCamera[0],
- $store.getters.GetTheCurrentlySelectedCamera[1],
- arr[group.value],
- array[arr[group.value]].p
- );
+ if ($store.state.enablefusion)
+ set?.setBlendingPowerParam(
+ $store.getters.GetTheCurrentlySelectedCamera[0],
+ $store.getters.GetTheCurrentlySelectedCamera[1],
+ arr[group.value],
+ array[arr[group.value]].p
+ );
}
if (type == "gamma") {
- if ($store.state.enablefusion) set?.setBlendingGammaParam(
- $store.getters.GetTheCurrentlySelectedCamera[0],
- $store.getters.GetTheCurrentlySelectedCamera[1],
- arr[group.value],
- array[arr[group.value]].gamma
- );
+ if ($store.state.enablefusion)
+ set?.setBlendingGammaParam(
+ $store.getters.GetTheCurrentlySelectedCamera[0],
+ $store.getters.GetTheCurrentlySelectedCamera[1],
+ arr[group.value],
+ array[arr[group.value]].gamma
+ );
}
save_set_cache();
};
@@ -240,152 +336,212 @@ export default defineComponent({
}
}
if (sum == 1) {
- group.value = indexx
+ group.value = indexx;
} else {
- group.value = 4
+ group.value = 4;
}
- }
+ };
-
- //接受 赋值
const setconfig = (config: any) => {
let tmp = JSON.parse(config);
- let fortmp = null
- let i
+ let fortmp = null;
+ let i;
for (i of tmp.projectors) {
- if (i.col === $store.getters.GetTheCurrentlySelectedCamera[1] && i.row === $store.getters.GetTheCurrentlySelectedCamera[0]) {
- fortmp = JSON.parse(JSON.stringify(i))
+ if (
+ i.col === $store.getters.GetTheCurrentlySelectedCamera[1] &&
+ i.row === $store.getters.GetTheCurrentlySelectedCamera[0]
+ ) {
+ fortmp = JSON.parse(JSON.stringify(i));
}
}
ste_status.value = 1;
- config = JSON.parse(JSON.stringify(fortmp))
- //手动对应数据索引
+ config = JSON.parse(JSON.stringify(fortmp));
for (let index = 0; index < array.length - 1; index++) {
- array[arr[index]].gamma = config.params[index].gamma.toFixed(2)
- array[arr[index]].alpha = config.params[index].alpha.toFixed(2)
- array[arr[index]].p = config.params[index].power.toFixed(2)
- array[arr[index]].isshow = config.params[index].enable
- array[arr[index]].value = Number(config.params[index].size)
+ array[arr[index]].gamma = config.params[index].gamma.toFixed(2);
+ array[arr[index]].alpha = config.params[index].alpha.toFixed(2);
+ array[arr[index]].p = config.params[index].power.toFixed(2);
+ array[arr[index]].isshow = config.params[index].enable;
+ array[arr[index]].value = Number(config.params[index].size);
}
setTimeout(() => {
ste_status.value = 0;
}, 100);
- setnowindex()
- }
+ setnowindex();
+ };
const startconfig = () => {
- //手动对应数据索引
for (let index = 0; index < array.length - 1; index++) {
- array[arr[index]].gamma = config.params[index].gamma.toFixed(2)
- array[arr[index]].alpha = config.params[index].alpha.toFixed(2)
- array[arr[index]].p = config.params[index].power.toFixed(2)
- array[arr[index]].isshow = config.params[index].enable
- array[arr[index]].value = Number(config.params[index].size)
+ array[arr[index]].gamma = config.params[index].gamma.toFixed(2);
+ array[arr[index]].alpha = config.params[index].alpha.toFixed(2);
+ array[arr[index]].p = config.params[index].power.toFixed(2);
+ array[arr[index]].isshow = config.params[index].enable;
+ array[arr[index]].value = Number(config.params[index].size);
}
- if (sessionStorage.FusionLocale) set_cache.value = JSON.parse(sessionStorage.FusionLocale); use_set_cache()
- setnowindex()
- }
+ if (sessionStorage.FusionLocale)
+ set_cache.value = JSON.parse(sessionStorage.FusionLocale);
+ use_set_cache();
+ setnowindex();
+ };
const use_server_config = () => {
for (let index = 0; index < array.length - 1; index++) {
- array[arr[index]].gamma = config.params[index].gamma.toFixed(2)
- array[arr[index]].alpha = config.params[index].alpha.toFixed(2)
- array[arr[index]].p = config.params[index].power.toFixed(2)
- array[arr[index]].isshow = config.params[index].enable
- array[arr[index]].value = Number(config.params[index].size)
+ array[arr[index]].gamma = config.params[index].gamma.toFixed(2);
+ array[arr[index]].alpha = config.params[index].alpha.toFixed(2);
+ array[arr[index]].p = config.params[index].power.toFixed(2);
+ array[arr[index]].isshow = config.params[index].enable;
+ array[arr[index]].value = Number(config.params[index].size);
}
- }
- startconfig()
+ };
+ startconfig();
onBeforeUnmount(() => {
- sessionStorage.FusionLocale = JSON.stringify(set_cache.value)
- })
+ sessionStorage.FusionLocale = JSON.stringify(set_cache.value);
+ });
watch(
() => array[0].value,
(newVal, oldVal) => {
- if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 1, array[0].isshow, Number(array[0].value));
- save_set_cache()
+ if ($store.state.enablefusion)
+ set?.SetBlendingOverlap(
+ $store.getters.GetTheCurrentlySelectedCamera[0],
+ $store.getters.GetTheCurrentlySelectedCamera[1],
+ 1,
+ array[0].isshow,
+ Number(array[0].value)
+ );
+ save_set_cache();
},
{ deep: true }
);
watch(
() => array[1].value,
(newVal, oldVal) => {
- if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 0, array[1].isshow, Number(array[1].value));
- save_set_cache()
+ if ($store.state.enablefusion)
+ set?.SetBlendingOverlap(
+ $store.getters.GetTheCurrentlySelectedCamera[0],
+ $store.getters.GetTheCurrentlySelectedCamera[1],
+ 0,
+ array[1].isshow,
+ Number(array[1].value)
+ );
+ save_set_cache();
},
{ deep: true }
);
watch(
() => array[2].value,
(newVal, oldVal) => {
- if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 2, array[2].isshow, Number(array[2].value));
- save_set_cache()
+ if ($store.state.enablefusion)
+ set?.SetBlendingOverlap(
+ $store.getters.GetTheCurrentlySelectedCamera[0],
+ $store.getters.GetTheCurrentlySelectedCamera[1],
+ 2,
+ array[2].isshow,
+ Number(array[2].value)
+ );
+ save_set_cache();
},
{ deep: true }
);
watch(
() => array[3].value,
(newVal, oldVal) => {
- if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 3, array[3].isshow, Number(array[3].value));
- save_set_cache()
+ if ($store.state.enablefusion)
+ set?.SetBlendingOverlap(
+ $store.getters.GetTheCurrentlySelectedCamera[0],
+ $store.getters.GetTheCurrentlySelectedCamera[1],
+ 3,
+ array[3].isshow,
+ Number(array[3].value)
+ );
+ save_set_cache();
},
{ deep: true }
);
- ////
+
watch(
() => array[0].isshow,
(newVal, oldVal) => {
- if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 1, array[0].isshow, Number(array[0].value));
- save_set_cache()
+ if ($store.state.enablefusion)
+ set?.SetBlendingOverlap(
+ $store.getters.GetTheCurrentlySelectedCamera[0],
+ $store.getters.GetTheCurrentlySelectedCamera[1],
+ 1,
+ array[0].isshow,
+ Number(array[0].value)
+ );
+ save_set_cache();
},
{ deep: true }
);
watch(
() => array[1].isshow,
(newVal, oldVal) => {
- if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 0, array[1].isshow, Number(array[1].value));
- save_set_cache()
+ if ($store.state.enablefusion)
+ set?.SetBlendingOverlap(
+ $store.getters.GetTheCurrentlySelectedCamera[0],
+ $store.getters.GetTheCurrentlySelectedCamera[1],
+ 0,
+ array[1].isshow,
+ Number(array[1].value)
+ );
+ save_set_cache();
},
{ deep: true }
);
watch(
() => array[2].isshow,
(newVal, oldVal) => {
- if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 2, array[2].isshow, Number(array[2].value));
- save_set_cache()
+ if ($store.state.enablefusion)
+ set?.SetBlendingOverlap(
+ $store.getters.GetTheCurrentlySelectedCamera[0],
+ $store.getters.GetTheCurrentlySelectedCamera[1],
+ 2,
+ array[2].isshow,
+ Number(array[2].value)
+ );
+ save_set_cache();
},
{ deep: true }
);
watch(
() => array[3].isshow,
(newVal, oldVal) => {
- if ($store.state.enablefusion) set?.SetBlendingOverlap($store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[1], 3, array[3].isshow, Number(array[3].value));
- save_set_cache()
+ if ($store.state.enablefusion)
+ set?.SetBlendingOverlap(
+ $store.getters.GetTheCurrentlySelectedCamera[0],
+ $store.getters.GetTheCurrentlySelectedCamera[1],
+ 3,
+ array[3].isshow,
+ Number(array[3].value)
+ );
+ save_set_cache();
},
{ deep: true }
);
- ////
watch(
() => enablefusion,
(newVal, oldVal) => {
- $store.commit('setenablefusion', newVal.value);
+ $store.commit("setenablefusion", newVal.value);
set?.EnableBlending(newVal.value);
- }, { deep: true }
+ },
+ { deep: true }
);
const changenablefusion = () => {
- $store.commit('setenablefusion', enablefusion.value);
- }
+ $store.commit("setenablefusion", enablefusion.value);
+ };
let resnewdata = null;
const resetall = () => {
try {
- set?.GetBlendingConfig("").then((res) => { resnewdata = res?.config; setconfig(resnewdata) })
+ set?.GetBlendingConfig("").then((res) => {
+ resnewdata = res?.config;
+ setconfig(resnewdata);
+ });
} catch (error) {
- console.log("ResetBlendingConfig error")
+ console.log("ResetBlendingConfig error");
}
- }
+ };
return {
group,
array,
@@ -394,7 +550,7 @@ export default defineComponent({
changenablefusion,
selectedprojector,
resetall,
- set_cache
+ set_cache,
};
},
});
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index f4c6c51..d182277 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -1,548 +1,1052 @@
-
-
-
-
-
-
-
-
- {{ $t('point') }}1
- {{ $t('point') }}2
- {{ $t('point') }}3
- {{ $t('point') }}4
- {{ $t('point') }}5
- {{ $t('point') }}6
- {{ $t('point') }}7
- {{ $t('point') }}8
- {{ $t('point') }}9
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t("point") }}1
+
+ {{ $t("point") }}2
+
+ {{ $t("point") }}3
+
+ {{ $t("point") }}4
+
+ {{ $t("point") }}5
+
+ {{ $t("point") }}6
+
+ {{ $t("point") }}7
+
+ {{ $t("point") }}8
+
+ {{ $t("point") }}9
+
+
+
+
+
+
+
+
+
-
+
\ No newline at end of file
+
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 03b730a..e7f20f7 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -1,11 +1,15 @@
- {
if (evt.keyCode == 27) {
show_dialog = false;
}
}
- ">
+ "
+ >
@@ -15,7 +19,14 @@
-
+
{{ $t("close") }}
@@ -27,23 +38,36 @@
-
-
+
+
{{ $t("Projector") }}
- {{ $t('Whether to enable integration') }}
+ {{ $t("Whether to enable integration")
+ }}
@@ -71,8 +96,22 @@
-
-
+
+
@@ -134,10 +173,6 @@ export default defineComponent({
show_dialog.value = true;
};
-
-
-
- //投影机数量
const config = ref({ col: 0, row: 0 });
const EnableBlending = ref(false);
let optionsstr = ref();
@@ -167,49 +202,58 @@ export default defineComponent({
position: "top",
timeout: 1500,
});
- }
+ };
const save = () => {
- set?.SaveBlendingConfig("")
- show_dialog.value = false
- clear()
- set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); EnableBlending.value = tmp.enable; $store.commit("setEnablefusion", tmp.enable); config.value.col = tmp.col; config.value.row = tmp.row; $store.commit("setfusion_configuration", res?.config); })
- $store.commit('setSelectedProjector','0/0');
- }
- const getconfig=()=>{
+ set?.SaveBlendingConfig("");
+ show_dialog.value = false;
+ clear();
+ set?.GetBlendingConfig("").then((res) => {
+ let tmp = JSON.parse(res ? res.config : "");
+ EnableBlending.value = tmp.enable;
+ $store.commit("setEnablefusion", tmp.enable);
+ config.value.col = tmp.col;
+ config.value.row = tmp.row;
+ $store.commit("setfusion_configuration", res?.config);
+ });
+ $store.commit("setSelectedProjector", "0/0");
+ };
+ const getconfig = () => {
try {
- set?.GetBlendingConfig("").then((res)=>{})
- set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); $store.commit("setEnablefusion", tmp.enable); $store.commit("setfusion_configuration", res?.config); })
- } catch (error) {
-
- }
-
- }
+ set?.GetBlendingConfig("").then((res) => {});
+ set?.GetBlendingConfig("").then((res) => {
+ let tmp = JSON.parse(res ? res.config : "");
+ $store.commit("setEnablefusion", tmp.enable);
+ $store.commit("setfusion_configuration", res?.config);
+ });
+ } catch (error) {}
+ };
const clear = () => {
- $store.commit('setSelectedProjector','0/0');
+ $store.commit("setSelectedProjector", "0/0");
setTimeout(() => {
- sessionStorage.removeItem('FusionLocale')
- sessionStorage.removeItem('SurfaceCorrection')
- sessionStorage.removeItem('DensityCorrection')
- sessionStorage.removeItem('FourPointCalibration')
- }, 500)
- getconfig()
- }
+ sessionStorage.removeItem("FusionLocale");
+ sessionStorage.removeItem("SurfaceCorrection");
+ sessionStorage.removeItem("DensityCorrection");
+ sessionStorage.removeItem("FourPointCalibration");
+ }, 500);
+ getconfig();
+ };
onBeforeMount(() => {
setTimeout(() => {
try {
- set?.GetBlendingConfig("").then((res) => { let tmp = JSON.parse(res ? res.config : ""); EnableBlending.value = tmp.enable; $store.commit("setEnablefusion", tmp.enable); config.value.col = tmp.col; config.value.row = tmp.row; $store.commit("setfusion_configuration", res?.config); })
+ set?.GetBlendingConfig("").then((res) => {
+ let tmp = JSON.parse(res ? res.config : "");
+ EnableBlending.value = tmp.enable;
+ $store.commit("setEnablefusion", tmp.enable);
+ config.value.col = tmp.col;
+ config.value.row = tmp.row;
+ $store.commit("setfusion_configuration", res?.config);
+ });
} catch (error) {
- //let textdata="{\"col\":2,\"enable\":true,\"projectors\":[{\"col\":0,\"height\":1080,\"hor_density\":[{\"def_x\":0,\"def_y\":540,\"number\":1,\"x\":0,\"y\":540},{\"def_x\":480,\"def_y\":540,\"number\":2,\"x\":480,\"y\":540},{\"def_x\":960,\"def_y\":540,\"number\":3,\"x\":960,\"y\":540},{\"def_x\":1440,\"def_y\":540,\"number\":4,\"x\":1440,\"y\":540},{\"def_x\":1920,\"def_y\":540,\"number\":5,\"x\":1920,\"y\":540}],\"params\":[{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0}],\"point4\":[{\"def_x\":0,\"def_y\":1080,\"number\":1,\"x\":0,\"y\":1080},{\"def_x\":1920,\"def_y\":1080,\"number\":2,\"x\":1171,\"y\":712},{\"def_x\":0,\"def_y\":0,\"number\":3,\"x\":0,\"y\":0},{\"def_x\":1920,\"def_y\":0,\"number\":4,\"x\":1920,\"y\":0}],\"point9\":[{\"def_x\":0,\"def_y\":1080,\"number\":1,\"x\":0,\"y\":1080},{\"def_x\":960,\"def_y\":1080,\"number\":2,\"x\":960,\"y\":1080},{\"def_x\":1920,\"def_y\":1080,\"number\":3,\"x\":1920,\"y\":1080},{\"def_x\":0,\"def_y\":540,\"number\":4,\"x\":0,\"y\":540},{\"def_x\":960,\"def_y\":540,\"number\":5,\"x\":960,\"y\":540},{\"def_x\":1920,\"def_y\":540,\"number\":6,\"x\":1920,\"y\":540},{\"def_x\":0,\"def_y\":0,\"number\":7,\"x\":0,\"y\":0},{\"def_x\":960,\"def_y\":0,\"number\":8,\"x\":960,\"y\":0},{\"def_x\":1920,\"def_y\":0,\"number\":9,\"x\":1920,\"y\":0}],\"row\":0,\"ver_density\":[{\"def_x\":960,\"def_y\":1080,\"number\":1,\"x\":960,\"y\":1080},{\"def_x\":960,\"def_y\":810,\"number\":2,\"x\":960,\"y\":810},{\"def_x\":960,\"def_y\":540,\"number\":3,\"x\":960,\"y\":540},{\"def_x\":960,\"def_y\":270,\"number\":4,\"x\":960,\"y\":270},{\"def_x\":960,\"def_y\":0,\"number\":5,\"x\":960,\"y\":0}],\"width\":1920},{\"col\":1,\"height\":1080,\"hor_density\":[{\"def_x\":0,\"def_y\":540,\"number\":1,\"x\":0,\"y\":540},{\"def_x\":480,\"def_y\":540,\"number\":2,\"x\":480,\"y\":540},{\"def_x\":960,\"def_y\":540,\"number\":3,\"x\":960,\"y\":540},{\"def_x\":1440,\"def_y\":540,\"number\":4,\"x\":1440,\"y\":540},{\"def_x\":1920,\"def_y\":540,\"number\":5,\"x\":1920,\"y\":540}],\"params\":[{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0},{\"alpha\":0.5,\"enable\":false,\"gamma\":2.200000047683716,\"power\":2.0,\"size\":0}],\"point4\":[{\"def_x\":0,\"def_y\":1080,\"number\":1,\"x\":0,\"y\":1080},{\"def_x\":1920,\"def_y\":1080,\"number\":2,\"x\":1920,\"y\":1080},{\"def_x\":0,\"def_y\":0,\"number\":3,\"x\":0,\"y\":0},{\"def_x\":1920,\"def_y\":0,\"number\":4,\"x\":1920,\"y\":0}],\"point9\":[{\"def_x\":0,\"def_y\":1080,\"number\":1,\"x\":0,\"y\":1080},{\"def_x\":960,\"def_y\":1080,\"number\":2,\"x\":960,\"y\":1080},{\"def_x\":1920,\"def_y\":1080,\"number\":3,\"x\":1920,\"y\":1080},{\"def_x\":0,\"def_y\":540,\"number\":4,\"x\":0,\"y\":540},{\"def_x\":960,\"def_y\":540,\"number\":5,\"x\":960,\"y\":540},{\"def_x\":1920,\"def_y\":540,\"number\":6,\"x\":1920,\"y\":540},{\"def_x\":0,\"def_y\":0,\"number\":7,\"x\":0,\"y\":0},{\"def_x\":960,\"def_y\":0,\"number\":8,\"x\":960,\"y\":0},{\"def_x\":1920,\"def_y\":0,\"number\":9,\"x\":1920,\"y\":0}],\"row\":0,\"ver_density\":[{\"def_x\":960,\"def_y\":1080,\"number\":1,\"x\":960,\"y\":1080},{\"def_x\":960,\"def_y\":810,\"number\":2,\"x\":960,\"y\":810},{\"def_x\":960,\"def_y\":540,\"number\":3,\"x\":960,\"y\":540},{\"def_x\":960,\"def_y\":270,\"number\":4,\"x\":960,\"y\":270},{\"def_x\":960,\"def_y\":0,\"number\":5,\"x\":960,\"y\":0}],\"width\":1920}],\"row\":1,\"screen_height\":0,\"screen_width\":0}"
- //let tmp=JSON.parse(textdata);EnableBlending.value=tmp.enable;$store.commit("setEnablefusion", tmp.enable);config.value.col=tmp.col;config.value.row=tmp.row;$store.commit("setfusion_configuration", textdata)
- //set?.GetBlendingConfig("").then((res)=>{let tmp=JSON.parse(res?res.config:"");EnableBlending.value=tmp.enable;$store.commit("setEnablefusion", tmp.enable);config.value.col=tmp.col;config.value.row=tmp.row;$store.commit("setfusion_configuration", res?.config);})
- // console.log("data is false")
- erroe()
+ erroe();
}
-
-
}, 1000);
- })
+ });
return {
clear,
show_dialog,
@@ -218,7 +262,7 @@ export default defineComponent({
showDialog,
EnableBlending,
config,
- save
+ save,
};
},
});
diff --git a/src/pages/TopToolBar.vue b/src/pages/TopToolBar.vue
index 52151ba..d40812e 100644
--- a/src/pages/TopToolBar.vue
+++ b/src/pages/TopToolBar.vue
@@ -1,6 +1,10 @@
-
+
-
+
@@ -457,7 +468,11 @@
-
+
{{ $store.state.fan_temp.toFixed(1) }} ℃
@@ -491,7 +506,7 @@
-
+
diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts
index 5f88bf8..ec7d2f3 100644
--- a/src/entities/WSProtocol.ts
+++ b/src/entities/WSProtocol.ts
@@ -657,7 +657,7 @@ export namespace Protocol {
Commands.kSaveBlendingConfig,
Commands.kSetBlendingHorDensity,
Commands.kSetBlendingVerDensity,
- Commands.kResetBlending,
+ Commands.kResetBlending,
Commands.kSetBlendingOption,
]);
public static get AllCommands() {
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index c635144..93a3f87 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -426,4 +426,5 @@ export default {
"Whether to enable integration":"Whether to enable integration",
"Whether to hide the desktop":"Whether to hide the desktop",
"resetall config":"resetall config",
+ "disable blending params":"Dsable blending params",
};
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index a05f97f..334ebc5 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -695,4 +695,5 @@ export default {
"Whether to enable integration":"是否启用融合",
"Whether to hide the desktop":"是否隐藏桌面",
"resetall config":"重置所有配置",
+ "disable blending params":"禁用融合参数",
};
From 1862b885b3848a47c5d3f52b269a6e41f25ba0d4 Mon Sep 17 00:00:00 2001
From: ljqing
Date: Wed, 18 Jan 2023 18:00:17 +0800
Subject: [PATCH 25/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E8=9E=8D=E5=90=88=E7=BD=91=E6=A0=BC=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/FusionSettingsDialog.vue | 29 ++++++++++++++++---------
src/i18n/en-US/index.ts | 1 +
src/i18n/zh-CN/index.ts | 1 +
3 files changed, 21 insertions(+), 10 deletions(-)
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 0a2d564..5e881ea 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -78,6 +78,9 @@
{{ $t("disable blending params") }}
+ {{ $t("show blending grids") }}
+
@@ -150,6 +153,9 @@
const send_disable_blending_params = () => {
set?.SetBlendingOption(1, disable_blending_params.value ? 1 : 0);
};
+ const send_show_blending_grids = () => {
+ set?.SetBlendingOption(1000, show_blending_grids.value ? 1 : 0);
+ };
const resetall=()=>{
set?.ResetBlendingConfig()
}
@@ -159,6 +165,7 @@
optionsstr.value = "FusionLocale";
const hide_desktop_value = ref(true);
const disable_blending_params = ref(false);
+ const show_blending_grids = ref(false);
const options = computed({
get() {
return optionsstr.value;
@@ -240,18 +247,18 @@
set?.GetBlendingConfig("").then((res) => {
let tmp = JSON.parse(res ? res.config : "");
//console.log(tmp.options[0][1])
- let local_options = [ [ref(0), hide_desktop_value], [ref(1), disable_blending_params] ];
+ let local_options = [ [ref(0), hide_desktop_value], [ref(1), disable_blending_params], [ref(1000), show_blending_grids] ];
let k:any;
for(k in local_options) {
- let local_opt = local_options[k];
- let ii:any;
- for(ii in tmp.options){
- let opt = tmp.options[ii];
- if (2 == opt.length && local_opt[0].value == opt[0]){
- local_opt[1].value = (opt[1] == 0 ? false : true);
- break;
- }
- }
+ let local_opt = local_options[k];
+ let ii:any;
+ for(ii in tmp.options){
+ let opt = tmp.options[ii];
+ if (2 == opt.length && local_opt[0].value == opt[0]){
+ local_opt[1].value = (opt[1] == 0 ? false : true);
+ break;
+ }
+ }
}
});
}, 1000);
@@ -261,6 +268,8 @@
hide_desktop_value,
send_disable_blending_params,
disable_blending_params,
+ send_show_blending_grids,
+ show_blending_grids,
clear,
show_dialog,
options,
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 93a3f87..6fa556b 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -427,4 +427,5 @@ export default {
"Whether to hide the desktop":"Whether to hide the desktop",
"resetall config":"resetall config",
"disable blending params":"Dsable blending params",
+ "show blending grids":"show grids",
};
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 334ebc5..45439e2 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -696,4 +696,5 @@ export default {
"Whether to hide the desktop":"是否隐藏桌面",
"resetall config":"重置所有配置",
"disable blending params":"禁用融合参数",
+ "show blending grids":"显示网格",
};
From 5f03edeb6c438f8e976f33df971d1c83abbd7930 Mon Sep 17 00:00:00 2001
From: ljqing
Date: Wed, 18 Jan 2023 20:09:23 +0800
Subject: [PATCH 26/78] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E8=9E=8D=E5=90=88?=
=?UTF-8?q?=E9=80=89=E9=A1=B9=E5=8F=82=E6=95=B0=E6=94=B9=E4=B8=BA=E5=AD=97?=
=?UTF-8?q?=E7=AC=A6=E4=B8=B2=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/common/ClientConnection.ts | 4 ++--
src/components/FusionSettingsDialog.vue | 30 ++++++++++++++-----------
src/entities/WSProtocol.ts | 12 +++++-----
3 files changed, 25 insertions(+), 21 deletions(-)
diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts
index 9ba1fc0..37f7795 100644
--- a/src/common/ClientConnection.ts
+++ b/src/common/ClientConnection.ts
@@ -1476,8 +1476,8 @@ export default class ClientConnection {
}
public async SetBlendingOption(
- id: number,
- value: number
+ id: string,
+ value: string
) {
return await this.doRpc(
new Protocol.SetBlendingOptionRequestEntity(
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 5e881ea..3604d88 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -148,13 +148,13 @@
show_dialog.value = true;
};
const send_hide_desktop = () => {
- set?.SetBlendingOption(0, hide_desktop_value.value ? 1 : 0);
+ set?.SetBlendingOption(hide_desktop_value_id.value, hide_desktop_value.value ? "1" : "0");
};
const send_disable_blending_params = () => {
- set?.SetBlendingOption(1, disable_blending_params.value ? 1 : 0);
+ set?.SetBlendingOption(disable_blending_params_id.value, disable_blending_params.value ? "1" : "0");
};
const send_show_blending_grids = () => {
- set?.SetBlendingOption(1000, show_blending_grids.value ? 1 : 0);
+ set?.SetBlendingOption(show_blending_grids_id.value, show_blending_grids.value ? "1" : "0");
};
const resetall=()=>{
set?.ResetBlendingConfig()
@@ -163,8 +163,11 @@
const EnableBlending = ref(false);
let optionsstr = ref();
optionsstr.value = "FusionLocale";
- const hide_desktop_value = ref(true);
+ const hide_desktop_value_id = ref("0");
+ const hide_desktop_value = ref(false);
+ const disable_blending_params_id = ref("1");
const disable_blending_params = ref(false);
+ const show_blending_grids_id = ref("show_blending_grids");
const show_blending_grids = ref(false);
const options = computed({
get() {
@@ -247,18 +250,19 @@
set?.GetBlendingConfig("").then((res) => {
let tmp = JSON.parse(res ? res.config : "");
//console.log(tmp.options[0][1])
- let local_options = [ [ref(0), hide_desktop_value], [ref(1), disable_blending_params], [ref(1000), show_blending_grids] ];
+ let local_options = [
+ [hide_desktop_value_id, hide_desktop_value],
+ [disable_blending_params_id, disable_blending_params],
+ [show_blending_grids_id, show_blending_grids]
+ ];
let k:any;
for(k in local_options) {
let local_opt = local_options[k];
- let ii:any;
- for(ii in tmp.options){
- let opt = tmp.options[ii];
- if (2 == opt.length && local_opt[0].value == opt[0]){
- local_opt[1].value = (opt[1] == 0 ? false : true);
- break;
- }
- }
+ let opt = tmp.options[(local_opt[0].value)];
+ if (opt)
+ {
+ local_opt[1].value = ("0" == opt || "false" == opt.toLowerCase() ? false : true);
+ }
}
});
}, 1000);
diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts
index ec7d2f3..be1d1d2 100644
--- a/src/entities/WSProtocol.ts
+++ b/src/entities/WSProtocol.ts
@@ -3469,8 +3469,8 @@ export namespace Protocol {
export class SetBlendingOptionRequestEntity extends PacketEntity {
constructor(
- id: number,
- value: number,
+ id: string,
+ value: string,
rpc_id = 0
) {
super();
@@ -3478,10 +3478,10 @@ export namespace Protocol {
super.flag = PacketEntity.FLAG_REQUEST;
super.rpc_id = rpc_id;
- this.id = id ?? 0;
- this.value = value ?? 0;
+ this.id = id ?? "";
+ this.value = value ?? "";
}
- id = 0;
- value = 0;
+ id;
+ value;
}
}
From e8f2d4eb9c3994e8bf246284fb6c88562909b96a Mon Sep 17 00:00:00 2001
From: ljqing
Date: Thu, 19 Jan 2023 11:21:18 +0800
Subject: [PATCH 27/78] =?UTF-8?q?=E4=BF=AE=E6=94=B9id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/FusionSettingsDialog.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 3604d88..43ccf0e 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -167,7 +167,7 @@
const hide_desktop_value = ref(false);
const disable_blending_params_id = ref("1");
const disable_blending_params = ref(false);
- const show_blending_grids_id = ref("show_blending_grids");
+ const show_blending_grids_id = ref("blending_grids_show");
const show_blending_grids = ref(false);
const options = computed({
get() {
From 08bbfd9b7338f676200b4f5957e144c0867cd3dd Mon Sep 17 00:00:00 2001
From: ljqing
Date: Sat, 28 Jan 2023 14:08:18 +0800
Subject: [PATCH 28/78] =?UTF-8?q?=E5=85=B3=E9=97=AD=E8=9E=8D=E5=90=88?=
=?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=AA=97=E5=8F=A3=E6=97=B6=E9=9A=90=E8=97=8F?=
=?UTF-8?q?=E5=88=A0=E6=A0=BC=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/FusionSettingsDialog.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 43ccf0e..8dd3879 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -219,6 +219,8 @@
} catch (error) { }
};
const clear = () => {
+ show_blending_grids.value = false;
+ send_show_blending_grids();
$store.commit("setSelectedProjector", "0/0");
setTimeout(() => {
sessionStorage.removeItem("FusionLocale");
From 48f5a8a25c9abe2af169378348c71ef0440a581a Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Sat, 28 Jan 2023 14:22:55 +0800
Subject: [PATCH 29/78] =?UTF-8?q?=E5=BC=80=E5=90=AF=E7=BD=91=E6=A0=BC?=
=?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/FusionSettingsDialog.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 43ccf0e..44378b1 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -60,7 +60,7 @@
label: $t('DensityCorrection'),
value: 'DensityCorrection',
},
- // { label: $t('GridSettings'), value: 'GridSettings' },
+ { label: $t('GridSettings'), value: 'GridSettings' },
]" />
From ee4166abc3387582a65566cbd03c3a24adf4c1f2 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Sun, 29 Jan 2023 13:34:54 +0800
Subject: [PATCH 30/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=90=8C=E6=AD=A5?=
=?UTF-8?q?=E6=93=8D=E4=BD=9C=E9=80=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FusionSettings/FusionLocale.vue | 78 ++++--
.../FusionSettings/GridSettings.vue | 236 ++++++++++++------
src/i18n/en-US/index.ts | 4 +
src/i18n/zh-CN/index.ts | 4 +
4 files changed, 238 insertions(+), 84 deletions(-)
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 5dced7e..80ddd9c 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -61,6 +61,7 @@
(val > -1 && val < 1920) || $t('Please enter 0-100'),
]" />
+ {{$t('Whether to operate synchronously')}}
@@ -96,7 +97,7 @@
-
+
alpha
@@ -104,7 +105,7 @@
-
+
p
@@ -112,7 +113,7 @@
-
+
gamma
@@ -162,6 +163,7 @@ export default defineComponent({
{ alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
{ alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
]);
+ const auto_sync=ref(false)
//正确的 索引编号
let arr = [1, 0, 2, 3];
let serverconfig = JSON.parse($store.state.fusion_configuration);
@@ -172,34 +174,34 @@ export default defineComponent({
);
});
const add = (type: string) => {
- let tmp:Number;
- tmp=0.01;
+ let tmp: Number;
+ tmp = 0.01;
switch (type) {
case "alpha":
- array[group.value].alpha=Number((array[group.value].alpha+=tmp).toFixed(2))
+ array[group.value].alpha = Number((array[group.value].alpha += tmp).toFixed(2))
break;
case "p":
- array[group.value].p=Number((array[group.value].p+=tmp).toFixed(2))
+ array[group.value].p = Number((array[group.value].p += tmp).toFixed(2))
break;
case "gamma":
- array[group.value].gamma=Number((array[group.value].gamma+=tmp).toFixed(2))
+ array[group.value].gamma = Number((array[group.value].gamma += tmp).toFixed(2))
break;
default:
break;
}
}
const reduce = (type: string) => {
- let tmp:Number;
- tmp=-0.01;
+ let tmp: Number;
+ tmp = -0.01;
switch (type) {
case "alpha":
- array[group.value].alpha=Number((array[group.value].alpha+=tmp).toFixed(2))
+ array[group.value].alpha = Number((array[group.value].alpha += tmp).toFixed(2))
break;
case "p":
- array[group.value].p=Number((array[group.value].p+=tmp).toFixed(2))
+ array[group.value].p = Number((array[group.value].p += tmp).toFixed(2))
break;
case "gamma":
- array[group.value].gamma=Number((array[group.value].gamma+=tmp).toFixed(2))
+ array[group.value].gamma = Number((array[group.value].gamma += tmp).toFixed(2))
break;
default:
break;
@@ -368,6 +370,7 @@ export default defineComponent({
array[0].isshow,
Number(array[0].value)
);
+
save_set_cache();
},
{ deep: true }
@@ -383,6 +386,7 @@ export default defineComponent({
array[1].isshow,
Number(array[1].value)
);
+ if(auto_sync.value)left_right_auto_add(newVal-oldVal);
save_set_cache();
},
{ deep: true }
@@ -398,6 +402,7 @@ export default defineComponent({
array[2].isshow,
Number(array[2].value)
);
+ if(auto_sync.value)left_right_auto_add(newVal-oldVal);
save_set_cache();
},
{ deep: true }
@@ -445,6 +450,7 @@ export default defineComponent({
array[1].isshow,
Number(array[1].value)
);
+ if(auto_sync.value)left_right_auto_add(0);
save_set_cache();
},
{ deep: true }
@@ -460,6 +466,7 @@ export default defineComponent({
array[2].isshow,
Number(array[2].value)
);
+ if(auto_sync.value)left_right_auto_add(0);
save_set_cache();
},
{ deep: true }
@@ -503,6 +510,48 @@ export default defineComponent({
console.log("ResetBlendingConfig error");
}
};
+ const left_right_auto_add = (difference: number) => {
+
+ let tmpobjall = JSON.parse($store.state.fusion_configuration)
+ if ($store.getters.GetTheCurrentlySelectedCamera[1] == 0) {
+
+ let tmp = set_cache.value[1] == null ? tmpobjall.projectors[1].params : JSON.parse(set_cache.value[1]);
+ let set_cache_tmp: any = []
+ if (tmp[1].hasOwnProperty("power")) {
+ for (let index = 0; index < 4; index++) {
+ let tmpobj = { alpha: Number(tmp[arr[index]].alpha.toFixed(2)), p: Number(tmp[arr[index]].power.toFixed(2)), gamma: Number(tmp[arr[index]].gamma.toFixed(2)), isshow: tmp[arr[index]].enable, value: Number(tmp[arr[index]].size) }
+ set_cache_tmp.push(tmpobj)
+ }
+ } else {
+ set_cache_tmp = tmp
+ }
+ if (ste_status.value == 0) {
+ set_cache_tmp[1].value = Number(set_cache_tmp[1].value) + difference
+ set_cache_tmp[1].isshow = array[2].isshow
+ set?.SetBlendingOverlap(0, 1, 0, set_cache_tmp[1].isshow, Number(set_cache_tmp[1].value));
+ set_cache.value[1] = JSON.stringify(set_cache_tmp);
+ }
+ }
+ if ($store.getters.GetTheCurrentlySelectedCamera[1] == 1) {
+
+ let tmp = set_cache.value[0] == null ? tmpobjall.projectors[0].params : JSON.parse(set_cache.value[0]);
+ let set_cache_tmp: any = []
+ if (tmp[0].hasOwnProperty("power")) {
+ for (let index = 0; index < 4; index++) {
+ let tmpobj = { alpha: Number(tmp[arr[index]].alpha.toFixed(2)), p: Number(tmp[arr[index]].power.toFixed(2)), gamma: Number(tmp[arr[index]].gamma.toFixed(2)), isshow: tmp[arr[index]].enable, value: Number(tmp[arr[index]].size) }
+ set_cache_tmp.push(tmpobj)
+ }
+ } else {
+ set_cache_tmp = tmp
+ }
+ if (ste_status.value == 0) {
+ set_cache_tmp[2].value = Number(set_cache_tmp[2].value) + difference
+ set_cache_tmp[2].isshow = array[1].isshow
+ set?.SetBlendingOverlap(0, 0, 2, set_cache_tmp[2].isshow , Number(set_cache_tmp[2].value));
+ set_cache.value[0] = JSON.stringify(set_cache_tmp);
+ }
+ }
+ }
return {
group,
array,
@@ -513,7 +562,8 @@ export default defineComponent({
resetall,
set_cache,
reduce,
- add
+ add,
+ auto_sync
};
},
});
diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index 3554aa3..539170e 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -1,86 +1,182 @@
-
+
+
+
-
+
+
+
+
+
+
+
{{ $t('line color') }}
+
+
+
+
+
+
+
+
+
+
+
{{ $t('background color') }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
+
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 6fa556b..e47a08f 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -428,4 +428,8 @@ export default {
"resetall config":"resetall config",
"disable blending params":"Dsable blending params",
"show blending grids":"show grids",
+ "line color":"line color",
+ "center line color":"center line color",
+ "center circle color":"center circle color",
+ "Whether to operate synchronously":"Whether to operate synchronously"
};
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 45439e2..e2e839d 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -697,4 +697,8 @@ export default {
"resetall config":"重置所有配置",
"disable blending params":"禁用融合参数",
"show blending grids":"显示网格",
+ "line color":"线条颜色",
+ "center line color":"中心线颜色",
+ "center circle color":"中心圆颜色",
+ "Whether to operate synchronously":"是否同步操作"
};
From 1e0e2a529cf422ccd81693cbd9ce7f38baa8859a Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Sun, 29 Jan 2023 14:03:39 +0800
Subject: [PATCH 31/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=BD=91=E6=A0=BC?=
=?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2=E5=88=87=E6=8D=A2=E6=97=B6?=
=?UTF-8?q?=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FusionSettings/FusionLocale.vue | 15 +-
.../FusionSettings/GridSettings.vue | 47 ++-
src/components/FusionSettingsDialog.vue | 348 +++++++++---------
3 files changed, 217 insertions(+), 193 deletions(-)
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 80ddd9c..4067013 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -61,7 +61,8 @@
(val > -1 && val < 1920) || $t('Please enter 0-100'),
]" />
- {{$t('Whether to operate synchronously')}}
+ {{ $t('Whether to operate synchronously') }}
@@ -163,7 +164,7 @@ export default defineComponent({
{ alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
{ alpha: 0, p: 0, gamma: 0, isshow: false, value: 0 },
]);
- const auto_sync=ref(false)
+ const auto_sync = ref(false)
//正确的 索引编号
let arr = [1, 0, 2, 3];
let serverconfig = JSON.parse($store.state.fusion_configuration);
@@ -386,7 +387,7 @@ export default defineComponent({
array[1].isshow,
Number(array[1].value)
);
- if(auto_sync.value)left_right_auto_add(newVal-oldVal);
+ if (auto_sync.value) left_right_auto_add(newVal - oldVal);
save_set_cache();
},
{ deep: true }
@@ -402,7 +403,7 @@ export default defineComponent({
array[2].isshow,
Number(array[2].value)
);
- if(auto_sync.value)left_right_auto_add(newVal-oldVal);
+ if (auto_sync.value) left_right_auto_add(newVal - oldVal);
save_set_cache();
},
{ deep: true }
@@ -450,7 +451,7 @@ export default defineComponent({
array[1].isshow,
Number(array[1].value)
);
- if(auto_sync.value)left_right_auto_add(0);
+ if (auto_sync.value) left_right_auto_add(0);
save_set_cache();
},
{ deep: true }
@@ -466,7 +467,7 @@ export default defineComponent({
array[2].isshow,
Number(array[2].value)
);
- if(auto_sync.value)left_right_auto_add(0);
+ if (auto_sync.value) left_right_auto_add(0);
save_set_cache();
},
{ deep: true }
@@ -547,7 +548,7 @@ export default defineComponent({
if (ste_status.value == 0) {
set_cache_tmp[2].value = Number(set_cache_tmp[2].value) + difference
set_cache_tmp[2].isshow = array[1].isshow
- set?.SetBlendingOverlap(0, 0, 2, set_cache_tmp[2].isshow , Number(set_cache_tmp[2].value));
+ set?.SetBlendingOverlap(0, 0, 2, set_cache_tmp[2].isshow, Number(set_cache_tmp[2].value));
set_cache.value[0] = JSON.stringify(set_cache_tmp);
}
}
diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index 539170e..38dcb58 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -26,7 +26,8 @@
{{ $t('line color') }}
-
+
@@ -37,7 +38,8 @@
{{ $t('background color') }}
-
+
@@ -75,17 +77,18 @@
From 21fc52f85b4a76e4f1ed87819b65059a2018607c Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Sun, 29 Jan 2023 14:04:08 +0800
Subject: [PATCH 32/78] =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/FusionSettingsDialog.vue | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 29593fc..017538d 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -252,7 +252,6 @@ export default defineComponent({
setTimeout(() => {
set?.GetBlendingConfig("").then((res) => {
let tmp = JSON.parse(res ? res.config : "");
- //console.log(tmp.options[0][1])
let local_options = [
[hide_desktop_value_id, hide_desktop_value],
[disable_blending_params_id, disable_blending_params],
From 2de84af0fe676dcc9b14b1ecf084b074d587a985 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Sun, 29 Jan 2023 16:52:38 +0800
Subject: [PATCH 33/78] =?UTF-8?q?=E9=92=88=E5=AF=B9=E4=BD=8E=E5=88=86?=
=?UTF-8?q?=E8=BE=A8=E7=8E=87=E5=81=9A=E9=80=82=E9=85=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FusionSettings/DensityCorrection.vue | 53 +-
.../FusionSettings/SurfaceCorrection.vue | 464 ++++--------------
src/components/FusionSettingsDialog.vue | 21 +-
3 files changed, 147 insertions(+), 391 deletions(-)
diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 7f84177..186c22a 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -55,7 +55,7 @@
-
+
@@ -65,7 +65,7 @@
-
+
@@ -75,7 +75,7 @@
-
+
@@ -85,7 +85,7 @@
-
+
@@ -95,7 +95,7 @@
-
+
@@ -103,38 +103,38 @@
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
-
+
-
-
+
+
+
+ {
+ if (!loading && evt.keyCode == 27) {
+ show_dialog = false;
+ }
+ }
+ "
+ >
+
+
+
+
+ {{ $t("select file") }}({{ filters.join(";") }})
+
+
+ {{ $t("file manage") }}
+
+
+
+
+
+ {{ $t("close") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+ {{ $t("back") }}
+
+
+
+
+ {{ $t("forward") }}
+
+
+
+
+ {{ $t("refresh") }}
+
+
+
+
+ {{ $t("paste") }}
+
+
+
+
+ {{ $t("create folder") }}
+
+
+
+
+ {{ $t("upload file") }}
+
+
+
+
+ {{ $t("cancel upload file") }}
+
+
+
+
+
+
+ {{}}
+
+
+
+
+
+
+
+
+
+
+ {{
+ props.value.length > 60
+ ? props.value.substr(0, 60) + "..."
+ : props.value
+ }}
+ {{ props.value }}
+
+
+
+
+
+ {{
+ (props.row.file_size / 1024 / 1024 / 1024).toFixed(2)
+ }}GB
+
+
+ {{ (props.row.file_size / 1024 / 1024).toFixed(2) }}MB
+
+
+ {{ (props.row.file_size / 1024).toFixed(2) }} KB
+
+
+
+
+ {{ props.value }}
+
+
+
+
+
+
+ {{ $t("file count") }}: {{ file_count }}
+
+
+
+ {{ $t("directoriy count") }}: {{ directory_count }}
+
+
+
+
+
+
+ {{ $t("free space") }}:
+
+ {{ (free_space / 1024 / 1024 / 1024).toFixed(1) }}GB
+
+
+ {{ (free_space / 1024 / 1024).toFixed(1) }}MB
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ copyStringToClipboard(current_file.name)"
+ >
+
+ {{ $t("copy name") }}
+
+ copyFile(current_file)"
+ >
+
+ {{ $t("_copy2") }}
+
+ cutFile(current_file)">
+
+ {{ $t("_cut2") }}
+
+ pasteFile()"
+ >
+
+ {{ $t("paste") }}
+
+ renameFile(current_file)"
+ >
+
+ {{ $t("rename") }}
+
+ deleteFile(current_file)"
+ >
+
+ {{ $t("delete") }}
+
+ selectFile(current_file)"
+ >
+
+ {{ $t("select file") }}
+
+
+
+
+
+
+
+
+
From 104a5cead659adaa61709255347a0e0d5daa548f Mon Sep 17 00:00:00 2001
From: ljqing
Date: Mon, 30 Jan 2023 18:14:33 +0800
Subject: [PATCH 39/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=9E=9A=E4=B8=BE?=
=?UTF-8?q?=E8=9E=8D=E5=90=88=E5=9C=BA=E6=99=AF=E5=90=8D=E7=A7=B0=E5=88=97?=
=?UTF-8?q?=E8=A1=A8=E5=8F=8A=E5=BA=94=E7=94=A8=E8=9E=8D=E5=90=88=E5=9C=BA?=
=?UTF-8?q?=E6=99=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/common/ClientConnection.ts | 12 ++++++++++
src/entities/WSProtocol.ts | 43 ++++++++++++++++++++++++++++++++++
2 files changed, 55 insertions(+)
diff --git a/src/common/ClientConnection.ts b/src/common/ClientConnection.ts
index 37f7795..1ab590a 100644
--- a/src/common/ClientConnection.ts
+++ b/src/common/ClientConnection.ts
@@ -1487,6 +1487,18 @@ export default class ClientConnection {
);
}
+ public async EnumBlendingScene() {
+ return await this.doRpc(
+ new Protocol.EnumBlendingSceneRequestEntity()
+ );
+ }
+
+ public async ApplyBlendingScene(name: string) {
+ return await this.doRpc(
+ new Protocol.ApplyBlendingSceneRequestEntity(name)
+ );
+ }
+
public destory() {
this.ws?.close();
if (this.ws) {
diff --git a/src/entities/WSProtocol.ts b/src/entities/WSProtocol.ts
index be1d1d2..fc74613 100644
--- a/src/entities/WSProtocol.ts
+++ b/src/entities/WSProtocol.ts
@@ -526,6 +526,12 @@ export namespace Protocol {
public static get kSetBlendingOption() {
return Commands.PROTOCOL_PREFIX + "SetBlendingOption";
}
+ public static get kEnumBlendingScene() {
+ return Commands.PROTOCOL_PREFIX + "EnumBlendingScene";
+ }
+ public static get kApplyBlendingScene() {
+ return Commands.PROTOCOL_PREFIX + "ApplyBlendingScene";
+ }
static _all_commands = new Set([
Commands.kUnKnowCommand,
@@ -659,6 +665,8 @@ export namespace Protocol {
Commands.kSetBlendingVerDensity,
Commands.kResetBlending,
Commands.kSetBlendingOption,
+ Commands.kEnumBlendingScene,
+ Commands.kApplyBlendingScene,
]);
public static get AllCommands() {
return this._all_commands;
@@ -3484,4 +3492,39 @@ export namespace Protocol {
id;
value;
}
+
+ export class EnumBlendingSceneResponseEntity extends PacketEntity {
+ constructor() {
+ super();
+ super.flag = PacketEntity.FLAG_RESPONSE;
+ }
+
+ scenes = [];
+ }
+
+ export class EnumBlendingSceneRequestEntity extends PacketEntity {
+ constructor(
+ rpc_id = 0
+ ) {
+ super();
+ super.command = Commands.kEnumBlendingScene;
+ super.flag = PacketEntity.FLAG_REQUEST;
+ super.rpc_id = rpc_id;
+ }
+ }
+
+ export class ApplyBlendingSceneRequestEntity extends PacketEntity {
+ constructor(
+ name: string,
+ rpc_id = 0
+ ) {
+ super();
+ super.command = Commands.kApplyBlendingScene;
+ super.flag = PacketEntity.FLAG_REQUEST;
+ super.rpc_id = rpc_id;
+
+ this.name = name ?? "";
+ }
+ name;
+ }
}
From 6723d28701fe48d2d27a9c7263cecdcf8e173221 Mon Sep 17 00:00:00 2001
From: ljqing
Date: Tue, 31 Jan 2023 10:34:43 +0800
Subject: [PATCH 40/78] =?UTF-8?q?=E4=BF=AE=E6=94=B9id=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/FusionSettingsDialog.vue | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 4364f37..f2f3263 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -204,7 +204,7 @@ export default defineComponent({
const EnableBlending = ref(false);
let optionsstr = ref();
optionsstr.value = "FusionLocale";
- const hide_desktop_value_id = ref("0");
+ const hide_desktop_value_id = ref("debug@show_mask");
const hide_desktop_value = ref(false);
const disable_blending_params_id = ref("1");
const disable_blending_params = ref(false);
From 2586774c4a453f53e65cfb3c27c5c7c39e3e3b57 Mon Sep 17 00:00:00 2001
From: ljqing
Date: Tue, 31 Jan 2023 10:54:20 +0800
Subject: [PATCH 41/78] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=80=E5=A4=A7?=
=?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/FusionSettings/FusionLocale.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 59f4aac..2fe8eef 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -104,7 +104,7 @@
-
p
@@ -112,7 +112,7 @@
-
gamma
From 361c2c06c50c3edb70d12e4fcc3d312051cb3547 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Wed, 1 Feb 2023 15:01:00 +0800
Subject: [PATCH 42/78] =?UTF-8?q?=E5=A2=9E=E5=8A=A0125=E7=BC=A9=E6=94=BE?=
=?UTF-8?q?=E4=B8=8B=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=BB=91=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FusionSettings/DensityCorrection.vue | 97 ++++++++++--------
.../FusionSettings/FourPointCalibration.vue | 43 ++++----
.../FusionSettings/FusionLocale.vue | 28 +++---
.../FusionSettings/GridSettings.vue | 26 +----
.../FusionSettings/SurfaceCorrection.vue | 66 +++++++------
src/components/FusionSettingsDialog.vue | 98 ++++++++++++++-----
src/i18n/zh-CN/index.ts | 2 +-
7 files changed, 210 insertions(+), 150 deletions(-)
diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 186c22a..9ea2ef0 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -2,47 +2,47 @@
-
+
-
v1
+ @moveHandler="moveHandler($event, 0)">↑
V1
↓
-
v2
+ @moveHandler="moveHandler($event, 1)">↑
V2
↓
-
v3
+ @moveHandler="moveHandler($event, 2)">↑
V3
↓
-
v4
+ @moveHandler="moveHandler($event, 3)">↑
V4
↓
-
v5
+ @moveHandler="moveHandler($event, 4)">↑
V5
↓
-
h1
+ @moveHandler="moveHandler($event, 5)">←H1→
-
h2
+ @moveHandler="moveHandler($event, 6)">←H2→
-
h3
+ @moveHandler="moveHandler($event, 7)">←H3→
-
h4
+ @moveHandler="moveHandler($event, 8)">←H4→
-
h5
+ @moveHandler="moveHandler($event, 9)">←H5→
@@ -55,7 +55,7 @@
-
+
@@ -65,7 +65,7 @@
-
+
@@ -75,7 +75,7 @@
-
+
@@ -85,7 +85,7 @@
-
+
@@ -95,7 +95,7 @@
-
+
@@ -107,31 +107,31 @@
-
+
-
+
-
+
-
+
-
+
@@ -156,6 +156,18 @@
width: 10rem;
padding-right: 1rem;
}
+.vcolro{
+ color: #d50000;
+}
+.hcolro{
+ color: #00c853;
+ font-size: 5px;
+}
+.p0{
+ margin: 0;
+ padding: 0;
+ line-height: 8px;
+}
diff --git a/src/components/FusionSettings/DebuggingItem.vue b/src/components/FusionSettings/DebuggingItem.vue
new file mode 100644
index 0000000..7b65ed5
--- /dev/null
+++ b/src/components/FusionSettings/DebuggingItem.vue
@@ -0,0 +1,63 @@
+
+ {{ $t(show_name) }}
+
+
+
+
diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 9ea2ef0..6eaea61 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -676,11 +676,6 @@ export default defineComponent({
}
save_set_cache();
};
- const creat_svg=(index:Number,type:string):string=>{
- //btoa(unescape(encodeURIComponent(str)))
- //'data:image/svg+xml;base64,'+btoa(`
↑ v${index} ↓ `)
- return type=='h'?`data:image/svg+xml,%3Csvg width='50' height='14' xmlns='http://www.w3.org/2000/svg'%3E%3Ctext x='50%25' y='50%25' font-size='14' fill='%2300c853' font-family='system-ui, sans-serif' text-anchor='middle' dominant-baseline='middle'%3E←h${index}→%3C/text%3E%3C/svg%3E`:'data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iMTQiIGhlaWdodD0iNTAiCiAgICB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciPgogICAgPHRleHQgZm9udC1zaXplPSIxNCIgZmlsbD0iI2Q1MDAwMCI+CiAgICAgICAgPHRzcGFuIHg9IjMiIHk9IjEwIj7ihpE8L3RzcGFuPgogICAgICAgIDx0c3BhbiB4PSIwIiB5PSIyMCI+djE8L3RzcGFuPgogICAgICAgIDx0c3BhbiB4PSIzIiB5PSIzMCI+4oaTPC90c3Bhbj4KICAgIDwvdGV4dD4KPC9zdmc+'
- }
initialization();
return {
model,
@@ -694,7 +689,6 @@ export default defineComponent({
isshowarray,
isactivearray,
save,
- creat_svg
};
},
});
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 38a993c..5232926 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -64,6 +64,10 @@
},
{ label: $t('GridSettings'), value: 'GridSettings' },
]" />
+
@@ -75,8 +79,6 @@
- {{ $t("Whether to hide the desktop") }}
{{ $t("disable blending params") }}
@@ -84,8 +86,7 @@
-
-
+
{
- set?.SetBlendingOption(hide_desktop_value_id.value, hide_desktop_value.value ? "1" : "0");
- };
+ // const send_hide_desktop = () => {
+ // set?.SetBlendingOption(hide_desktop_value_id.value, hide_desktop_value.value ? "1" : "0");
+ // };
const send_disable_blending_params = () => {
set?.SetBlendingOption(disable_blending_params_id.value, disable_blending_params.value ? "1" : "0");
};
@@ -243,8 +246,8 @@ export default defineComponent({
const EnableBlending = ref(false);
let optionsstr = ref();
optionsstr.value = "FusionLocale";
- const hide_desktop_value_id = ref("debug@show_mask");
- const hide_desktop_value = ref(false);
+ // const hide_desktop_value_id = ref("debug@show_mask");
+ // const hide_desktop_value = ref(false);
const disable_blending_params_id = ref("1");
const disable_blending_params = ref(false);
const show_blending_grids_id = ref("blending_grids_show");
@@ -302,6 +305,7 @@ export default defineComponent({
sessionStorage.removeItem("FourPointCalibration");
sessionStorage.removeItem("GridSettings");
}, 500);
+ options.value="FusionLocale"
};
@@ -318,14 +322,7 @@ export default defineComponent({
onBeforeMount(() => {
setTimeout(() => {
try {
- set?.GetBlendingConfig("").then((res) => {
- let tmp = JSON.parse(res ? res.config : "");
- EnableBlending.value = tmp.enable;
- $store.commit("setEnablefusion", tmp.enable);
- config.value.col = tmp.col;
- config.value.row = tmp.row;
- $store.commit("setfusion_configuration", res?.config);
- });
+
} catch (error) {
erroe();
}
@@ -336,7 +333,7 @@ export default defineComponent({
set?.GetBlendingConfig("").then((res) => {
let tmp = JSON.parse(res ? res.config : "");
let local_options = [
- [hide_desktop_value_id, hide_desktop_value],
+ // [hide_desktop_value_id, hide_desktop_value],
[disable_blending_params_id, disable_blending_params],
[show_blending_grids_id, show_blending_grids]
];
@@ -348,17 +345,21 @@ export default defineComponent({
local_opt[1].value = ("0" == opt || "false" == opt.toLowerCase() ? false : true);
}
}
+ EnableBlending.value = tmp.enable;
+ $store.commit("setEnablefusion", tmp.enable);
+ config.value.col = tmp.col;
+ config.value.row = tmp.row;
+ $store.commit("setfusion_configuration", res?.config);
+
});
}, 1000);
});
const save_cover_name = ref("")
const plan_list = [
- '1'
+ ''
]
const apply_the_selected_configuration = () => {
//这里根据选择的配置 应用
-
- //console.log(select_configuration_name.value)
set?.ApplyBlendingScene(select_configuration_name.value).then((res) => {
let tmp = JSON.parse(res ? res.config : "");
EnableBlending.value = tmp.enable;
@@ -370,7 +371,6 @@ export default defineComponent({
let tmp = options.value
options.value = ""
- //getconfig()
$store.commit("setSelectedProjector", "0/0");
setTimeout(() => {
sessionStorage.removeItem("FusionLocale");
@@ -380,9 +380,6 @@ export default defineComponent({
sessionStorage.removeItem("GridSettings");
options.value = tmp
}, 800);
- // setTimeout(() => {
- // options.value = tmp
- // }, 100);
}
const plan_list_op = ref(plan_list)
const filterFn = (val: any, update: any, abort: any) => {
@@ -400,16 +397,17 @@ export default defineComponent({
set?.SaveBlendingConfig(save_cover_name.value);
clear();
save_cover_name.value = save_name.value = ''
- set?.GetBlendingConfig("").then((res) => {
- let tmp = JSON.parse(res ? res.config : "");
- EnableBlending.value = tmp.enable;
- $store.commit("setEnablefusion", tmp.enable);
- config.value.col = tmp.col;
- config.value.row = tmp.row;
- $store.commit("setfusion_configuration", res?.config);
- });
+ // set?.GetBlendingConfig("").then((res) => {
+ // let tmp = JSON.parse(res ? res.config : "");
+ // EnableBlending.value = tmp.enable;
+ // $store.commit("setEnablefusion", tmp.enable);
+ // config.value.col = tmp.col;
+ // config.value.row = tmp.row;
+ // $store.commit("setfusion_configuration", res?.config);
+ // });
$store.commit("setSelectedProjector", "0/0");
}
+
const isdebug = computed(() => {
let tmp = JSON.parse($store.state.fusion_configuration)
let str = 'debug@show_mask'
@@ -431,8 +429,8 @@ export default defineComponent({
del_scenes,
filterFn,
setModel,
- send_hide_desktop,
- hide_desktop_value,
+ // send_hide_desktop,
+ // hide_desktop_value,
send_disable_blending_params,
disable_blending_params,
send_show_blending_grids,
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 2c004f3..e097f76 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -440,5 +440,10 @@ export default {
"New Please enter a name":"New Please enter a name",
"Please select an override":"Please select an override",
"confirm delete":"confirm delete",
- "delete or not":"delete or not"
+ "delete or not":"delete or not",
+ "debugging":"debugging",
+ "disable_blending":"disable blending",
+ "disable_clip":"disable clip",
+ "show_mask":"show desktop",
+ "save_bmp":"save bmp"
};
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index dce6078..a916e4d 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -709,5 +709,10 @@ export default {
"New Please enter a name":"新建 请输入名称",
"Please select an override":"请选择覆盖",
"confirm delete":"确定删除",
- "Whether to delete":"是否删除"
+ "Whether to delete":"是否删除",
+ "debugging":"调试",
+ "disable_blending":"禁用混合",
+ "disable_clip":"禁用裁剪",
+ "show_mask":"显示桌面",
+ "save_bmp":"保存BMP"
};
From 09f20b41239bbedec0f377fa1e6f555651bb615f Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Thu, 2 Feb 2023 16:21:37 +0800
Subject: [PATCH 46/78] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=A4=9A=E4=BD=99?=
=?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/FusionSettings/Debugging.vue | 63 ++++++++++++---------
src/components/FusionSettingsDialog.vue | 17 ------
2 files changed, 36 insertions(+), 44 deletions(-)
diff --git a/src/components/FusionSettings/Debugging.vue b/src/components/FusionSettings/Debugging.vue
index 3f9777b..ad7014d 100644
--- a/src/components/FusionSettings/Debugging.vue
+++ b/src/components/FusionSettings/Debugging.vue
@@ -1,22 +1,31 @@
-
-
-
+
+
+
-
-
-
+
+
+
+
+
-
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 5232926..e187f58 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -230,9 +230,6 @@ export default defineComponent({
const select_configuration = ref(false)
const del_dialog = ref(false)
const select_configuration_name = ref("")
- // const send_hide_desktop = () => {
- // set?.SetBlendingOption(hide_desktop_value_id.value, hide_desktop_value.value ? "1" : "0");
- // };
const send_disable_blending_params = () => {
set?.SetBlendingOption(disable_blending_params_id.value, disable_blending_params.value ? "1" : "0");
};
@@ -246,8 +243,6 @@ export default defineComponent({
const EnableBlending = ref(false);
let optionsstr = ref();
optionsstr.value = "FusionLocale";
- // const hide_desktop_value_id = ref("debug@show_mask");
- // const hide_desktop_value = ref(false);
const disable_blending_params_id = ref("1");
const disable_blending_params = ref(false);
const show_blending_grids_id = ref("blending_grids_show");
@@ -333,7 +328,6 @@ export default defineComponent({
set?.GetBlendingConfig("").then((res) => {
let tmp = JSON.parse(res ? res.config : "");
let local_options = [
- // [hide_desktop_value_id, hide_desktop_value],
[disable_blending_params_id, disable_blending_params],
[show_blending_grids_id, show_blending_grids]
];
@@ -359,7 +353,6 @@ export default defineComponent({
''
]
const apply_the_selected_configuration = () => {
- //这里根据选择的配置 应用
set?.ApplyBlendingScene(select_configuration_name.value).then((res) => {
let tmp = JSON.parse(res ? res.config : "");
EnableBlending.value = tmp.enable;
@@ -397,14 +390,6 @@ export default defineComponent({
set?.SaveBlendingConfig(save_cover_name.value);
clear();
save_cover_name.value = save_name.value = ''
- // set?.GetBlendingConfig("").then((res) => {
- // let tmp = JSON.parse(res ? res.config : "");
- // EnableBlending.value = tmp.enable;
- // $store.commit("setEnablefusion", tmp.enable);
- // config.value.col = tmp.col;
- // config.value.row = tmp.row;
- // $store.commit("setfusion_configuration", res?.config);
- // });
$store.commit("setSelectedProjector", "0/0");
}
@@ -429,8 +414,6 @@ export default defineComponent({
del_scenes,
filterFn,
setModel,
- // send_hide_desktop,
- // hide_desktop_value,
send_disable_blending_params,
disable_blending_params,
send_show_blending_grids,
From 6e04641016f52b3ac2640c1f61ad3f007a17c09a Mon Sep 17 00:00:00 2001
From: ljqing
Date: Thu, 2 Feb 2023 18:53:50 +0800
Subject: [PATCH 47/78] =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=AF=B9=E8=B1=A1?=
=?UTF-8?q?=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/FusionSettings/GridSettings.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index a6fed78..5fe5153 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -136,8 +136,8 @@ export default defineComponent({
}
const use_server_config = () => {
let server_conf = JSON.parse($store.state.fusion_configuration).options
- model[0] = Number(server_conf.blending_grids_row)
- model[1] = Number(server_conf.blending_grids_column)
+ model[0] = server_conf.blending_grids_row ? Number(server_conf.blending_grids_row) : 20;
+ model[1] = server_conf.blending_grids_column ? Number(server_conf.blending_grids_column) : 40;
color[0] = server_conf.blending_grids_line_color
RowsColumns[0] = server_conf.blending_grids_show_row === "false" ? false : true
From e388f61a9ce1aa2d2132f4a46c623eecf32a98ae Mon Sep 17 00:00:00 2001
From: ljqing
Date: Thu, 2 Feb 2023 19:10:09 +0800
Subject: [PATCH 48/78] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA?=
=?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/i18n/en-US/index.ts | 2 +-
src/i18n/zh-CN/index.ts | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index e097f76..59a8084 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -444,6 +444,6 @@ export default {
"debugging":"debugging",
"disable_blending":"disable blending",
"disable_clip":"disable clip",
- "show_mask":"show desktop",
+ "show_mask":"hide desktop",
"save_bmp":"save bmp"
};
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index a916e4d..49d81a1 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -713,6 +713,6 @@ export default {
"debugging":"调试",
"disable_blending":"禁用混合",
"disable_clip":"禁用裁剪",
- "show_mask":"显示桌面",
+ "show_mask":"隐藏桌面",
"save_bmp":"保存BMP"
};
From 1e19299d1f10920295d1fa55f221d64abd41e1b7 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 3 Feb 2023 09:28:29 +0800
Subject: [PATCH 49/78] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=BD=91=E6=A0=BC?=
=?UTF-8?q?=E9=A2=9C=E8=89=B2=E8=AE=BE=E7=BD=AEui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FusionSettings/GridSettings.vue | 64 +++++++++++++------
1 file changed, 46 insertions(+), 18 deletions(-)
diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index a6fed78..f594b57 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -24,11 +24,29 @@
-
-
{{ $t('line color') }}
-
-
+
+
+ {{ $t("line color") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -36,19 +54,34 @@
-
-
{{ $t('background color') }}
-
-
+
+
+ {{ $t("background color") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -76,14 +109,11 @@ export default defineComponent({
let $store = useStore();
let $t = useI18n();
const RowsColumns = reactive([false, false, false, false]);
- const hex = ref("")
- const isshowhex = ref(false);
const index = ref(0);
const color = reactive(["#ffffff", "#CCCCCC", "#000", "#000"]);
let model = reactive([20, 40]);
let options = ref([10, 20, 30, 40, 50]);
const submit = () => {
- isshowhex.value = false
switch (index.value) {
case 0:
set?.SetBlendingOption("blending_grids_line_color", color[index.value]);
@@ -169,10 +199,8 @@ export default defineComponent({
return {
model,
options,
- hex,
submit,
RowsColumns,
- isshowhex,
index,
color,
update_row_col,
From fe3d2695a1d844d058abd43185e403b4756b3218 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 3 Feb 2023 09:35:21 +0800
Subject: [PATCH 50/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BF=9D=E5=AD=98?=
=?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E9=87=8D=E6=96=B0=E8=AF=BB=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/FusionSettingsDialog.vue | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index e187f58..82aa9a9 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -388,9 +388,6 @@ export default defineComponent({
const saveconfig = () => {
set?.SaveBlendingConfig(save_cover_name.value);
- clear();
- save_cover_name.value = save_name.value = ''
- $store.commit("setSelectedProjector", "0/0");
}
const isdebug = computed(() => {
From 86834823b7658a4d3cb3cff70b6d317d0e5400d1 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 3 Feb 2023 09:55:28 +0800
Subject: [PATCH 51/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=BB=E5=8F=96?=
=?UTF-8?q?=E5=9C=BA=E6=99=AF=E6=97=B6=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/FusionSettingsDialog.vue | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 82aa9a9..ce064f5 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -309,19 +309,19 @@ export default defineComponent({
if (res == null || res.scenes.length == 0) return
plan_list.splice(0, plan_list.length);
for (let index = 0; index < res.scenes.length; index++) {
- plan_list.push(res.scenes[index]);
+ plan_list[index]=(res.scenes[index]);
}
})
}
onBeforeMount(() => {
- setTimeout(() => {
- try {
+ // setTimeout(() => {
+ // try {
- } catch (error) {
- erroe();
- }
- }, 1000);
+ // } catch (error) {
+ // erroe();
+ // }
+ // }, 1000);
});
onMounted(() => {
setTimeout(() => {
@@ -346,6 +346,7 @@ export default defineComponent({
$store.commit("setfusion_configuration", res?.config);
});
+ get_scenes()
}, 1000);
});
const save_cover_name = ref("")
From 08c19d630de7b779ca015f16f7774210f231f89c Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 3 Feb 2023 10:37:22 +0800
Subject: [PATCH 52/78] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=BF=BB=E8=AF=91=20?=
=?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BD=91=E6=A0=BC=E8=A1=8C=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/FusionSettings/FusionLocale.vue | 11 ++++++-----
src/components/FusionSettings/GridSettings.vue | 4 ++--
src/i18n/en-US/index.ts | 14 +++++++-------
3 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 1fd4470..c845938 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -18,7 +18,7 @@
(val !== null && val !== '') ||
$t('Please enter a number'),
(val) =>
- (val > -1 && val < 1080) || $t('Please enter 0-100'),
+ (val > -1 && val < config.height) || $t('Please enter 0-100'),
]" />
@@ -40,7 +40,7 @@
(val !== null && val !== '') ||
$t('Please enter a number'),
(val) =>
- (val > -1 && val < 1920) || $t('Please enter 0-100'),
+ (val > -1 && val < config.width) || $t('Please enter 0-100'),
]" />
@@ -58,7 +58,7 @@
(val !== null && val !== '') ||
$t('Please enter a number'),
(val) =>
- (val > -1 && val < 1920) || $t('Please enter 0-100'),
+ (val > -1 && val < config.width) || $t('Please enter 0-100'),
]" />
{{ $t('Whether to operate synchronously') }}
- (val > -1 && val < 1080) || $t('Please enter 0-100'),
+ (val > -1 && val < config.height) || $t('Please enter 0-100'),
]" />
@@ -564,7 +564,8 @@ export default defineComponent({
set_cache,
reduce,
add,
- auto_sync
+ auto_sync,
+ config
};
},
});
diff --git a/src/components/FusionSettings/GridSettings.vue b/src/components/FusionSettings/GridSettings.vue
index 0da8ea9..10c71ad 100644
--- a/src/components/FusionSettings/GridSettings.vue
+++ b/src/components/FusionSettings/GridSettings.vue
@@ -166,8 +166,8 @@ export default defineComponent({
}
const use_server_config = () => {
let server_conf = JSON.parse($store.state.fusion_configuration).options
- model[0] = server_conf.blending_grids_row ? Number(server_conf.blending_grids_row) : 20;
- model[1] = server_conf.blending_grids_column ? Number(server_conf.blending_grids_column) : 40;
+ model[0] = server_conf.blending_grids_row!=null ? Number(server_conf.blending_grids_row) : 20;
+ model[1] = server_conf.blending_grids_column!=null ? Number(server_conf.blending_grids_column) : 40;
color[0] = server_conf.blending_grids_line_color
RowsColumns[0] = server_conf.blending_grids_show_row === "false" ? false : true
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 59a8084..b56efd6 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -404,7 +404,7 @@ export default {
"Please input vaild host. example: 192.168.1.1 or 192.168.1.1:8080":
"Please Input Vaild Host. Example: 192.168.1.1 or 192.168.1.1:8080",
"equipment data": "Equipment Data",
- "fusion settings":"fusion settings",
+ "fusion settings":"Fusion Settings",
"FusionLocale":"Fusion Locale",
"FourPointCalibration":"Four Pint Calibration",
"SurfaceCorrection":"Surface Correction",
@@ -412,7 +412,7 @@ export default {
"GridSettings":"Grid Settings",
"point":"dot",
"reset":"reset",
- "upper fusion zone parameters":"upper fusion zone parameters",
+ "upper fusion zone parameters":"Upper Fusion Zone Parameters",
"Left fusion Band Parameters":"Left Fusion Band Parameters",
"Lower fusion Zone Parameters":"Lower Fusion Zone Parameters",
"Right fusion Band Parameters":"Right Fusion Band Parameters",
@@ -422,20 +422,20 @@ export default {
"Set Fusion Band Parameters":"Set Fusion Band Parameters",
"Projector":"Projector",
"resetall":"reset all",
- "save config":"save config",
+ "save config":"Save Config",
"Whether to enable integration":"Whether to enable integration",
"Whether to hide the desktop":"Whether to hide the desktop",
"resetall config":"resetall config",
"disable blending params":"Dsable blending params",
- "show blending grids":"show grids",
- "line color":"line color",
+ "show blending grids":"Show Grids",
+ "line color":"Line Color",
"center line color":"center line color",
"center circle color":"center circle color",
"Whether to operate synchronously":"Whether to operate synchronously",
- "Select saved configuration":"Select saved configuration",
+ "Select saved configuration":"Select saved Configuration",
"read saved configuration":"read saved configuration",
"please choose":"please choose",
- "save":"save",
+ "save":"Save",
"Whether to save the configuration":"Whether to save the configuration",
"New Please enter a name":"New Please enter a name",
"Please select an override":"Please select an override",
From 13d71b2a6bb897db82b967d01a75e9ee8e6019a1 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 3 Feb 2023 11:12:16 +0800
Subject: [PATCH 53/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=96=8F=E5=AF=86?=
=?UTF-8?q?=E6=A0=A1=E6=AD=A3=E7=82=B9=E4=B8=8D=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FusionSettings/DensityCorrection.vue | 17 +++++++++++++++++
src/i18n/en-US/index.ts | 2 +-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 6eaea61..90d89f8 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -261,6 +261,20 @@ export default defineComponent({
const ste_status = ref(0);
//为了加载 缓存的配置时 同步点的位置
const syncpoint = () => {
+ let x = 0
+ let y = 0
+ for (let index = 0; index < 5; index++) {
+ x = default_location[index].x;
+ y = Math.ceil((config.height - value[index].y) / Proportion.value.y);
+ setdianposin(index, x, y);
+ }
+
+ for (let index = 5; index < 10; index++) {
+ x = Math.ceil(value[index].x / Proportion.value.x);
+ y = default_location[5].y;
+ setdianposin(index, x, y);
+ }
+
for (let index = 0; index < value.length; index++) {
isactivearray.value[index] = false;
}
@@ -450,6 +464,7 @@ export default defineComponent({
}
};
+
onMounted(() => {
initialization();
Proportion.value.x = config.width / (div.value.offsetWidth - 40);
@@ -470,6 +485,8 @@ export default defineComponent({
Width * (index - 5);
}
}
+ use_server_config();
+ syncpoint();
});
//窗口变动重新渲染
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index b56efd6..4fefa64 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -441,7 +441,7 @@ export default {
"Please select an override":"Please select an override",
"confirm delete":"confirm delete",
"delete or not":"delete or not",
- "debugging":"debugging",
+ "debugging":"Debugging",
"disable_blending":"disable blending",
"disable_clip":"disable clip",
"show_mask":"hide desktop",
From 17b91ca8eef3393544d828f031e500386659e422 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 3 Feb 2023 13:49:06 +0800
Subject: [PATCH 54/78] =?UTF-8?q?=E5=85=81=E8=AE=B89=E7=82=B9=E6=A0=A1?=
=?UTF-8?q?=E6=AD=A37-9=E7=82=B9=E4=B8=BA=E8=B4=9F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FusionSettings/FusionLocale.vue | 26 +++++++++++++------
.../FusionSettings/SurfaceCorrection.vue | 9 ++++---
2 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index c845938..67fdb46 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -387,7 +387,7 @@ export default defineComponent({
array[1].isshow,
Number(array[1].value)
);
- if (auto_sync.value) left_right_auto_add(newVal - oldVal);
+ if (auto_sync.value) left_right_auto_add(newVal);
save_set_cache();
},
{ deep: true }
@@ -403,7 +403,7 @@ export default defineComponent({
array[2].isshow,
Number(array[2].value)
);
- if (auto_sync.value) left_right_auto_add(newVal - oldVal);
+ if (auto_sync.value) left_right_auto_add(newVal);
save_set_cache();
},
{ deep: true }
@@ -451,7 +451,7 @@ export default defineComponent({
array[1].isshow,
Number(array[1].value)
);
- if (auto_sync.value) left_right_auto_add(0);
+ if (auto_sync.value) left_right_auto_add(-1);
save_set_cache();
},
{ deep: true }
@@ -467,7 +467,7 @@ export default defineComponent({
array[2].isshow,
Number(array[2].value)
);
- if (auto_sync.value) left_right_auto_add(0);
+ if (auto_sync.value) left_right_auto_add(-1);
save_set_cache();
},
{ deep: true }
@@ -527,8 +527,13 @@ export default defineComponent({
set_cache_tmp = tmp
}
if (ste_status.value == 0) {
- set_cache_tmp[1].value = Number(set_cache_tmp[1].value) + difference
- set_cache_tmp[1].isshow = array[2].isshow
+ //set_cache_tmp[1].value = Number(set_cache_tmp[1].value) + difference
+
+ if(difference==-1){
+ set_cache_tmp[1].isshow = array[2].isshow
+ }else{
+ set_cache_tmp[1].value = difference
+ }
set?.SetBlendingOverlap(0, 1, 0, set_cache_tmp[1].isshow, Number(set_cache_tmp[1].value));
set_cache.value[1] = JSON.stringify(set_cache_tmp);
}
@@ -546,8 +551,13 @@ export default defineComponent({
set_cache_tmp = tmp
}
if (ste_status.value == 0) {
- set_cache_tmp[2].value = Number(set_cache_tmp[2].value) + difference
- set_cache_tmp[2].isshow = array[1].isshow
+ //set_cache_tmp[2].value = Number(set_cache_tmp[2].value) + difference
+
+ if(difference==-1){
+ set_cache_tmp[2].isshow = array[1].isshow
+ }else{
+ set_cache_tmp[2].value = difference
+ }
set?.SetBlendingOverlap(0, 0, 2, set_cache_tmp[2].isshow, Number(set_cache_tmp[2].value));
set_cache.value[0] = JSON.stringify(set_cache_tmp);
}
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index 7c4a83a..1037a5d 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -339,8 +339,9 @@ export default defineComponent({
let y = Math.abs(
Math.ceil((data.top - ninepostion.value[6].y) * Proportion.value.y)
);
+ if(data.top>ninepostion.value[6].y)y= Math.ceil((ninepostion.value[6].y-data.top ) * Proportion.value.y)
nine[6].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
- nine[6].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+ nine[6].y = y > config.height ? config.height : y;
save_set_cache();
};
const moveHandler_8 = (data: any) => {
@@ -350,8 +351,9 @@ export default defineComponent({
let y = Math.abs(
Math.ceil((data.top - ninepostion.value[7].y) * Proportion.value.y)
);
+ if(data.top>ninepostion.value[7].y)y= Math.ceil((ninepostion.value[7].y-data.top ) * Proportion.value.y)
nine[7].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
- nine[7].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+ nine[7].y = y > config.height ? config.height : y ;
save_set_cache();
};
const moveHandler_9 = (data: any) => {
@@ -361,8 +363,9 @@ export default defineComponent({
let y = Math.abs(
Math.ceil((data.top - ninepostion.value[8].y) * Proportion.value.y)
);
+ if(data.top>ninepostion.value[8].y)y= Math.ceil((ninepostion.value[8].y-data.top ) * Proportion.value.y)
nine[8].x = x > config.width ? config.width : x && x < 0 ? 0 : x;
- nine[8].y = y > config.height ? config.height : y && y < 0 ? 0 : y;
+ nine[8].y = y > config.height ? config.height : y ;
save_set_cache();
};
From b17435d0dd9de7a2634901e90709801b1b3537aa Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 3 Feb 2023 14:00:18 +0800
Subject: [PATCH 55/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B9=9D=E7=82=B9?=
=?UTF-8?q?=E6=A0=A1=E6=AD=A3=E5=88=86=E8=BE=A8=E7=8E=87=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E4=BB=8E=E6=9C=8D=E5=8A=A1=E7=AB=AF=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/FusionSettings/SurfaceCorrection.vue | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index 1037a5d..1c558e1 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -515,8 +515,8 @@ export default defineComponent({
for (let index = 0; index < defaultninepostion.value.length; index++) {
defaultninepostion.value[index].x = ninepostion.value[index].x;
defaultninepostion.value[index].y = ninepostion.value[index].y;
- defaultnine.value[index].x = nine[index].x;
- defaultnine.value[index].y = nine[index].y;
+ defaultnine.value[index].x = config.point9[index].def_x;
+ defaultnine.value[index].y = config.point9[index].def_y;
}
if (sessionStorage.SurfaceCorrection) {
set_cache.value = JSON.parse(sessionStorage.SurfaceCorrection);
@@ -532,8 +532,8 @@ export default defineComponent({
for (let index = 0; index < defaultninepostion.value.length; index++) {
// defaultninepostion.value[index].x = ninepostion.value[index].x;
// defaultninepostion.value[index].y = ninepostion.value[index].y;
- defaultnine.value[index].x = nine[index].x;
- defaultnine.value[index].y = nine[index].y;
+ defaultnine.value[index].x = config.point9[index].def_x;
+ defaultnine.value[index].y = config.point9[index].def_y;
nine[index].x = config.point9[index].x;
nine[index].y = config.point9[index].y;
}
From fed77c3e81273bbabf557a9323d4e583294abefe Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 3 Feb 2023 17:21:36 +0800
Subject: [PATCH 56/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B0=83=E8=AF=95?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=88=87=E6=8D=A2=E6=97=B6=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E9=87=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/FusionSettings/Debugging.vue | 1 +
.../FusionSettings/DebuggingItem.vue | 35 ++++++++++
src/components/FusionSettingsDialog.vue | 68 ++++++++++---------
src/i18n/en-US/index.ts | 3 +-
src/i18n/zh-CN/index.ts | 3 +-
5 files changed, 75 insertions(+), 35 deletions(-)
diff --git a/src/components/FusionSettings/Debugging.vue b/src/components/FusionSettings/Debugging.vue
index ad7014d..b1a0d7f 100644
--- a/src/components/FusionSettings/Debugging.vue
+++ b/src/components/FusionSettings/Debugging.vue
@@ -50,6 +50,7 @@ export default defineComponent({
DebuggingItem,
},
setup() {
+
let set = GlobalData.getInstance().getCurrentClient();
let $store = useStore();
let $t = useI18n();
diff --git a/src/components/FusionSettings/DebuggingItem.vue b/src/components/FusionSettings/DebuggingItem.vue
index 7b65ed5..1e4bdd1 100644
--- a/src/components/FusionSettings/DebuggingItem.vue
+++ b/src/components/FusionSettings/DebuggingItem.vue
@@ -51,7 +51,42 @@ export default defineComponent({
val.value=props.value=="1"?true:false
const send = () => {
set?.SetBlendingOption(props.name, val.value ? "1" : "0");
+
}
+ const use_sessionStorage=()=>{
+ if(sessionStorage.Debugging){
+ let tmp=JSON.parse(sessionStorage.Debugging);
+ for (let index = 0;index < tmp.length; index++) {
+ if(Object.keys(tmp[index])[0]==props.name){
+ val.value=Object.values(tmp[index])[0]=="1"?true:false
+ break
+ }
+ }
+ }
+ }
+ onMounted(()=>{
+ use_sessionStorage()
+ })
+ onBeforeUnmount(() => {
+ let key=props.name
+ let value=val.value
+ if(sessionStorage.Debugging){
+ let tmp=JSON.parse(sessionStorage.Debugging);
+ let count=0;
+ for (let index = 0;index < tmp.length; index++) {
+ if(Object.keys(tmp[index])[0]==key){
+ tmp[index]={[key]:value}
+ break
+ }
+ count=index
+ }
+ if(count==tmp.length-1)tmp.push({[key]:value});
+ sessionStorage.Debugging = JSON.stringify(tmp);
+ }else{
+ sessionStorage.Debugging = JSON.stringify([{[key]:value}]);
+ }
+
+ });
return {
send,
val,
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index ce064f5..796596b 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -237,8 +237,31 @@ export default defineComponent({
set?.SetBlendingOption(show_blending_grids_id.value, show_blending_grids.value ? "1" : "0");
};
const resetall = () => {
- set?.ResetBlendingConfig()
+ set?.ResetBlendingConfig().then((res) => {
+ let tmp = JSON.parse(res ? res.config : "");
+ EnableBlending.value = tmp.enable;
+ $store.commit("setEnablefusion", tmp.enable);
+ config.value.col = tmp.col;
+ config.value.row = tmp.row;
+ $store.commit("setfusion_configuration", res?.config);
+ });
+ let tmp = options.value
+ options.value = ""
+ $store.commit("setSelectedProjector", "0/0");
+ setTimeout(() => {
+ clear_sessionStorage()
+ options.value = tmp
+ }, 300);
}
+ const clear_sessionStorage=()=>{
+ sessionStorage.removeItem("FusionLocale");
+ sessionStorage.removeItem("SurfaceCorrection");
+ sessionStorage.removeItem("DensityCorrection");
+ sessionStorage.removeItem("FourPointCalibration");
+ sessionStorage.removeItem("GridSettings");
+ sessionStorage.removeItem("Debugging");
+ }
+
const config = ref({ col: 0, row: 0 });
const EnableBlending = ref(false);
let optionsstr = ref();
@@ -265,15 +288,6 @@ export default defineComponent({
{ deep: true }
);
- const erroe = () => {
- $q.notify({
- color: "negative",
- icon: "warning",
- message: "数据获取失败!",
- position: "top",
- timeout: 1500,
- });
- };
const save = () => {
medium.value = true
//读取场景
@@ -294,11 +308,7 @@ export default defineComponent({
send_show_blending_grids();
$store.commit("setSelectedProjector", "0/0");
setTimeout(() => {
- sessionStorage.removeItem("FusionLocale");
- sessionStorage.removeItem("SurfaceCorrection");
- sessionStorage.removeItem("DensityCorrection");
- sessionStorage.removeItem("FourPointCalibration");
- sessionStorage.removeItem("GridSettings");
+ clear_sessionStorage()
}, 500);
options.value="FusionLocale"
};
@@ -314,15 +324,6 @@ export default defineComponent({
})
}
- onBeforeMount(() => {
- // setTimeout(() => {
- // try {
-
- // } catch (error) {
- // erroe();
- // }
- // }, 1000);
- });
onMounted(() => {
setTimeout(() => {
set?.GetBlendingConfig("").then((res) => {
@@ -355,7 +356,7 @@ export default defineComponent({
]
const apply_the_selected_configuration = () => {
set?.ApplyBlendingScene(select_configuration_name.value).then((res) => {
- let tmp = JSON.parse(res ? res.config : "");
+ let tmp = JSON.parse(res ? res.config : "{}");
EnableBlending.value = tmp.enable;
$store.commit("setEnablefusion", tmp.enable);
config.value.col = tmp.col;
@@ -367,13 +368,10 @@ export default defineComponent({
options.value = ""
$store.commit("setSelectedProjector", "0/0");
setTimeout(() => {
- sessionStorage.removeItem("FusionLocale");
- sessionStorage.removeItem("SurfaceCorrection");
- sessionStorage.removeItem("DensityCorrection");
- sessionStorage.removeItem("FourPointCalibration");
- sessionStorage.removeItem("GridSettings");
+ clear_sessionStorage()
options.value = tmp
}, 800);
+ getconfig()
}
const plan_list_op = ref(plan_list)
const filterFn = (val: any, update: any, abort: any) => {
@@ -392,9 +390,13 @@ export default defineComponent({
}
const isdebug = computed(() => {
- let tmp = JSON.parse($store.state.fusion_configuration)
- let str = 'debug@show_mask'
- return tmp.options[str] == '1' || record_times.value > 2
+ try {
+ let tmp = JSON.parse($store.state.fusion_configuration)
+ return record_times.value > 2
+ } catch (error) {
+
+ }
+
})
const name_to_be_deleted=ref("");
const del_scenes=(name:string)=>{
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index 4fefa64..e9ff0cc 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -445,5 +445,6 @@ export default {
"disable_blending":"disable blending",
"disable_clip":"disable clip",
"show_mask":"hide desktop",
- "save_bmp":"save bmp"
+ "save_bmp":"save bmp",
+ "disable_blending_params":"disable blending params"
};
diff --git a/src/i18n/zh-CN/index.ts b/src/i18n/zh-CN/index.ts
index 49d81a1..eda3390 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -714,5 +714,6 @@ export default {
"disable_blending":"禁用混合",
"disable_clip":"禁用裁剪",
"show_mask":"隐藏桌面",
- "save_bmp":"保存BMP"
+ "save_bmp":"保存BMP",
+ "disable_blending_params":"禁用融合参数"
};
From a9f61b1651338095a6e4115fa2c0cc7e5c5104cd Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 3 Feb 2023 19:01:51 +0800
Subject: [PATCH 57/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=20=E8=9E=8D=E5=90=88?=
=?UTF-8?q?=E5=8F=82=E6=95=B0=E5=9C=A8=E7=95=8C=E9=9D=A2=E5=85=B3=E9=97=AD?=
=?UTF-8?q?=E5=90=8E=E5=86=8D=E6=AC=A1=E6=89=93=E5=BC=80=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/FusionSettings/FusionLocale.vue | 8 +++++++-
src/components/FusionSettingsDialog.vue | 1 +
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index 67fdb46..b310983 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -141,6 +141,7 @@ import {
withDefaults,
onBeforeUnmount,
reactive,
+onMounted,
} from "vue";
import { useStore } from "src/store";
import { useI18n } from "vue-i18n";
@@ -190,6 +191,7 @@ export default defineComponent({
default:
break;
}
+ chang(type)
save_set_cache()
}
const reduce = (type: string) => {
@@ -208,6 +210,8 @@ export default defineComponent({
default:
break;
}
+ chang(type)
+ save_set_cache()
}
const ste_status = ref(0);
const use_set_cache = () => {
@@ -355,7 +359,9 @@ export default defineComponent({
array[arr[index]].value = Number(config.params[index].size);
}
};
- startconfig();
+ onMounted(() => {
+ startconfig();
+ }),
onBeforeUnmount(() => {
sessionStorage.FusionLocale = JSON.stringify(set_cache.value);
});
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 796596b..cf4bfe3 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -310,6 +310,7 @@ export default defineComponent({
setTimeout(() => {
clear_sessionStorage()
}, 500);
+ getconfig()
options.value="FusionLocale"
};
From 93c3a89a6dc2b909a5ddadfdf6eb0f5ff4a2f686 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Fri, 3 Feb 2023 20:05:10 +0800
Subject: [PATCH 58/78] =?UTF-8?q?=E5=8A=A0=E5=85=A5=20=E9=80=89=E6=8B=A9?=
=?UTF-8?q?=E6=8A=95=E5=BD=B1=E6=9C=BA=20=E9=80=89=E6=8B=A9=E8=B0=83?=
=?UTF-8?q?=E8=8A=82=E9=A1=B5=E9=9D=A2=20=E9=80=89=E6=8B=A9=E6=8E=A7?=
=?UTF-8?q?=E5=88=B6=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FusionSettings/DensityCorrection.vue | 29 +++--
.../FusionSettings/FourPointCalibration.vue | 1 +
.../FusionSettings/FusionLocale.vue | 33 +++--
.../FusionSettings/GridSettings.vue | 2 +-
.../FusionSettings/SurfaceCorrection.vue | 1 +
src/components/FusionSettingsDialog.vue | 117 +++++++++++-------
6 files changed, 114 insertions(+), 69 deletions(-)
diff --git a/src/components/FusionSettings/DensityCorrection.vue b/src/components/FusionSettings/DensityCorrection.vue
index 90d89f8..295648c 100644
--- a/src/components/FusionSettings/DensityCorrection.vue
+++ b/src/components/FusionSettings/DensityCorrection.vue
@@ -5,43 +5,43 @@
↑
V1
↓
↑
V2
↓
↑
V3
↓
↑
V4
↓
↑
V5
↓
←H1→
←H2→
←H3→
←H4→
←H5→
@@ -693,8 +693,17 @@ export default defineComponent({
}
save_set_cache();
};
+ const activeMouseDown = (index: number) => {
+ isactivearray.value[index] = true;
+ if(index>=5){
+ set?.SetBlendingOption("blending_grids_select_point",`density_h:${index-4}`)
+ }else{
+ set?.SetBlendingOption("blending_grids_select_point",`density_v:${index+1}`)
+ }
+ };
initialization();
return {
+ activeMouseDown,
model,
options,
value,
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 8e79fb7..660a574 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -307,6 +307,7 @@ export default defineComponent({
});
const activeMouseDown = (index: number) => {
isactivearray.value[index] = true;
+ set?.SetBlendingOption("blending_grids_select_point",`4:${index+1}`)
};
const mouseUpHandler = (index: number) => {
isactivearray.value[index] = false;
diff --git a/src/components/FusionSettings/FusionLocale.vue b/src/components/FusionSettings/FusionLocale.vue
index b310983..4f8d7ce 100644
--- a/src/components/FusionSettings/FusionLocale.vue
+++ b/src/components/FusionSettings/FusionLocale.vue
@@ -18,7 +18,7 @@
(val !== null && val !== '') ||
$t('Please enter a number'),
(val) =>
- (val > -1 && val < config.height) || $t('Please enter 0-100'),
+ (val >= 0 && val < config.height) || $t('Please enter 0-100'),
]" />
@@ -40,7 +40,7 @@
(val !== null && val !== '') ||
$t('Please enter a number'),
(val) =>
- (val > -1 && val < config.width) || $t('Please enter 0-100'),
+ (val >= 0 && val < config.width) || $t('Please enter 0-100'),
]" />
@@ -58,7 +58,7 @@
(val !== null && val !== '') ||
$t('Please enter a number'),
(val) =>
- (val > -1 && val < config.width) || $t('Please enter 0-100'),
+ (val >= 0 && val < config.width) || $t('Please enter 0-100'),
]" />
{{ $t('Whether to operate synchronously') }}
- (val > -1 && val < config.height) || $t('Please enter 0-100'),
+ (val >= 0 && val < config.height) || $t('Please enter 0-100'),
]" />
@@ -95,26 +95,26 @@
{{ $t("Set Fusion Band Parameters") }}
+
-
+
p
+
-
+
gamma
@@ -129,6 +129,13 @@
.boder {
border: 2px solid #0000;
}
+.btn_bottom{
+ margin-bottom: 0.5rem;
+}
+.btn_top{
+ margin-top: 0.3rem;
+}
+
diff --git a/src/components/FusionSettings/FourPointCalibration.vue b/src/components/FusionSettings/FourPointCalibration.vue
index 772f124..88c0f28 100644
--- a/src/components/FusionSettings/FourPointCalibration.vue
+++ b/src/components/FusionSettings/FourPointCalibration.vue
@@ -1,120 +1,97 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
- 1
-
-
- 2
-
-
- 3
-
-
- 4
-
+
+ {{
+ index+ 1
+ }}
+
-
+
+
+
+
+
{ options_model = val }" :options="options" emit-value
+ map-options />
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
-
diff --git a/src/components/FusionSettings/SurfaceCorrection.vue b/src/components/FusionSettings/SurfaceCorrection.vue
index 71d21ad..60e6750 100644
--- a/src/components/FusionSettings/SurfaceCorrection.vue
+++ b/src/components/FusionSettings/SurfaceCorrection.vue
@@ -1,222 +1,133 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
- 1
-
-
- 2
-
-
- 3
-
-
- 4
-
-
- 5
-
-
- 6
-
-
- 7
-
-
- 8
-
-
- 9
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ {{
+ index+ 1
+ }}
+
+
+
+
+
+
{ chang_point_amount(val) }" :dense="true" filled v-model="value_point_amount"
+ :options="options_value_point_amount" emit-value map-options />
+
+
+
+
+
+
{ del_dialog = true }" text-color="black"
+ :label="$t('reduce control points')" />
+
+
+
+
+
+
{ options_model = val }" :options="options" emit-value
+ map-options />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t('confirm delete') }}
+
+
+ {{ $t('OK to delete you will lose the data you adjusted now') }}
+
+
+
+
+
+
+
+
+
diff --git a/src/components/FusionSettingsDialog.vue b/src/components/FusionSettingsDialog.vue
index 8d555a8..5e7abdc 100644
--- a/src/components/FusionSettingsDialog.vue
+++ b/src/components/FusionSettingsDialog.vue
@@ -321,7 +321,7 @@ export default defineComponent({
tmp = '9'
break;
case 'DensityCorrection':
- tmp = 'density'
+ tmp = 'hor_density'
break;
default:
break;
diff --git a/src/entities/DensityCorrection.ts b/src/entities/DensityCorrection.ts
new file mode 100644
index 0000000..2b43f5c
--- /dev/null
+++ b/src/entities/DensityCorrection.ts
@@ -0,0 +1,7 @@
+export default class DensityCorrection {
+ control_point = 0;
+ x = 0;
+ y = 0;
+ def_x = 0;
+ def_y = 0;
+}
diff --git a/src/entities/DensityCorrectionPoint.ts b/src/entities/DensityCorrectionPoint.ts
new file mode 100644
index 0000000..6c1cf6b
--- /dev/null
+++ b/src/entities/DensityCorrectionPoint.ts
@@ -0,0 +1,7 @@
+export default class DensityCorrectionPoint {
+ control_point = 0;
+ x = 0;
+ y = 0;
+ def_x = 0;
+ def_y = 0;
+}
diff --git a/src/i18n/en-US/index.ts b/src/i18n/en-US/index.ts
index ef22767..184cc91 100644
--- a/src/i18n/en-US/index.ts
+++ b/src/i18n/en-US/index.ts
@@ -453,5 +453,13 @@ export default {
"line width":"line width",
"level":"level",
"vertical":"vertical",
- "auxiliary lines":"auxiliary lines"
+ "auxiliary lines":"auxiliary lines",
+ "level point":"level point amount",
+ "vertical point ":"vertical point amount",
+ "point amount":"point amount",
+ "add control points":"add control points",
+ "reduce control points":"reduce 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 7b55ac1..ffc897e 100644
--- a/src/i18n/zh-CN/index.ts
+++ b/src/i18n/zh-CN/index.ts
@@ -722,5 +722,13 @@ export default {
"line width":"线宽",
"level":"水平",
"vertical":"垂直",
- "auxiliary lines":"辅助线"
+ "auxiliary lines":"辅助线",
+ "level point":"水平点数量",
+ "vertical point":"垂直点数量",
+ "point amount":"点数量",
+ "add 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":"是否添加控制点"
};
From 12a940a55f4f88e51af261422612e98d00f78fe7 Mon Sep 17 00:00:00 2001
From: shefengchun <1077478963@qq.com>
Date: Wed, 15 Feb 2023 15:08:47 +0800
Subject: [PATCH 78/78] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8A=A8=E6=80=81?=
=?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=9A=84=E4=B8=80=E4=BA=9B=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../FusionSettings/DensityCorrection.vue | 34 ++++++++++++------
.../FusionSettings/FourPointCalibration.vue | 6 +++-
.../FusionSettings/GridSettings.vue | 2 +-
.../FusionSettings/SurfaceCorrection.vue | 22 ++++++++----
src/components/FusionSettingsDialog.vue | 36 +++++++++++++++++--
src/i18n/en-US/index.ts | 2 +-
src/i18n/zh-CN/index.ts | 2 +-
7 files changed, 80 insertions(+), 24 deletions(-)
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 @@
-
{ del_dialog = true }" text-color="black"
+ { del_dialog = true }" :disable="value_v_point_amount<=5" text-color="black"
:label="$t('reduce control points')" />
@@ -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 @@
-
+
-
{ del_dialog = true }" text-color="black"
+ { del_dialog = true }" :disable="value_point_amount<=9" text-color="black"
:label="$t('reduce control points')" />
@@ -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":"是否添加控制点"