mirror of
https://github.com/netfun2000/lcd4linux.git
synced 2026-02-27 09:44:34 +08:00
widget_bar scale debugging changed
git-svn-id: https://ssl.bulix.org/svn/lcd4linux/trunk@934 3ae390bd-cb1e-0410-b409-cd5a39f66f1f
This commit is contained in:
+2
-1
@@ -60,7 +60,8 @@
|
||||
#define PIDFILE "/var/run/lcd4linux.pid"
|
||||
|
||||
static char *release = "LCD4Linux " VERSION "-" SVN_VERSION;
|
||||
static char *copyright = "Copyright (C) 2005, 2006, 2007, 2008 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>";
|
||||
static char *copyright =
|
||||
"Copyright (C) 2005, 2006, 2007, 2008 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>";
|
||||
static char **my_argv;
|
||||
extern char *output;
|
||||
|
||||
|
||||
+7
-10
@@ -71,40 +71,37 @@ void widget_bar_update(void *Self)
|
||||
|
||||
/* minimum: if expression is empty, do auto-scaling */
|
||||
if (property_valid(&Bar->expr_min)) {
|
||||
if (0 != property_eval(&Bar->expr_min)) {
|
||||
info("widget bar %s: Property min changed to %G", W->name, P2N(&Bar->expr_min));
|
||||
}
|
||||
property_eval(&Bar->expr_min);
|
||||
min = P2N(&Bar->expr_min);
|
||||
} else {
|
||||
min = Bar->min;
|
||||
if (val1 < min) {
|
||||
min = val1;
|
||||
info("widget bar %s: new min value %G", W->name, min);
|
||||
}
|
||||
if (val2 < min) {
|
||||
min = val2;
|
||||
info("widget bar %s: new min value %G", W->name, min);
|
||||
}
|
||||
}
|
||||
|
||||
/* maximum: if expression is empty, do auto-scaling */
|
||||
if (property_valid(&Bar->expr_max)) {
|
||||
if (0 != property_eval(&Bar->expr_max)) {
|
||||
info("widget bar %s: Property max changed to %G", W->name, P2N(&Bar->expr_max));
|
||||
}
|
||||
property_eval(&Bar->expr_max);
|
||||
max = P2N(&Bar->expr_max);
|
||||
} else {
|
||||
max = Bar->max;
|
||||
if (val1 > max) {
|
||||
max = val1;
|
||||
info("widget bar %s: new max value %G", W->name, max);
|
||||
}
|
||||
if (val2 > max) {
|
||||
max = val2;
|
||||
info("widget bar %s: new max value %G", W->name, max);
|
||||
}
|
||||
}
|
||||
|
||||
/* debugging */
|
||||
if (Bar->min != min || Bar->max != max) {
|
||||
debug("Bar '%s': new scale %G - %G", W->name, min, max);
|
||||
}
|
||||
|
||||
/* calculate bar values */
|
||||
Bar->min = min;
|
||||
Bar->max = max;
|
||||
|
||||
Reference in New Issue
Block a user