sundowndev
/
betaflight-configurator
mirror of https://github.com/sundowndev/betaflight-configurator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

display logo image validation errors on the GUI

10.3.x-maintenance
Kiripolszky Károly 2018-02-20 17:44:53 +01:00
parent 41c46afcc5
commit 85dea70cba
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
locales/en/messages.json
View File

@ -2795,6 +2795,12 @@
"osdSetupReplaceLogoHelp": { "osdSetupReplaceLogoHelp": {
"message": "Customized logo image has to be 288×72 pixels in size containing black and white pixels only on a completely green background." "message": "Customized logo image has to be 288×72 pixels in size containing black and white pixels only on a completely green background."
}, },
"osdSetupReplaceLogoImageSizeError": {
"message": "Invalid image size; expected $1×$2 instead of $3×$4"
},
"osdSetupReplaceLogoImageColorsError": {
"message": "The image contains an invalid color palette (only green, black and white are allowed)"
},
"osdSetupUploadFont": { "osdSetupUploadFont": {
"message": "Upload Font" "message": "Upload Font"
}, },

8
src/js/tabs/osd.js
View File

@ -173,9 +173,8 @@ var openLogoImage = function() {
expectedHeight = FONT.constants.SIZES.CHAR_HEIGHT expectedHeight = FONT.constants.SIZES.CHAR_HEIGHT
* FONT.constants.LOGO.TILES_NUM_VERT; * FONT.constants.LOGO.TILES_NUM_VERT;
if (img.width != expectedWidth || img.height != expectedHeight) { if (img.width != expectedWidth || img.height != expectedHeight) {
reject("invalid image size; expected " reject(i18n.getMessage("osdSetupReplaceLogoImageSizeError",
+ expectedWidth + "×" + expectedHeight + " instead of " [expectedWidth, expectedHeight, img.width, img.height]));
+ img.width + "×" + img.height);
return; return;
} }
var canvas = document.createElement('canvas'), var canvas = document.createElement('canvas'),
@ -188,7 +187,7 @@ var openLogoImage = function() {
var rgbPixel = ctx.getImageData(x, y, 1, 1).data.slice(0, 3), var rgbPixel = ctx.getImageData(x, y, 1, 1).data.slice(0, 3),
colorKey = rgbPixel.join("-"); colorKey = rgbPixel.join("-");
if (!FONT.constants.LOGO.MCM_COLORMAP[colorKey]) { if (!FONT.constants.LOGO.MCM_COLORMAP[colorKey]) {
reject("invalid color palette"); reject(i18n.getMessage("osdSetupReplaceLogoImageColorsError"));
return; return;
} }
} }
@ -1886,6 +1885,7 @@ TABS.osd.initialize = function (callback) {
FONT.logoPreview($logoPreview); FONT.logoPreview($logoPreview);
}).catch(function(error) { }).catch(function(error) {
console.error("error loading image:", error); console.error("error loading image:", error);
GUI.log(error);
}); });
} }
}); });