Remove checkRedraw

master
Martin Boonk 2022-03-01 21:37:33 +01:00
parent 841f098f2a
commit 10884bbbc2
1 changed files with 124 additions and 143 deletions

View File

@ -102,7 +102,6 @@ function drawNumber(element, offset){
//print("drawNumber: ", number, element, offset); //print("drawNumber: ", number, element, offset);
if (number) number = number.toFixed(0); if (number) number = number.toFixed(0);
if (checkRedraw(element,number)){
//var numberOffset = updateOffset(element, offset); //var numberOffset = updateOffset(element, offset);
var numberOffset = offset; var numberOffset = offset;
@ -204,7 +203,6 @@ function drawNumber(element, offset){
endPerfLog("drawNumber"); endPerfLog("drawNumber");
} }
}
function setColors(properties){ function setColors(properties){
if (properties.fg) g.setColor(properties.fg); if (properties.fg) g.setColor(properties.fg);
@ -245,19 +243,6 @@ function drawElement(pos, offset, path, lastElem){
endPerfLog("drawElement"); endPerfLog("drawElement");
} }
function checkRedraw(element, newValue){
var redrawConfig = element.Redraw ? element.Redraw : defaultRedraw;
switch(redrawConfig){
case "Change":
return !element.lastDrawnValue || element.lastDrawnValue != newValue;
case "Never":
return false;
case "Always":
default:
return true;
}
}
function getValue(value, defaultValue){ function getValue(value, defaultValue){
if (typeof value == "string"){ if (typeof value == "string"){
return numbers[value](); return numbers[value]();
@ -289,12 +274,11 @@ function drawScale(scale, offset){
var segmentsToDraw = Math.ceil(value * segments.length); var segmentsToDraw = Math.ceil(value * segments.length);
if (checkRedraw(scale, segmentsToDraw)){
for (var i = 0; i < segmentsToDraw; i++){ for (var i = 0; i < segmentsToDraw; i++){
drawElement(segments[i], scaleOffset, scale.ImagePath, imageIndex + i); drawElement(segments[i], scaleOffset, scale.ImagePath, imageIndex + i);
} }
scale.lastDrawnValue = segmentsToDraw; scale.lastDrawnValue = segmentsToDraw;
}
endPerfLog("drawScale"); endPerfLog("drawScale");
} }
@ -324,7 +308,6 @@ function drawCodedImage(image, offset){
var code = getValue(image.Value); var code = getValue(image.Value);
//print("drawCodedImage", image, offset, code); //print("drawCodedImage", image, offset, code);
if (checkRedraw(image, code)){
if (image.ImagePath) { if (image.ImagePath) {
var factor = 1; var factor = 1;
var currentCode = code; var currentCode = code;
@ -345,7 +328,7 @@ function drawCodedImage(image, offset){
} }
} }
image.lastDrawnValue = code; image.lastDrawnValue = code;
}
startPerfLog("drawCodedImage"); startPerfLog("drawCodedImage");
} }
@ -508,11 +491,9 @@ function drawMultiState(element, offset){
startPerfLog("drawMultiState"); startPerfLog("drawMultiState");
//print("drawMultiState", element, offset); //print("drawMultiState", element, offset);
var value = multistates[element.Value](); var value = multistates[element.Value]();
if (checkRedraw(element, value)){
//print("drawImage from drawMultiState", element, offset, value); //print("drawImage from drawMultiState", element, offset, value);
drawImage(element, offset, value); drawImage(element, offset, value);
element.lastDrawnValue = value; element.lastDrawnValue = value;
}
endPerfLog("drawMultiState"); endPerfLog("drawMultiState");
} }