From dbf5d92605a9db10e3e3cb154d03a515c5d5c5af Mon Sep 17 00:00:00 2001 From: reinelt Date: Sun, 8 May 2005 04:32:45 +0000 Subject: [lcd4linux @ 2005-05-08 04:32:43 by reinelt] CodingStyle added and applied git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@547 3ae390bd-cb1e-0410-b409-cd5a39f66f1f --- widget_bar.c | 328 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 167 insertions(+), 161 deletions(-) (limited to 'widget_bar.c') diff --git a/widget_bar.c b/widget_bar.c index 7cb8956..810c69a 100644 --- a/widget_bar.c +++ b/widget_bar.c @@ -1,4 +1,4 @@ -/* $Id: widget_bar.c,v 1.15 2005/05/06 06:37:34 reinelt Exp $ +/* $Id: widget_bar.c,v 1.16 2005/05/08 04:32:45 reinelt Exp $ * * bar widget handling * @@ -21,6 +21,9 @@ * * * $Log: widget_bar.c,v $ + * Revision 1.16 2005/05/08 04:32:45 reinelt + * CodingStyle added and applied + * * Revision 1.15 2005/05/06 06:37:34 reinelt * hollow bar patch from geronet * @@ -116,181 +119,184 @@ #endif -void widget_bar_update (void *Self) +void widget_bar_update(void *Self) { - WIDGET *W = (WIDGET*)Self; - WIDGET_BAR *Bar = W->data; - RESULT result = {0, 0, 0, NULL}; - - double val1, val2; - double min, max; - - /* evaluate expressions */ - val1 = 0.0; - if (Bar->tree1 != NULL) { - Eval(Bar->tree1, &result); - val1 = R2N(&result); - DelResult(&result); - } - - val2 = val1; - if (Bar->tree2!=NULL) { - Eval(Bar->tree2, &result); - val2 = R2N(&result); - DelResult(&result); - } - - /* minimum: if expression is empty, do auto-scaling */ - if (Bar->tree_min!=NULL) { - Eval(Bar->tree_min, &result); - min = R2N(&result); - DelResult(&result); - } else { - min = Bar->min; - if (val1 < min) min = val1; - if (val2 < min) min = val2; - } - - /* maximum: if expression is empty, do auto-scaling */ - if (Bar->tree_max!=NULL) { - Eval(Bar->tree_max, &result); - max = R2N(&result); - DelResult(&result); - } else { - max = Bar->max; - if (val1 > max) max = val1; - if (val2 > max) max = val2; - } - - /* calculate bar values */ - Bar->min=min; - Bar->max=max; - if (max>min) { - Bar->val1=(val1-min)/(max-min); - Bar->val2=(val2-min)/(max-min); - } else { - Bar->val1=0.0; - Bar->val2=0.0; - } - - /* finally, draw it! */ - if (W->class->draw) - W->class->draw(W); - + WIDGET *W = (WIDGET *) Self; + WIDGET_BAR *Bar = W->data; + RESULT result = { 0, 0, 0, NULL }; + + double val1, val2; + double min, max; + + /* evaluate expressions */ + val1 = 0.0; + if (Bar->tree1 != NULL) { + Eval(Bar->tree1, &result); + val1 = R2N(&result); + DelResult(&result); + } + + val2 = val1; + if (Bar->tree2 != NULL) { + Eval(Bar->tree2, &result); + val2 = R2N(&result); + DelResult(&result); + } + + /* minimum: if expression is empty, do auto-scaling */ + if (Bar->tree_min != NULL) { + Eval(Bar->tree_min, &result); + min = R2N(&result); + DelResult(&result); + } else { + min = Bar->min; + if (val1 < min) + min = val1; + if (val2 < min) + min = val2; + } + + /* maximum: if expression is empty, do auto-scaling */ + if (Bar->tree_max != NULL) { + Eval(Bar->tree_max, &result); + max = R2N(&result); + DelResult(&result); + } else { + max = Bar->max; + if (val1 > max) + max = val1; + if (val2 > max) + max = val2; + } + + /* calculate bar values */ + Bar->min = min; + Bar->max = max; + if (max > min) { + Bar->val1 = (val1 - min) / (max - min); + Bar->val2 = (val2 - min) / (max - min); + } else { + Bar->val1 = 0.0; + Bar->val2 = 0.0; + } + + /* finally, draw it! */ + if (W->class->draw) + W->class->draw(W); + } -int widget_bar_init (WIDGET *Self) +int widget_bar_init(WIDGET * Self) { - char *section; char *c; - WIDGET_BAR *Bar; - - /* prepare config section */ - /* strlen("Widget:")=7 */ - section=malloc(strlen(Self->name)+8); - strcpy(section, "Widget:"); - strcat(section, Self->name); - - Bar=malloc(sizeof(WIDGET_BAR)); - memset (Bar, 0, sizeof(WIDGET_BAR)); - - /* get raw expressions (we evaluate them ourselves) */ - Bar->expression1 = cfg_get_raw (section, "expression", NULL); - Bar->expression2 = cfg_get_raw (section, "expression2", NULL); - - /* sanity check */ - if (Bar->expression1==NULL || *Bar->expression1=='\0') { - error ("widget %s has no expression, using '0.0'", Self->name); - Bar->expression1="0"; - } - - /* minimum and maximum value */ - Bar->expr_min = cfg_get_raw (section, "min", NULL); - Bar->expr_max = cfg_get_raw (section, "max", NULL); - - /* compile all expressions */ - Compile (Bar->expression1, &Bar->tree1); - Compile (Bar->expression2, &Bar->tree2); - Compile (Bar->expr_min, &Bar->tree_min); - Compile (Bar->expr_max, &Bar->tree_max); - - /* bar length, default 1 */ - cfg_number (section, "length", 1, 0, -1, &(Bar->length)); - - /* direction: East (default), West, North, South */ - c = cfg_get (section, "direction", "E"); - switch (toupper(*c)) { - case 'E': - Bar->direction=DIR_EAST; - break; - case 'W': - Bar->direction=DIR_WEST; - break; - case 'N': - Bar->direction=DIR_NORTH; - break; - case 'S': - Bar->direction=DIR_SOUTH; - break; - default: - error ("widget %s has unknown direction '%s', using 'East'", Self->name, c); - Bar->direction=DIR_EAST; - } - free (c); - - /* style: none (default), hollow */ - c = cfg_get (section, "style", "0"); - switch (toupper (*c)) - { + char *section; + char *c; + WIDGET_BAR *Bar; + + /* prepare config section */ + /* strlen("Widget:")=7 */ + section = malloc(strlen(Self->name) + 8); + strcpy(section, "Widget:"); + strcat(section, Self->name); + + Bar = malloc(sizeof(WIDGET_BAR)); + memset(Bar, 0, sizeof(WIDGET_BAR)); + + /* get raw expressions (we evaluate them ourselves) */ + Bar->expression1 = cfg_get_raw(section, "expression", NULL); + Bar->expression2 = cfg_get_raw(section, "expression2", NULL); + + /* sanity check */ + if (Bar->expression1 == NULL || *Bar->expression1 == '\0') { + error("widget %s has no expression, using '0.0'", Self->name); + Bar->expression1 = "0"; + } + + /* minimum and maximum value */ + Bar->expr_min = cfg_get_raw(section, "min", NULL); + Bar->expr_max = cfg_get_raw(section, "max", NULL); + + /* compile all expressions */ + Compile(Bar->expression1, &Bar->tree1); + Compile(Bar->expression2, &Bar->tree2); + Compile(Bar->expr_min, &Bar->tree_min); + Compile(Bar->expr_max, &Bar->tree_max); + + /* bar length, default 1 */ + cfg_number(section, "length", 1, 0, -1, &(Bar->length)); + + /* direction: East (default), West, North, South */ + c = cfg_get(section, "direction", "E"); + switch (toupper(*c)) { + case 'E': + Bar->direction = DIR_EAST; + break; + case 'W': + Bar->direction = DIR_WEST; + break; + case 'N': + Bar->direction = DIR_NORTH; + break; + case 'S': + Bar->direction = DIR_SOUTH; + break; + default: + error("widget %s has unknown direction '%s', using 'East'", Self->name, c); + Bar->direction = DIR_EAST; + } + free(c); + + /* style: none (default), hollow */ + c = cfg_get(section, "style", "0"); + switch (toupper(*c)) { case 'H': - Bar->style = STYLE_HOLLOW; - if (!(Bar->direction & (DIR_EAST | DIR_WEST))) - { - error ("widget %s with style \"hollow\" not implemented", Self->name); - Bar->style = 0; - } - break; + Bar->style = STYLE_HOLLOW; + if (!(Bar->direction & (DIR_EAST | DIR_WEST))) { + error("widget %s with style \"hollow\" not implemented", Self->name); + Bar->style = 0; + } + break; default: - Bar->style = 0; - } - free (c); - - /* update interval (msec), default 1 sec */ - cfg_number (section, "update", 1000, 10, -1, &(Bar->update)); - - free (section); - Self->data=Bar; - - timer_add (widget_bar_update, Self, Bar->update, 0); - - return 0; + Bar->style = 0; + } + free(c); + + /* update interval (msec), default 1 sec */ + cfg_number(section, "update", 1000, 10, -1, &(Bar->update)); + + free(section); + Self->data = Bar; + + timer_add(widget_bar_update, Self, Bar->update, 0); + + return 0; } -int widget_bar_quit (WIDGET *Self) +int widget_bar_quit(WIDGET * Self) { - if (Self ) { - if (Self->data) { - WIDGET_BAR *Bar = Self->data; - DelTree(Bar->tree1); - DelTree(Bar->tree2); - DelTree(Bar->tree_min); - DelTree(Bar->tree_max); - free(Self->data); + if (Self) { + if (Self->data) { + WIDGET_BAR *Bar = Self->data; + DelTree(Bar->tree1); + DelTree(Bar->tree2); + DelTree(Bar->tree_min); + DelTree(Bar->tree_max); + free(Self->data); + } + Self->data = NULL; } - Self->data=NULL; - } - - - return 0; - + + + return 0; + } WIDGET_CLASS Widget_Bar = { - name: "bar", - init: widget_bar_init, - draw: NULL, - quit: widget_bar_quit, + name:"bar", + init:widget_bar_init, + draw:NULL, + quit:widget_bar_quit, }; -- cgit v1.2.3