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",