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-09 10:26:14 +08:00
parent 34aba5bcf4 fa0194d4b9
commit 73b1a2bc05
5 changed files with 91 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,7 +43,7 @@
<div class="col-8"> <div class="col-8">
<q-input filled type="number" class="q-pt-md" :dense="true" v-model="value[index].y" <q-input filled type="number" class="q-pt-md" :dense="true" v-model="value[index].y"
@update:model-value="chang(index, $event,'v')" label="y" lazy-rules /> @update:model-value="chang(index, $event,'v')" label="y" lazy-rules />
<q-btn size="sm" color="white" @click="reset(index)" text-color="black" <q-btn size="sm" color="white" @click="reset(index,true)" text-color="black"
:label="$t('reset') + `v${index + 1}`" /> :label="$t('reset') + `v${index + 1}`" />
</div> </div>
</div> </div>
@ -56,7 +56,7 @@
<div class="box_son" v-for="(item, index) in 5"> <div class="box_son" v-for="(item, index) in 5">
<q-input filled type="number" class="q-pt-md" :dense="true" v-model="value[index + 5].x" label="x" <q-input filled type="number" class="q-pt-md" :dense="true" v-model="value[index + 5].x" label="x"
@update:model-value="chang(index + 5, $event,'h')" lazy-rules /> @update:model-value="chang(index + 5, $event,'h')" lazy-rules />
<q-btn size="sm" color="white" @click="reset(index + 5)" text-color="black" <q-btn size="sm" color="white" @click="reset(index + 5,true)" text-color="black"
:label="$t('reset') + `h${index + 1}`" /> :label="$t('reset') + `h${index + 1}`" />
</div> </div>
<div class="box_son q-pt-xl"> <div class="box_son q-pt-xl">
@ -74,7 +74,7 @@
v-model="value[options_model_v].y" @update:model-value="chang(options_model_v, $event,'v')" lazy-rules /> v-model="value[options_model_v].y" @update:model-value="chang(options_model_v, $event,'v')" lazy-rules />
</div> </div>
<div class="q-pt-md"> <div class="q-pt-md">
<q-btn color="white" @click="reset(options_model_v)" text-color="black" :label="$t('reset')" /> <q-btn color="white" @click="reset(options_model_v,true)" text-color="black" :label="$t('reset')" />
</div> </div>
</div> </div>
<div class="row"> <div class="row">
@ -85,7 +85,7 @@
v-model="value[options_model_h].x" @update:model-value="chang(options_model_h, $event,'h')" lazy-rules /> v-model="value[options_model_h].x" @update:model-value="chang(options_model_h, $event,'h')" lazy-rules />
</div> </div>
<div class="q-pt-md"> <div class="q-pt-md">
<q-btn color="white" @click="reset(options_model_h)" text-color="black" :label="$t('reset')" /> <q-btn color="white" @click="reset(options_model_h,true)" text-color="black" :label="$t('reset')" />
</div> </div>
</div> </div>
@ -321,23 +321,34 @@ export default defineComponent({
index < config.hor_density.length + config.ver_density.length; index < config.hor_density.length + config.ver_density.length;
index++ index++
) { ) {
reset(index); reset(index, false);
} }
set?.SetBlendingVerDensity(
$store.getters.GetTheCurrentlySelectedCamera[0],
$store.getters.GetTheCurrentlySelectedCamera[1],
-1, 0
);
}; };
const reset = (index: number) => { const reset = (index: number, send: boolean) => {
send = send?? true;
if (index > 4) { if (index > 4) {
value[index].x = config.hor_density[index - 5].def_x; value[index].x = config.hor_density[index - 5].def_x;
value[index].y = config.hor_density[index - 5].def_y; value[index].y = config.hor_density[index - 5].def_y;
if (send)
{
set?.SetBlendingHorDensity( set?.SetBlendingHorDensity(
$store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[0],
$store.getters.GetTheCurrentlySelectedCamera[1], $store.getters.GetTheCurrentlySelectedCamera[1],
index - 5 + 1, index - 5 + 1,
Number(value[index].x) Number(value[index].x)
); );
}
} else { } else {
value[index].x = config.ver_density[index].def_x; value[index].x = config.ver_density[index].def_x;
value[index].y = config.ver_density[index].def_y; value[index].y = config.ver_density[index].def_y;
if (send)
{
set?.SetBlendingVerDensity( set?.SetBlendingVerDensity(
$store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[0],
$store.getters.GetTheCurrentlySelectedCamera[1], $store.getters.GetTheCurrentlySelectedCamera[1],
@ -345,6 +356,7 @@ export default defineComponent({
Number(value[index].y) Number(value[index].y)
); );
} }
}
point_postion[index].y = default_location[index].y; point_postion[index].y = default_location[index].y;
point_postion[index].x = default_location[index].x; point_postion[index].x = default_location[index].x;

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

@ -5,7 +5,7 @@
@focus="isactivearray[0] = false" v-model="four[0].x" label="x" lazy-rules /> @focus="isactivearray[0] = false" v-model="four[0].x" label="x" lazy-rules />
<q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[0] = false" v-model="four[0].y" <q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[0] = false" v-model="four[0].y"
label="y" lazy-rules /> label="y" lazy-rules />
<q-btn size="sm" dense color="white" @click="reset(0)" text-color="black" <q-btn size="sm" dense color="white" @click="reset(0,true)" text-color="black"
:label="$t('reset') + $t('point') + '1'" /> :label="$t('reset') + $t('point') + '1'" />
</div> </div>
<div class="col-8"></div> <div class="col-8"></div>
@ -14,7 +14,7 @@
label="x" lazy-rules /> label="x" lazy-rules />
<q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[1] = false" v-model="four[1].y" <q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[1] = false" v-model="four[1].y"
label="y" lazy-rules /> label="y" lazy-rules />
<q-btn size="sm" dense color="white" @click="reset(1)" text-color="black" <q-btn size="sm" dense color="white" @click="reset(1,true)" text-color="black"
:label="$t('reset') + $t('point') + '2'" /> :label="$t('reset') + $t('point') + '2'" />
</div> </div>
@ -52,7 +52,7 @@
label="x" lazy-rules /> label="x" lazy-rules />
<q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[2] = false" v-model="four[2].y" <q-input filled type="number" class="q-pt-xs" :dense="true" @focus="isactivearray[2] = false" v-model="four[2].y"
label="y" lazy-rules /> label="y" lazy-rules />
<q-btn size="sm" dense color="white" @click="reset(2)" text-color="black" <q-btn size="sm" dense color="white" @click="reset(2,true)" text-color="black"
:label="$t('reset') + $t('point') + '3'" /> :label="$t('reset') + $t('point') + '3'" />
</div> </div>
<div class="col-8"> <div class="col-8">
@ -63,7 +63,7 @@
label="x" lazy-rules /> label="x" lazy-rules />
<q-input filled type="number" class="q-pt-md" :dense="true" @focus="isactivearray[3] = false" v-model="four[3].y" <q-input filled type="number" class="q-pt-md" :dense="true" @focus="isactivearray[3] = false" v-model="four[3].y"
label="y" lazy-rules /> label="y" lazy-rules />
<q-btn size="sm" dense color="white" @click="reset(3)" text-color="black" <q-btn size="sm" dense color="white" @click="reset(3,true)" text-color="black"
:label="$t('reset') + $t('point') + '4'" /> :label="$t('reset') + $t('point') + '4'" />
</div> </div>
</div> </div>
@ -483,7 +483,8 @@ export default defineComponent({
isshowarray.value[index] = true; isshowarray.value[index] = true;
}, 100); }, 100);
}; };
const reset = (index: number) => { const reset = (index: number, send: boolean) => {
send = send?? true;
isactivearray.value[index] = false; isactivearray.value[index] = false;
fourpostion.value[index].x = defaultfourpostion.value[index].x; fourpostion.value[index].x = defaultfourpostion.value[index].x;
fourpostion.value[index].y = defaultfourpostion.value[index].y; fourpostion.value[index].y = defaultfourpostion.value[index].y;
@ -491,6 +492,8 @@ export default defineComponent({
four[index].x = config.point4[index].def_x; four[index].x = config.point4[index].def_x;
four[index].y = config.point4[index].def_y; four[index].y = config.point4[index].def_y;
if (send)
{
set?.setBlendingCorrection( set?.setBlendingCorrection(
$store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[0],
$store.getters.GetTheCurrentlySelectedCamera[1], $store.getters.GetTheCurrentlySelectedCamera[1],
@ -499,6 +502,7 @@ export default defineComponent({
Number(config.point4[index].def_x), Number(config.point4[index].def_x),
Number(config.point4[index].def_y) Number(config.point4[index].def_y)
); );
}
isshowarray.value[index] = false; isshowarray.value[index] = false;
setTimeout(() => { setTimeout(() => {
@ -508,8 +512,13 @@ export default defineComponent({
const resetall = () => { const resetall = () => {
for (let index = 0; index < fourpostion.value.length; index++) { for (let index = 0; index < fourpostion.value.length; index++) {
reset(index); reset(index, false);
} }
set?.setBlendingCorrection(
$store.getters.GetTheCurrentlySelectedCamera[0],
$store.getters.GetTheCurrentlySelectedCamera[1],
4, 0, 0, 0
);
}; };
const moveHandler_1 = (data: any) => { const moveHandler_1 = (data: any) => {

10
src/components/FusionSettings/GridSettings.vue
View File

@ -141,7 +141,7 @@ export default defineComponent({
set?.SetBlendingOption("blending_grids_background_color", color[index.value]); set?.SetBlendingOption("blending_grids_background_color", color[index.value]);
break; break;
case 2: case 2:
set?.SetBlendingOption("blending_grids_center_line_color",color[index.value]); set?.SetBlendingOption("blending_grids_ellipse_line_color",color[index.value]);
break; break;
case 3: case 3:
//set?.SetBlendingOption("blending_grids_line_color",color[index.value]); //set?.SetBlendingOption("blending_grids_line_color",color[index.value]);
@ -176,7 +176,7 @@ export default defineComponent({
set?.SetBlendingOption("blending_grids_show_column", RowsColumns[type] + ""); set?.SetBlendingOption("blending_grids_show_column", RowsColumns[type] + "");
break; break;
case 2: case 2:
set?.SetBlendingOption("blending_grids_show_center_line", RowsColumns[type] + ""); set?.SetBlendingOption("blending_grids_show_ellipse", RowsColumns[type] + "");
break; break;
case 3: case 3:
@ -192,11 +192,11 @@ export default defineComponent({
model[1] = server_conf.blending_grids_column ?? 40; model[1] = server_conf.blending_grids_column ?? 40;
model[2] = server_conf.blending_grids_line_width ?? 6; model[2] = server_conf.blending_grids_line_width ?? 6;
color[0] = server_conf.blending_grids_line_color ?? "#ffffff" color[0] = server_conf.blending_grids_line_color ?? "#ffffff"
color[1] = server_conf.blending_grids_background_color ?? "#00ff5e" color[1] = server_conf.blending_grids_background_color ?? "#7f7f7f"
color[2] = server_conf.blending_grids_center_line_color ?? "#00000" color[2] = server_conf.blending_grids_ellipse_line_color ?? "#0000ff"
RowsColumns[0] = server_conf.blending_grids_show_row === "false" ? false : true RowsColumns[0] = server_conf.blending_grids_show_row === "false" ? false : true
RowsColumns[1] = server_conf.blending_grids_show_column === "false" ? false : true RowsColumns[1] = server_conf.blending_grids_show_column === "false" ? false : true
RowsColumns[2] = server_conf.blending_grids_show_center_line === "false" ? false : true RowsColumns[2] = server_conf.blending_grids_show_ellipse === "false" ? false : true
} }
use_server_config() use_server_config()

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

@ -8,7 +8,7 @@
v-model="nine[0].x" label="x" lazy-rules /> v-model="nine[0].x" label="x" lazy-rules />
<q-input filled type="number" @focus="isactivearray[0] = false" :dense="true" <q-input filled type="number" @focus="isactivearray[0] = false" :dense="true"
v-model="nine[0].y" label="y" lazy-rules /> v-model="nine[0].y" label="y" lazy-rules />
<q-btn size="sm" dense color="white" @click="reset(0)" text-color="black" :label="$t('reset') + $t('point') + '1'" /> <q-btn size="sm" dense color="white" @click="reset(0,true)" text-color="black" :label="$t('reset') + $t('point') + '1'" />
</div> </div>
</div> </div>
</div> </div>
@ -20,7 +20,7 @@
v-model="nine[1].x" label="x" lazy-rules /> v-model="nine[1].x" label="x" lazy-rules />
<q-input filled type="number" @focus="isactivearray[1] = false" :dense="true" <q-input filled type="number" @focus="isactivearray[1] = false" :dense="true"
v-model="nine[1].y" label="y" lazy-rules /> v-model="nine[1].y" label="y" lazy-rules />
<q-btn size="sm" dense color="white" @click="reset(1)" text-color="black" :label="$t('reset') + $t('point') + '2'" /> <q-btn size="sm" dense color="white" @click="reset(1,true)" text-color="black" :label="$t('reset') + $t('point') + '2'" />
</div> </div>
<div class="col-4" style="padding-left: 2px"> <div class="col-4" style="padding-left: 2px">
@ -28,7 +28,7 @@
@focus="isactivearray[4] = false" lazy-rules /> @focus="isactivearray[4] = false" lazy-rules />
<q-input filled type="number" :dense="true" v-model="nine[4].y" label="y" <q-input filled type="number" :dense="true" v-model="nine[4].y" label="y"
@focus="isactivearray[4] = false" lazy-rules /> @focus="isactivearray[4] = false" lazy-rules />
<q-btn size="sm" dense color="white" @click="reset(4)" text-color="black" :label="$t('reset') + $t('point') + '5'" /> <q-btn size="sm" dense color="white" @click="reset(4,true)" text-color="black" :label="$t('reset') + $t('point') + '5'" />
</div> </div>
</div> </div>
</div> </div>
@ -40,7 +40,7 @@
v-model="nine[2].x" label="x" lazy-rules /> v-model="nine[2].x" label="x" lazy-rules />
<q-input filled type="number" @focus="isactivearray[2] = false" :dense="true" <q-input filled type="number" @focus="isactivearray[2] = false" :dense="true"
v-model="nine[2].y" label="y" lazy-rules /> v-model="nine[2].y" label="y" lazy-rules />
<q-btn size="sm" dense color="white" @click="reset(2)" text-color="black" :label="$t('reset') + $t('point') + '3'" /> <q-btn size="sm" dense color="white" @click="reset(2,true)" text-color="black" :label="$t('reset') + $t('point') + '3'" />
</div> </div>
</div> </div>
</div> </div>
@ -52,7 +52,7 @@
v-model="nine[3].x" label="x" lazy-rules /> v-model="nine[3].x" label="x" lazy-rules />
<q-input filled type="number" @focus="isactivearray[3] = false" :dense="true" <q-input filled type="number" @focus="isactivearray[3] = false" :dense="true"
v-model="nine[3].y" label="y" lazy-rules /> v-model="nine[3].y" label="y" lazy-rules />
<q-btn size="sm" dense color="white" @click="reset(3)" text-color="black" :label="$t('reset') + $t('point') + '4'" /> <q-btn size="sm" dense color="white" @click="reset(3,true)" text-color="black" :label="$t('reset') + $t('point') + '4'" />
</div> </div>
</div> </div>
</div> </div>
@ -105,7 +105,7 @@
v-model="nine[5].x" label="x" lazy-rules /> v-model="nine[5].x" label="x" lazy-rules />
<q-input filled type="number" @focus="isactivearray[5] = false" :dense="true" <q-input filled type="number" @focus="isactivearray[5] = false" :dense="true"
v-model="nine[5].y" label="y" lazy-rules /> v-model="nine[5].y" label="y" lazy-rules />
<q-btn size="sm" dense color="white" @click="reset(5)" text-color="black" :label="$t('reset') + $t('point') + '6'" /> <q-btn size="sm" dense color="white" @click="reset(5,true)" text-color="black" :label="$t('reset') + $t('point') + '6'" />
</div> </div>
</div> </div>
</div> </div>
@ -119,7 +119,7 @@
v-model="nine[6].x" label="x" lazy-rules /> v-model="nine[6].x" label="x" lazy-rules />
<q-input filled type="number" @focus="isactivearray[6] = false" :dense="true" <q-input filled type="number" @focus="isactivearray[6] = false" :dense="true"
v-model="nine[6].y" label="y" lazy-rules /> v-model="nine[6].y" label="y" lazy-rules />
<q-btn size="sm" dense color="white" @click="reset(6)" text-color="black" :label="$t('reset') + $t('point') + '7'" /> <q-btn size="sm" dense color="white" @click="reset(6,true)" text-color="black" :label="$t('reset') + $t('point') + '7'" />
</div> </div>
</div> </div>
</div> </div>
@ -131,7 +131,7 @@
v-model="nine[7].x" label="x" lazy-rules /> v-model="nine[7].x" label="x" lazy-rules />
<q-input filled type="number" @focus="isactivearray[7] = false" :dense="true" <q-input filled type="number" @focus="isactivearray[7] = false" :dense="true"
v-model="nine[7].y" label="y" lazy-rules /> v-model="nine[7].y" label="y" lazy-rules />
<q-btn size="sm" dense color="white" @click="reset(7)" text-color="black" :label="$t('reset') + $t('point') + '8'" /> <q-btn size="sm" dense color="white" @click="reset(7,true)" text-color="black" :label="$t('reset') + $t('point') + '8'" />
</div> </div>
</div> </div>
</div> </div>
@ -143,7 +143,7 @@
v-model="nine[8].x" label="x" lazy-rules /> v-model="nine[8].x" label="x" lazy-rules />
<q-input filled type="number" @focus="isactivearray[8] = false" :dense="true" <q-input filled type="number" @focus="isactivearray[8] = false" :dense="true"
v-model="nine[8].y" label="y" lazy-rules /> v-model="nine[8].y" label="y" lazy-rules />
<q-btn size="sm" dense color="white" @click="reset(8)" text-color="black" :label="$t('reset') + $t('point') + '9'" /> <q-btn size="sm" dense color="white" @click="reset(8,true)" text-color="black" :label="$t('reset') + $t('point') + '9'" />
</div> </div>
</div> </div>
</div> </div>
@ -532,11 +532,14 @@ export default defineComponent({
nine[index].y = config.point9[index].y; nine[index].y = config.point9[index].y;
} }
}; };
const reset = (index: number) => { const reset = (index: number, send: boolean) => {
send = send?? true;
nine[index].x = config.point9[index].def_x; nine[index].x = config.point9[index].def_x;
nine[index].y = config.point9[index].def_y; nine[index].y = config.point9[index].def_y;
if (send)
{
set?.setBlendingCorrection( set?.setBlendingCorrection(
$store.getters.GetTheCurrentlySelectedCamera[0], $store.getters.GetTheCurrentlySelectedCamera[0],
$store.getters.GetTheCurrentlySelectedCamera[1], $store.getters.GetTheCurrentlySelectedCamera[1],
@ -545,6 +548,7 @@ export default defineComponent({
Number(config.point9[index].def_x), Number(config.point9[index].def_x),
Number(config.point9[index].def_y) Number(config.point9[index].def_y)
); );
}
isshowarray.value[index] = false; isshowarray.value[index] = false;
setTimeout(() => { setTimeout(() => {
@ -553,8 +557,13 @@ export default defineComponent({
}; };
const resetall = () => { const resetall = () => {
for (let index = 0; index < nine.length; index++) { for (let index = 0; index < nine.length; index++) {
reset(index); reset(index, false);
} }
set?.setBlendingCorrection(
$store.getters.GetTheCurrentlySelectedCamera[0],
$store.getters.GetTheCurrentlySelectedCamera[1],
9, 0, 0, 0
);
}; };
watch( watch(
() => nine[0], () => nine[0],

8
src/components/FusionSettingsDialog.vue
View File

@ -285,7 +285,7 @@ export default defineComponent({
const EnableBlending = ref(false); const EnableBlending = ref(false);
let optionsstr = ref(); let optionsstr = ref();
optionsstr.value = "FusionLocale"; optionsstr.value = "FusionLocale";
const disable_blending_params_id = ref("1"); const disable_blending_params_id = ref("blending@disable_blending_params");
const disable_blending_params = ref(false); const disable_blending_params = ref(false);
const show_blending_grids_id = ref("blending_grids_show"); const show_blending_grids_id = ref("blending_grids_show");
const show_blending_grids = ref(false); const show_blending_grids = ref(false);
@ -312,7 +312,7 @@ export default defineComponent({
let tmp = "" let tmp = ""
switch (newVal.value) { switch (newVal.value) {
case 'FusionLocale': case 'FusionLocale':
tmp = '0' tmp = "blending"
break; break;
case 'FourPointCalibration': case 'FourPointCalibration':
tmp = '4' tmp = '4'
@ -326,7 +326,7 @@ export default defineComponent({
default: default:
break; break;
} }
set?.SetBlendingOption("blending_grids_select_ui", tmp) if (tmp.length) set?.SetBlendingOption("blending_grids_select_ui", tmp)
}, },
{ deep: true }) { deep: true })
@ -393,7 +393,7 @@ export default defineComponent({
}); });
get_scenes() get_scenes()
set?.SetBlendingOption("blending_grids_select_ui", '0') set?.SetBlendingOption("blending_grids_select_ui", "blending")
}, 1000); }, 1000);
}); });
const save_cover_name = ref("") const save_cover_name = ref("")