FOSS
/
BangleApps
mirror of https://github.com/espruino/BangleApps
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Allow image rotation and forced transparency color by filename

pull/1916/head
Martin Boonk 2022-02-20 14:59:49 +01:00
parent 32c27a7be9
commit e0d54d5586
2 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
apps/imageclock/app.js
View File

@ -19,6 +19,7 @@ function getImg(resource){
buffer: buffer
};
if (resource.transparent) result.transparent = resource.transparent;
if (resource.palette) result.palette = new Uint16Array(resource.palette);
return result;
}
@ -112,7 +113,18 @@ function drawElement(pos, offset, path, lastElem){
if (image){
setColors(offset);
//print("drawImage from drawElement", image, pos, offset);
g.drawImage(image ,offset.X + pos.X,offset.Y + pos.Y);
var options={};
if (pos.RotationValue){
options.rotate = numbers[pos.RotationValue]();
if (pos.MaxRotationValue) options.rotate /= pos.MaxRotationValue;
if (pos.MinRotationValue) options.rotate -= pos.MinRotationValue;
options.rotate = options.rotate * Math.PI* 2;
}
if (pos.Scale){
options.scale = pos.ScaleValue;
}
//print("options", options);
g.drawImage(image ,offset.X + pos.X,offset.Y + pos.Y, options);
} else {
//print("Could not create image from", resource);
}
@ -286,6 +298,8 @@ function drawMultiState(element, offset){
var drawing = false;
function draw(element, offset){
g.setColor(g.theme.fg);
g.setBgColor(g.theme.bg);
var initial = !element;
if (initial){
if (drawing) return;
@ -293,8 +307,6 @@ function draw(element, offset){
element = face;
g.clear();
}
g.setColor(g.theme.fg);
g.setBgColor(g.theme.bg);
var elementOffset = updateOffset(element, offset);
setColors(elementOffset);

38
apps/imageclock/custom.html
View File

@ -31,13 +31,33 @@
options.diffusion = infoJson.diffusion ? infoJson.diffusion : "none";
options.compression = false;
options.alphaToColor = false;
options.transparent = this.path.match(/\.t[^.]*\./);
options.transparent = false;
options.inverted = false;
options.autoCrop = false;
options.brightness = 0;
options.contrast = 0;
options.mode = infoJson.color ? infoJson.color : "1bit";
options.output = "jsonobject";
var faceJson;
console.log("Loaded image has path", this.path);
var jsonPath = this.path.split("/");
var forcedTransparentColorMatch = jsonPath[jsonPath.length-1].match(/.*\.t([^.]+)\..*/)
var forcedTransparentColor;
if (jsonPath[jsonPath.length-1].includes(".t.")){
options.transparent = true;
} else if (forcedTransparentColorMatch){
options.transparent = false;
forcedTransparentColor = forcedTransparentColorMatch[1];
}
console.log("image has transparency", options.transparent);
console.log("image has forced transparent color", forcedTransparentColor);
jsonPath[jsonPath.length-1] = jsonPath[jsonPath.length-1].replace(/([^.]*)\..*/, "$1");
console.log("Loaded image has json path", jsonPath);
var canvas = document.getElementById("canvas")
canvas.width = this.width*2;
@ -66,28 +86,20 @@
imageconverter.RGBAtoCheckerboard(imageData.data, {width:this.width,height:this.height});
ctx.putImageData(imageData,0,0);
console.log("result is ", imgstr);
var faceJson;
console.log("Loaded image has path", this.path);
var jsonPath = this.path.split("/");
jsonPath[jsonPath.length-1] = jsonPath[jsonPath.length-1].replace(/(.*)(\.t[^.]){0,1}\.[^.]+/, "$1");
console.log("Loaded image has json path", jsonPath);
var currentElement = resultJson;
for (var i = 0; i < jsonPath.length; i++){
if (i == jsonPath.length - 1){
currentElement[jsonPath[i]] = JSON.parse(imgstr);
var resultingObject = JSON.parse(imgstr);
if (forcedTransparentColor !== undefined) resultingObject.transparent = forcedTransparentColor;
currentElement[jsonPath[i]] = resultingObject;
console.log("result is ", resultingObject);
} else {
if (!currentElement[jsonPath[i]]) currentElement[jsonPath[i]] = {};
currentElement = currentElement[jsonPath[i]];
}
}
result += '"' + jsonPath.join(".") + '":"' + imgstr + '"' + ",\n";
console.log("json is ", result);
}
function handleWatchFace(infoFile, faceFile, resourceFiles){