lingling
/
media_player_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加交互增加设置分辨率

This commit is contained in:
shefengchun 2023-02-16 16:31:29 +08:00
parent 3fcd25ec96
commit b4338153f9
6 changed files with 56 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/FusionSettings/DensityCorrection.vue
View File

@ -194,6 +194,7 @@ export default defineComponent({
}); });
//用于计算当前投影仪的索引 //用于计算当前投影仪的索引
let allconfig = JSON.parse($store.state.fusion_configuration);
let serverconfig = JSON.parse($store.state.fusion_configuration); let serverconfig = JSON.parse($store.state.fusion_configuration);
const selectedprojector = computed(() => { const selectedprojector = computed(() => {
return ( return (
@ -449,7 +450,7 @@ export default defineComponent({
*/ */
const coordinate_transformation_value_to_xy = (x: number, y: number): { x: number, y: number } => { const coordinate_transformation_value_to_xy = (x: number, y: number): { x: number, y: number } => {
x = x / Proportion.value.x x = x / Proportion.value.x
y = (config.height - y) / Proportion.value.y y = (allconfig.projector_height - y) / Proportion.value.y
return { x, y } return { x, y }
} }
@ -515,8 +516,8 @@ export default defineComponent({
} }
start() start()
onMounted(() => { onMounted(() => {
Proportion.value.x = config.width / (div.value.offsetWidth - point.value.w) Proportion.value.x = allconfig.projector_width / (div.value.offsetWidth - point.value.w)
Proportion.value.y = config.height / (div.value.offsetHeight - point.value.h) Proportion.value.y = allconfig.projector_height / (div.value.offsetHeight - point.value.h)
options_value_h_point_amount.value = Object.keys(config.multi_hor_density) 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)
let tmp = JSON.parse($store.state.fusion_configuration).options; let tmp = JSON.parse($store.state.fusion_configuration).options;
@ -723,8 +724,8 @@ export default defineComponent({
*/ */
const recalculate_coordinates = () => { const recalculate_coordinates = () => {
try { try {
Proportion.value.x = config.width / (div.value.offsetWidth - point.value.w) Proportion.value.x = allconfig.projector_width / (div.value.offsetWidth - point.value.w)
Proportion.value.y = config.height / (div.value.offsetHeight - point.value.h) Proportion.value.y = allconfig.projector_height / (div.value.offsetHeight - point.value.h)
max.value.x = div.value.offsetWidth max.value.x = div.value.offsetWidth
max.value.y = div.value.offsetHeight max.value.y = div.value.offsetHeight
for (let index = 0; index < value_v_point_amount.value; index++) { for (let index = 0; index < value_v_point_amount.value; index++) {

14
src/components/FusionSettings/FourPointCalibration.vue
View File

@ -88,6 +88,7 @@ export default defineComponent({
let $store = useStore(); let $store = useStore();
let $t = useI18n(); let $t = useI18n();
const ste_status = ref(0); const ste_status = ref(0);
let allconfig = JSON.parse($store.state.fusion_configuration);
let config = JSON.parse($store.state.fusion_configuration).projectors[0]; let config = JSON.parse($store.state.fusion_configuration).projectors[0];
const configselsect = computed(() => { const configselsect = computed(() => {
return $store.state.selected_projector; return $store.state.selected_projector;
@ -245,7 +246,7 @@ export default defineComponent({
*/ */
const coordinate_transformation_value_to_xy = (x: number, y: number): { x: number, y: number } => { const coordinate_transformation_value_to_xy = (x: number, y: number): { x: number, y: number } => {
x = x / Proportion.value.x x = x / Proportion.value.x
y = (config.height - y) / Proportion.value.y y = (allconfig.projector_height - y) / Proportion.value.y
return { x, y } return { x, y }
} }
@ -291,8 +292,8 @@ export default defineComponent({
} }
start() start()
onMounted(() => { onMounted(() => {
Proportion.value.x = config.width / (div.value.offsetWidth - point.value.w) Proportion.value.x = allconfig.projector_width / (div.value.offsetWidth - point.value.w)
Proportion.value.y = config.height / (div.value.offsetHeight - point.value.h) Proportion.value.y = allconfig.projector_height / (div.value.offsetHeight - point.value.h)
start_point() start_point()
start() start()
use_server_config() use_server_config()
@ -319,8 +320,6 @@ export default defineComponent({
const reset = (index: number, send: boolean, type: string) => { const reset = (index: number, send: boolean, type: string) => {
value.value[index].x = value.value[index].def_x value.value[index].x = value.value[index].def_x
value.value[index].y = value.value[index].def_y value.value[index].y = value.value[index].def_y
// value_point.value[index].x = value_point.value[index].def_x
// value_point.value[index].y = value_point.value[index].def_y
chang(index, value.value[index].def_y, type) chang(index, value.value[index].def_y, type)
save_set_cache() save_set_cache()
} }
@ -336,14 +335,13 @@ export default defineComponent({
let tmp = coordinate_transformation_value_to_xy(value.value[index].x, value.value[index].y) let tmp = coordinate_transformation_value_to_xy(value.value[index].x, value.value[index].y)
value_point.value[index].y = Math.round(tmp.y) value_point.value[index].y = Math.round(tmp.y)
value_point.value[index].x = Math.round(tmp.x) value_point.value[index].x = Math.round(tmp.x)
//reset(index, true, 'v')
} }
send_value(-2,0,0) send_value(-2,0,0)
} }
const recalculate_coordinates = () => { const recalculate_coordinates = () => {
try { try {
Proportion.value.x = config.width / (div.value.offsetWidth - point.value.w) Proportion.value.x = allconfig.projector_width / (div.value.offsetWidth - point.value.w)
Proportion.value.y = config.height / (div.value.offsetHeight - point.value.h) Proportion.value.y = allconfig.projector_height / (div.value.offsetHeight - point.value.h)
max.value.x = div.value.offsetWidth max.value.x = div.value.offsetWidth
max.value.y = div.value.offsetHeight max.value.y = div.value.offsetHeight
for (let index = 0; index < value.value.length; index++) { for (let index = 0; index < value.value.length; index++) {

11
src/components/FusionSettings/SurfaceCorrection.vue
View File

@ -124,6 +124,7 @@ export default defineComponent({
let $store = useStore(); let $store = useStore();
let $t = useI18n(); let $t = useI18n();
const ste_status = ref(0); const ste_status = ref(0);
let allconfig = JSON.parse($store.state.fusion_configuration);
let config = JSON.parse($store.state.fusion_configuration).projectors[0]; let config = JSON.parse($store.state.fusion_configuration).projectors[0];
const configselsect = computed(() => { const configselsect = computed(() => {
return $store.state.selected_projector; return $store.state.selected_projector;
@ -297,7 +298,7 @@ export default defineComponent({
*/ */
const coordinate_transformation_value_to_xy = (x: number, y: number): { x: number, y: number } => { const coordinate_transformation_value_to_xy = (x: number, y: number): { x: number, y: number } => {
x = x / Proportion.value.x x = x / Proportion.value.x
y = (config.height - y) / Proportion.value.y y = (allconfig.projector_height - y) / Proportion.value.y
return { x, y } return { x, y }
} }
@ -340,8 +341,8 @@ export default defineComponent({
} }
start() start()
onMounted(() => { onMounted(() => {
Proportion.value.x = config.width / (div.value.offsetWidth - point.value.w) Proportion.value.x = allconfig.projector_width / (div.value.offsetWidth - point.value.w)
Proportion.value.y = config.height / (div.value.offsetHeight - point.value.h) Proportion.value.y = allconfig.projector_height / (div.value.offsetHeight - point.value.h)
start_point(9) start_point(9)
start() start()
use_server_config() use_server_config()
@ -389,8 +390,8 @@ export default defineComponent({
} }
const recalculate_coordinates = () => { const recalculate_coordinates = () => {
try { try {
Proportion.value.x = config.width / (div.value.offsetWidth - point.value.w) Proportion.value.x = allconfig.projector_width / (div.value.offsetWidth - point.value.w)
Proportion.value.y = config.height / (div.value.offsetHeight - point.value.h) Proportion.value.y = allconfig.projector_height / (div.value.offsetHeight - point.value.h)
max.value.x = div.value.offsetWidth max.value.x = div.value.offsetWidth
max.value.y = div.value.offsetHeight max.value.y = div.value.offsetHeight
for (let index = 0; index < value.value.length; index++) { for (let index = 0; index < value.value.length; index++) {

39
src/components/FusionSettingsDialog.vue
View File

@ -48,7 +48,7 @@
}}<q-checkbox v-model="EnableBlending" /> }}<q-checkbox v-model="EnableBlending" />
</div> </div>
<div class="col-3 q-px-md"> <q-select class="q-pt-md " :label="$t('change resolution')" <div class="col-3 q-px-md"> <q-select class="q-pt-md " :label="$t('change resolution')"
@update:model-value="(val) => { now_resolution = val }" :dense="true" filled v-model="now_resolution" @update:model-value="(val) => { set_resolution(val) }" :dense="true" filled v-model="now_resolution"
:options="options_resolution" emit-value map-options /></div> :options="options_resolution" emit-value map-options /></div>
</div> </div>
<div class="col-10"> <div class="col-10">
@ -238,7 +238,7 @@ export default defineComponent({
const send_disable_blending_params = () => { const send_disable_blending_params = () => {
set?.SetBlendingOption(disable_blending_params_id.value, disable_blending_params.value ? "1" : "0"); set?.SetBlendingOption(disable_blending_params_id.value, disable_blending_params.value ? "1" : "0");
}; };
const now_resolution=ref("") const now_resolution=ref(1)
// let allconfig = JSON.parse($store.state.fusion_configuration); // let allconfig = JSON.parse($store.state.fusion_configuration);
let allconfig = JSON.parse("{\"resolution\": [{\"width\": 1024,\"height\": 768}]}"); let allconfig = JSON.parse("{\"resolution\": [{\"width\": 1024,\"height\": 768}]}");
const options_resolution = computed(() => { const options_resolution = computed(() => {
@ -290,10 +290,8 @@ export default defineComponent({
set?.SetBlendingOption("blending_grids_select_point", `9:${child.value!.options_model+1}`) set?.SetBlendingOption("blending_grids_select_point", `9:${child.value!.options_model+1}`)
break; break;
case 'DensityCorrection': case 'DensityCorrection':
//console.log(child.value!.now_v_h)
if(child.value!.now_v_h=='vertical'){ if(child.value!.now_v_h=='vertical'){
set?.SetBlendingOption("blending_grids_select_point", `${child.value!.options_model_v+1}`) set?.SetBlendingOption("blending_grids_select_point", `${child.value!.options_model_v+1}`)
//value_h_point_amount
set?.SetBlendingOption("blending_grids_control_point_count", `${child.value!.value_v_point_amount}`) set?.SetBlendingOption("blending_grids_control_point_count", `${child.value!.value_v_point_amount}`)
}else{ }else{
set?.SetBlendingOption("blending_grids_select_point", `${child.value!.options_model_h+1}`) set?.SetBlendingOption("blending_grids_select_point", `${child.value!.options_model_h+1}`)
@ -357,6 +355,27 @@ export default defineComponent({
{ deep: true } { deep: true }
); );
const set_resolution=(index:number)=>{
//SetProjectorResolution
$q.loading.show({
message: 'Loading please wait'
})
let w =allconfig.resolution[index].width
let h =allconfig.resolution[index].height
set?.SetProjectorResolution(w,h).then((res)=>{
$store.commit("setfusion_configuration", res?.config);
})
let tmp = options.value
options.value = ""
$store.commit("setSelectedProjector", "0/0");
setTimeout(() => {
clear_sessionStorage()
options.value = tmp
$q.loading.hide()
}, 800);
getconfig()
}
watch(() => optionsstr, watch(() => optionsstr,
(newVal) => { (newVal) => {
let tmp = "" let tmp = ""
@ -441,6 +460,11 @@ export default defineComponent({
config.value.row = tmp.row; config.value.row = tmp.row;
$store.commit("setfusion_configuration", res?.config); $store.commit("setfusion_configuration", res?.config);
allconfig = JSON.parse($store.state.fusion_configuration); allconfig = JSON.parse($store.state.fusion_configuration);
for (let index = 0; index < allconfig.resolution.length; index++) {
if(allconfig.resolution.width==allconfig.projector_width&&allconfig.resolution.height==allconfig.projector_height){
now_resolution.value=index
}
}
}); });
get_scenes() get_scenes()
set?.SetBlendingOption("blending_grids_select_ui", "blending") set?.SetBlendingOption("blending_grids_select_ui", "blending")
@ -451,6 +475,9 @@ export default defineComponent({
'' ''
] ]
const apply_the_selected_configuration = () => { const apply_the_selected_configuration = () => {
$q.loading.show({
message: 'Loading please wait'
})
set?.ApplyBlendingScene(select_configuration_name.value).then((res) => { 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; EnableBlending.value = tmp.enable;
@ -466,6 +493,7 @@ export default defineComponent({
setTimeout(() => { setTimeout(() => {
clear_sessionStorage() clear_sessionStorage()
options.value = tmp options.value = tmp
$q.loading.hide()
}, 800); }, 800);
getconfig() getconfig()
} }
@ -543,7 +571,8 @@ export default defineComponent({
del_dialog, del_dialog,
child, child,
options_resolution, options_resolution,
now_resolution now_resolution,
set_resolution
}; };
}, },
}); });

3
src/i18n/en-US/index.ts
View File

@ -490,5 +490,6 @@ export default {
"raster graph": "Raster Graph", "raster graph": "Raster Graph",
"the folder name cannot start with a '.'": "the folder name cannot start with a '.'":
"The Folder Name Cannot Start With a '.'", "The Folder Name Cannot Start With a '.'",
"change resolution":"change resolution" "change resolution":"change resolution",
"Loading please wait":"Loading please wait"
}; };

3
src/i18n/zh-CN/index.ts
View File

@ -755,5 +755,6 @@ export default {
"export magic": "导出", "export magic": "导出",
"raster graph": "栅格图", "raster graph": "栅格图",
"the folder name cannot start with a '.'": "文件夹名称不能以“.” 开头", "the folder name cannot start with a '.'": "文件夹名称不能以“.” 开头",
"change resolution":"更改分辨率" "change resolution":"更改分辨率",
"Loading please wait":"加载中 请稍等"
}; };