Changeset 5070

Timestamp:

12/11/07 22:48:34 (6 years ago)

Author:

khali

Message:

sensord: Use the same colors for daily and weekly charts.

Location:

lm-sensors/branches/lm-sensors-3.0.0

Files:

• CHANGES (modified) (1 diff)
• prog/sensord/rrd.c (modified) (2 diffs)

lm-sensors/branches/lm-sensors-3.0.0/CHANGES

@@ -10 +10 @@
              Warn about outputs found in automatic mode
   sensord: Fix rrd support (#2276)
+           Use the same colors for daily and weekly charts
   sensors-detect: Drop PCA9540 detection
 

lm-sensors/branches/lm-sensors-3.0.0/prog/sensord/rrd.c

@@ -295 +295 @@
 }
 
+/* Compute an arbitrary color based on the sensor label. This is preferred
+   over a random value because this guarantees that daily and weekly charts
+   will use the same colors. */
+static int
+rrdCGI_color
+(const char *label) {
+  unsigned long color = 0, brightness;
+  const char *c;
+
+  for (c = label; *c; c++) {
+    color = (color << 6) + (color >> (*c & 7));
+    color ^= (*c) * 0x401;
+  }
+  color &= 0xffffff;
+  /* Adjust very light colors */
+  brightness = (color & 0xff) + ((color >> 8) & 0xff) + (color >> 16);
+  if (brightness > 672)
+    color &= 0x7f7f7f;
+  /* Adjust very dark colors */
+  else if (brightness < 96)
+    color |= 0x808080;
+  return color;
+}
+
 static int
 rrdCGI_LINE
@@ -300 +324 @@
   struct gr *data = (struct gr *) _data;
   if (!feature || (feature->rrd && (feature->type == data->type)))
-    printf ("\n\tLINE2:%s#%.6x:\"%s\"", rawLabel, (int) random () & 0xffffff, label);
+    printf ("\n\tLINE2:%s#%.6x:\"%s\"", rawLabel, rrdCGI_color(label), label);
   return 0;
 }