bryan
/
BangleApps
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

imageclock - Add some prints

master
Martin Boonk 2022-10-05 19:17:24 +02:00
parent c2fe6c196b
commit ed223840de
1 changed files with 40 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
apps/imageclock/app.js
View File

@ -102,6 +102,7 @@ let firstDraw = true;
}; };
let cleanupDelays = function(){ let cleanupDelays = function(){
//print("Cleanup delays", delayTimeouts);
for (let t of delayTimeouts){ for (let t of delayTimeouts){
clearTimeout(t); clearTimeout(t);
} }
@ -163,6 +164,7 @@ let firstDraw = true;
let drawNumber = function(graphics, resources, element){ let drawNumber = function(graphics, resources, element){
startPerfLog("drawNumber"); startPerfLog("drawNumber");
let number = getValue(element.Value); let number = getValue(element.Value);
//print("drawNumber: ", number, element);
let spacing = element.Spacing ? element.Spacing : 0; let spacing = element.Spacing ? element.Spacing : 0;
let unit = element.Unit; let unit = element.Unit;
@ -171,7 +173,6 @@ let firstDraw = true;
let numberOfDigits = element.Digits; let numberOfDigits = element.Digits;
//print("drawNumber: ", number, element);
if (number) number = number.toFixed(0); if (number) number = number.toFixed(0);
let isNegative; let isNegative;
@ -258,7 +259,7 @@ let firstDraw = true;
} else { } else {
currentDigit = 0; currentDigit = 0;
} }
//print("Digit " + currentDigit + " " + currentX); //print("Digit", currentDigit, currentX);
drawElement(graphics, resources, {X:currentX,Y:firstDigitY}, element, currentDigit + imageIndex); drawElement(graphics, resources, {X:currentX,Y:firstDigitY}, element, currentDigit + imageIndex);
currentX += firstImage.width + spacing; currentX += firstImage.width + spacing;
} }
@ -297,9 +298,7 @@ let firstDraw = true;
//print("cache ", typeof element.cachedImage[cacheKey], element.ImagePath, lastElem); //print("cache ", typeof element.cachedImage[cacheKey], element.ImagePath, lastElem);
if(element.cachedImage[cacheKey]){ if(element.cachedImage[cacheKey]){
//print("drawElement ",pos, path, lastElem); //print("drawElement ", pos, element, lastElem);
//print("resource ", resource,pos, path, lastElem);
//print("drawImage from drawElement", image, pos);
let options={}; let options={};
if (element.RotationValue){ if (element.RotationValue){
options.rotate = radians(element); options.rotate = radians(element);
@ -343,9 +342,6 @@ let firstDraw = true;
let imageIndex = scale.ImageIndex !== undefined ? scale.ImageIndex : 0; let imageIndex = scale.ImageIndex !== undefined ? scale.ImageIndex : 0;
let value = scaledown(scale.Value, scale.MinValue, scale.MaxValue); let value = scaledown(scale.Value, scale.MinValue, scale.MaxValue);
//print("Value is ", value, "(", maxValue, ",", minValue, ")");
let segmentsToDraw = Math.ceil(value * segments.length); let segmentsToDraw = Math.ceil(value * segments.length);
for (let i = 0; i < segmentsToDraw; i++){ for (let i = 0; i < segmentsToDraw; i++){
@ -576,8 +572,6 @@ let firstDraw = true;
let requestedDraws = 0; let requestedDraws = 0;
let isDrawing = false; let isDrawing = false;
let drawingTime;
let start; let start;
let deferredTimout; let deferredTimout;
@ -593,8 +587,6 @@ let firstDraw = true;
requestedDraws = 0; requestedDraws = 0;
//print(new Date().toISOString(), "Drawing start"); //print(new Date().toISOString(), "Drawing start");
startPerfLog("initialDraw"); startPerfLog("initialDraw");
//start = Date.now();
drawingTime = 0;
//print("Precompiled"); //print("Precompiled");
let promise = precompiledJs(watchfaceResources, watchface); let promise = precompiledJs(watchfaceResources, watchface);
@ -608,8 +600,6 @@ let firstDraw = true;
g.drawLine(0,24,g.getWidth(),24); g.drawLine(0,24,g.getWidth(),24);
} }
lastDrawTime = Date.now() - start; lastDrawTime = Date.now() - start;
drawingTime += Date.now() - currentDrawingTime;
//print(new Date().toISOString(), "Drawing done in", lastDrawTime.toFixed(0), "active:", drawingTime.toFixed(0));
isDrawing=false; isDrawing=false;
firstDraw=false; firstDraw=false;
requestRefresh = false; requestRefresh = false;
@ -658,7 +648,7 @@ let firstDraw = true;
let getMatchedWaitingTime = function(time){ let getMatchedWaitingTime = function(time){
let result = time - (Date.now() % time); let result = time - (Date.now() % time);
//print("Matched timeout", time, result); //print("Matched wating time", time, result);
return result; return result;
}; };
@ -667,6 +657,7 @@ let firstDraw = true;
let matchedTime = getMatchedWaitingTime(time + delay); let matchedTime = getMatchedWaitingTime(time + delay);
return setTimeout(()=>{ return setTimeout(()=>{
let interval = setInterval(callable, time); let interval = setInterval(callable, time);
//print("setMatchedInterval", interval);
if (intervalHandler) intervalHandler(interval); if (intervalHandler) intervalHandler(interval);
callable(); callable();
}, matchedTime); }, matchedTime);
@ -706,7 +697,10 @@ let firstDraw = true;
//print("Redrawing on unlock", isLocked); //print("Redrawing on unlock", isLocked);
initialDraw(watchfaceResources, watchface); initialDraw(watchfaceResources, watchface);
} }
if (initialDrawTimeoutUnlocked) clearTimeout(initialDrawTimeoutUnlocked); if (initialDrawTimeoutUnlocked){
//print("clear initialDrawTimeUnlocked timet", initialDrawTimeoutUnlocked);
clearTimeout(initialDrawTimeoutUnlocked);
}
initialDrawTimeoutUnlocked = setMatchedInterval(()=>{ initialDrawTimeoutUnlocked = setMatchedInterval(()=>{
//print("Redrawing on unlocked interval"); //print("Redrawing on unlocked interval");
initialDraw(watchfaceResources, watchface); initialDraw(watchfaceResources, watchface);
@ -721,7 +715,10 @@ let firstDraw = true;
//print("Redrawing on lock", isLocked); //print("Redrawing on lock", isLocked);
initialDraw(watchfaceResources, watchface); initialDraw(watchfaceResources, watchface);
} }
if (initialDrawTimeoutLocked) clearTimeout(initialDrawTimeoutLocked); if (initialDrawTimeoutLocked){
clearTimeout(initialDrawTimeoutLocked);
//print("clear initialDrawTimeLocked timet", initialDrawTimeoutLocked);
}
initialDrawTimeoutLocked = setMatchedInterval(()=>{ initialDrawTimeoutLocked = setMatchedInterval(()=>{
//print("Redrawing on locked interval"); //print("Redrawing on locked interval");
initialDraw(watchfaceResources, watchface); initialDraw(watchfaceResources, watchface);
@ -780,7 +777,7 @@ let firstDraw = true;
try{ try{
Bangle.setBarometerPower(1, 'imageclock'); Bangle.setBarometerPower(1, 'imageclock');
} catch (e){ } catch (e){
print("Error during barometer power up", e); //print("Error during barometer power up", e);
} }
} }
if (!events || events.includes("HRM")) { if (!events || events.includes("HRM")) {