itanic: database.h: change the order of fields

Signed-off-by: Timo Kokkonen <kaapeli@itanic.dy.fi>

diff --git a/database.h b/database.h
index c767c8bf32fd1e36f338b544c908979ae2d39f2c..14c4b11063772bae03bf38ded249507c6ce85195 100644 (file)
--- a/database.h
+++ b/database.h
@@ -178,20 +178,27 @@ const char *powertext[] = {
        "COMMENT:                   "
        "MIN          MAX         AVG        Last\\n",
        blank,
-       "AREA:tuont#000000:Tuonti       ",
-       "GPRINT:tuont:MIN:" numfmt,
-       "GPRINT:tuont:MAX:" numfmt,
-       "GPRINT:tuont:AVERAGE:" numfmt,
-       "GPRINT:tuont:LAST:" numfmt "\\n",
-       "COMMENT: \\n",
-       blank,
-       "STACK:ydinv#ffff00:Ydinvoima   ",
+       "AREA:ydinv#ffff00:Ydinvoima   ",
        "GPRINT:ydinv:MIN:" numfmt,
        "GPRINT:ydinv:MAX:" numfmt,
        "GPRINT:ydinv:AVERAGE:" numfmt,
        "GPRINT:ydinv:LAST:" numfmt "\\n",
        "COMMENT: \\n",
        blank,
+       "STACK:teoll#ff00ff:Teollisuus  ",
+       "GPRINT:teoll:MIN:" numfmt,
+       "GPRINT:teoll:MAX:" numfmt,
+       "GPRINT:teoll:AVERAGE:" numfmt,
+       "GPRINT:teoll:LAST:" numfmt "\\n",
+       "COMMENT: \\n",
+       blank,
+       "STACK:kauko#00ff00:Kaukolämpö  ",
+       "GPRINT:kauko:MIN:" numfmt,
+       "GPRINT:kauko:MAX:" numfmt,
+       "GPRINT:kauko:AVERAGE:" numfmt,
+       "GPRINT:kauko:LAST:" numfmt "\\n",
+       "COMMENT: \\n",
+       blank,
        "STACK:muutu#808080:Muu         ",
        "GPRINT:huipp:MIN:" numfmt,
        "GPRINT:huipp:MAX:" numfmt,
@@ -199,13 +206,6 @@ const char *powertext[] = {
        "GPRINT:huipp:LAST:" numfmt "\\n",
        "COMMENT: \\n",
        blank,
-       "STACK:vesiv#0000ff:Vesivoima   ",
-       "GPRINT:vesiv:MIN:" numfmt,
-       "GPRINT:vesiv:MAX:" numfmt,
-       "GPRINT:vesiv:AVERAGE:" numfmt,
-       "GPRINT:vesiv:LAST:" numfmt "\\n",
-       "COMMENT: \\n",
-       blank,
        "STACK:lauhd#ff0000:Lauhdevoima ",
        "GPRINT:lauhd:MIN:" numfmt,
        "GPRINT:lauhd:MAX:" numfmt,
@@ -213,26 +213,26 @@ const char *powertext[] = {
        "GPRINT:lauhd:LAST:" numfmt "\\n",
        "COMMENT: \\n",
        blank,
-       "STACK:kauko#00ff00:Kaukolämpö  ",
-       "GPRINT:kauko:MIN:" numfmt,
-       "GPRINT:kauko:MAX:" numfmt,
-       "GPRINT:kauko:AVERAGE:" numfmt,
-       "GPRINT:kauko:LAST:" numfmt "\\n",
-       "COMMENT: \\n",
-       blank,
-       "STACK:teoll#ff00ff:Teollisuus  ",
-       "GPRINT:teoll:MIN:" numfmt,
-       "GPRINT:teoll:MAX:" numfmt,
-       "GPRINT:teoll:AVERAGE:" numfmt,
-       "GPRINT:teoll:LAST:" numfmt "\\n",
-       "COMMENT: \\n",
-       blank,
        "STACK:huipp#ff0000:Huippuvoima ",
        "GPRINT:huipp:MIN:" numfmt,
        "GPRINT:huipp:MAX:" numfmt,
        "GPRINT:huipp:AVERAGE:" numfmt,
        "GPRINT:huipp:LAST:" numfmt "\\n",
        "COMMENT: \\n",
+       blank,
+       "STACK:vesiv#0000ff:Vesivoima   ",
+       "GPRINT:vesiv:MIN:" numfmt,
+       "GPRINT:vesiv:MAX:" numfmt,
+       "GPRINT:vesiv:AVERAGE:" numfmt,
+       "GPRINT:vesiv:LAST:" numfmt "\\n",
+       "COMMENT: \\n",
+       blank,
+       "STACK:tuont#000000:Tuonti      ",
+       "GPRINT:tuont:MIN:" numfmt,
+       "GPRINT:tuont:MAX:" numfmt,
+       "GPRINT:tuont:AVERAGE:" numfmt,
+       "GPRINT:tuont:LAST:" numfmt "\\n",
+       "COMMENT: \\n",
        0
 };