From ae1db856c41569306e7372d67eaf00f26edd4e2b Mon Sep 17 00:00:00 2001
From: losinshi <losinshi@dd492736-c11a-0410-ad51-8c26713eaf7f>
Date: Mon, 18 Sep 2006 12:43:47 +0000
Subject: [PATCH] chart: change fontsize frontend: wind-module fixed

git-svn-id: file:///home/jan/tmp/wetterstation/trunk@108 dd492736-c11a-0410-ad51-8c26713eaf7f
---
 cronjob/chart/image_conf/temp_ex.conf          | 6 +++---
 cronjob/chart/image_file/image_draw.c          | 4 ++--
 webstuff/frontend/php_inc/modules/wind.inc.php | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cronjob/chart/image_conf/temp_ex.conf b/cronjob/chart/image_conf/temp_ex.conf
index 6340115..c632285 100644
--- a/cronjob/chart/image_conf/temp_ex.conf
+++ b/cronjob/chart/image_conf/temp_ex.conf
@@ -78,8 +78,8 @@ dia_grid_x_color	60:60:60:EF	# Farbe der Senkrechten Striche
 dia_grid_y_color	60:60:60:EF	# Farbe der Waagerechten Striche
 dia_border_color	a0:a0:a0:a0	# Farbe des Diagramrahmens (rahmen um den Datenbereich)
 headline_color		10:80:10:30	# Farbe der Ueberschrift
-label_x_color		20:20:20:20	# Farbe der Labels an der X-Achse
-label_extra_x_color	10:10:40:20	# Farbe des ersten und lezten Labels an der X-Achse 
-label_y_color		10:10:10:20	# Farbe der Labels an der Y-Achse
+label_x_color		20:20:20:00	# Farbe der Labels an der X-Achse
+label_extra_x_color	10:10:40:00	# Farbe des ersten und lezten Labels an der X-Achse 
+label_y_color		10:10:10:00	# Farbe der Labels an der Y-Achse
 descr_y_color		10:50:10:20	# Farbe der x-Achsen Beschreibung
 descr_x_color		10:10:50:20	# Farbe der y-Achsen-Beschreibung
diff --git a/cronjob/chart/image_file/image_draw.c b/cronjob/chart/image_file/image_draw.c
index 218b924..75146b2 100644
--- a/cronjob/chart/image_file/image_draw.c
+++ b/cronjob/chart/image_file/image_draw.c
@@ -175,8 +175,8 @@ static gdImagePtr draw_image(gdImagePtr img){
   y_labels = get_y_label_list(dia_height, dia_y_padding);
   for (; y_labels; y_labels = y_labels->next){
     gdImageLine(img, offset_x_left - 2, offset_y_top + y_labels->pos, img_cfg.width - offset_x_right, offset_y_top + y_labels->pos, diag_grid_x_c);
-    y_label_d = calc_text_dim(y_labels->text, 7, 0);
-    gdImageStringFT(img, &brect[0], label_y_c, IMG_FONT, 7, 0, (offset_x_left - 5 - y_label_max_width) + (y_label_max_width - y_label_d.width), offset_y_top + y_labels->pos + (y_label_d.height / 2), y_labels->text);
+    y_label_d = calc_text_dim(y_labels->text, 8, 0);
+    gdImageStringFT(img, &brect[0], label_y_c, IMG_FONT, 8, 0, (offset_x_left - 5 - y_label_max_width) + (y_label_max_width - y_label_d.width), offset_y_top + y_labels->pos + (y_label_d.height / 2), y_labels->text);
   }
 
   /* y-Werte skalieren */
diff --git a/webstuff/frontend/php_inc/modules/wind.inc.php b/webstuff/frontend/php_inc/modules/wind.inc.php
index bd9f102..8fb6223 100644
--- a/webstuff/frontend/php_inc/modules/wind.inc.php
+++ b/webstuff/frontend/php_inc/modules/wind.inc.php
@@ -163,7 +163,7 @@ class Wind{
 
   /* --- Funktionen, die aufgerufen werden um die geholeten Werte auszugeben --- */
   function get_now_val(){
-    return $this->nowWind;
+    return round($this->nowWind * 0.1, 1);
   }
 
   function get_now_dir(){
@@ -179,7 +179,7 @@ class Wind{
   }
 
   function get_av_value(){
-    return $this->avVal;
+    return round($this->avVal * 0.1, 1);
   }
 
   function get_av_interval(){
@@ -191,7 +191,7 @@ class Wind{
   }
 
   function get_max_val(){
-    return $this->maxWind;
+    return round($this->maxWind * 0.1, 1);
   }
 
   function get_max_dir(){