fly/fgdata
1
0
Fork 0
Code Activity

Add argument validation in canvas_efis/eicas-message-sys.nas

Browse source
This commit is contained in:
Henning 2021-12-04 14:50:01 +01:00
parent 28e865f1e6
commit 1890502283
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
Nasal/modules/canvas_efis/eicas-message-sys.nas
View file

@ -148,6 +148,11 @@ var MessageSystem = {
NO_PAGING: 0, NO_PAGING: 0,
new: func(page_length, prop_path) { new: func(page_length, prop_path) {
if (!isint(page_length) or page_length < 1 or page_length > 100) {
logprint(LOG_ALERT, "MessageSystem.new(): page_length must be an integer value between 1 and 100");
return;
}
var obj = { var obj = {
parents: [me], parents: [me],
rootN : props.getNode(prop_path,1), rootN : props.getNode(prop_path,1),
@ -467,12 +472,19 @@ var MessageSystem = {
# pass an existing canvas group to create text elements on # pass an existing canvas group to create text elements on
setCanvasGroup: func(group) { setCanvasGroup: func(group) {
if (isa(group, canvas.Group)) {
me.canvas_group = group; me.canvas_group = group;
}
else {
me.canvas_group = nil;
logprint(DEV_ALERT, "setCanvasGroup: argument is not a canvas group");
}
return me; return me;
}, },
# create text elements for message lines in canvas group; call setCanvasGroup() first! # create text elements for message lines in canvas group; call setCanvasGroup() first!
createCanvasTextLines: func(left, top, line_spacing, font_size) { createCanvasTextLines: func(left, top, line_spacing, font_size) {
if (me.canvas_group == nil) return;
me.lines = me.canvas_group.createChildren("text", me.page_length); me.lines = me.canvas_group.createChildren("text", me.page_length);
forindex (var i; me.lines) { forindex (var i; me.lines) {
var l = me.lines[i]; var l = me.lines[i];
@ -486,6 +498,7 @@ var MessageSystem = {
# create text element for "page i of N"; call setCanvasGroup() first! # create text element for "page i of N"; call setCanvasGroup() first!
# returns the text element # returns the text element
createPageIndicator: func(left, top, font_size, format_string = nil) { createPageIndicator: func(left, top, font_size, format_string = nil) {
if (me.canvas_group == nil) return;
me.page_indicator = me.canvas_group.createChild("text"); me.page_indicator = me.canvas_group.createChild("text");
me.page_indicator.setAlignment("left-top").setTranslation(left, top); me.page_indicator.setAlignment("left-top").setTranslation(left, top);
me.page_indicator.setFont("LiberationFonts/LiberationSans-Regular.ttf"); me.page_indicator.setFont("LiberationFonts/LiberationSans-Regular.ttf");