jan
/
ancient-weatherstation
mirror of https://github.com/agdsn/ancient-weatherstation.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Working on charts 

(draws a chart on the image)

git-svn-id: file:///home/jan/tmp/wetterstation/trunk@88 dd492736-c11a-0410-ad51-8c26713eaf7f
This commit is contained in:
losinshi 2006-09-13 16:20:29 +00:00
parent dc863f8bd6
commit 81d8b26522
5 changed files with 68 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cronjob/chart/image_file/image_config.c
View File

@ -50,7 +50,7 @@ static const config_keyword keywords[] = {
{"sensor_id", read_int, &(img_cfg.sens_id), ""},
{"bg_color", read_color, &(img_cfg.bg_color), ""},
{"bg_color", read_color, &(img_cfg.bg_color), ""},
{"", NULL, NULL, ""}
};

56
cronjob/chart/image_file/image_data.c
View File

@ -17,7 +17,7 @@ static pix_list_ptr min = NULL;
static pix_list_ptr max = NULL;
static pix_list_ptr add_pix_value(pix_list_ptr , int , int );
static pix_list_ptr add_pix_value(pix_list_ptr , long, int , int );
static char *get_conn_string();
static PGconn *pg_check_connect(char *);
static PGresult *pg_check_exec(PGconn *, char *);
@ -30,12 +30,12 @@ int scale_y_coords(pix_list_ptr ptr, int c_height, int max_label, int min_label)
int range = (max_label - min_label + 1) * 10; /* Anzahl von 0,1-Schritten */
double pix_per_scale = ((double)c_height) / ((double)range); /* Pixel pro 0,1 */
pix_list_ptr temp = ptr;
int zero_line = floor( ((double)max_label) * pix_per_scale); /* Nullinie */
int zero_line = floor( ((double)( (max_label * 10) + 1)) * pix_per_scale); /* Nullinie */
DEBUGOUT1("\nBerechne y-Koordinaten:\n");
for (; temp; temp = temp->next){
temp->y_pix_coord = floor( ( ((double)temp->value_sum) / ((double)temp->value_count) ) * pix_per_scale);
temp->y_pix_coord = -1 * floor( ( ((double)temp->value_sum) / ((double)temp->value_count) ) * pix_per_scale);
DEBUGOUT3(" neue y-Koordinate: %d bei x: %d\n",temp->y_pix_coord, temp->x_pix_coord);
}
@ -68,6 +68,7 @@ pix_list_ptr get_pix_list(int c_width){
int pix_coord; /* x - Koordinate, an die der Wert gehört */
int i; /* Laufvariable zum durchlaufen des Datenbank-resuls */
long base_time; /* Zeit an der 0-Koordinate (lt. Datenbank!) */
long timestamp;
pix_list_ptr list_ptr = NULL; /* Zeiger auf den Anfang der Wertliste */
pix_list_ptr temp_ptr = NULL; /* Zeiger zum durchlaufen der Wertliste */
@ -90,9 +91,10 @@ pix_list_ptr get_pix_list(int c_width){
base_time = atol(PQgetvalue(res, 0, PQfnumber(res, "now"))) - img_cfg.show_interval;
for (i = 0; i < PQntuples(res); i++){
time_temp = atol(PQgetvalue(res, i, time_field)) - base_time;
timestamp = atol(PQgetvalue(res, i, time_field));
time_temp = timestamp - base_time;
pix_coord = floor( ((double)time_temp) * seconds_per_pix) ;
temp_ptr = add_pix_value(temp_ptr, pix_coord, atoi( PQgetvalue(res, i, val_field) ) );
temp_ptr = add_pix_value(temp_ptr, timestamp, pix_coord, atoi( PQgetvalue(res, i, val_field) ) );
if (list_ptr == NULL){
list_ptr = temp_ptr;
@ -133,36 +135,38 @@ pix_list_ptr get_pix_list(int c_width){
}
/* Speichert einen geholten Wert ab */
static pix_list_ptr add_pix_value(pix_list_ptr ptr, int coord, int value){
static pix_list_ptr add_pix_value(pix_list_ptr ptr, long timestamp, int coord, int value){
if(ptr == NULL){
DEBUGOUT1("\nLese Daten ein:\n");
ptr = malloc(sizeof(pix_list_t));
ptr->next = NULL;
ptr->x_pix_coord = 0;
ptr->timestamp = timestamp;
ptr->x_pix_coord = coord;
ptr->y_pix_coord = 0;
ptr->value_count = 0;
ptr->value_sum = 0;
DEBUGOUT1(" Erstes Element generiert...\n");
}
if(coord == ptr->x_pix_coord){
ptr->value_sum += value;
ptr->value_count++;
DEBUGOUT5(" Zu x-pos. %d %d. Wert (%d) hinzugefügt. Durchschn.: %d\n", ptr->x_pix_coord, ptr->value_count, value, (ptr->value_sum/ptr->value_count) );
ptr->value_count = 1;
ptr->value_sum = value;
DEBUGOUT3(" Erstes Element generiert...x-pos.: %d Wert: %d\n",ptr->x_pix_coord, ptr->value_sum);
} else {
ptr->next = malloc(sizeof(pix_list_t));
ptr = ptr->next;
ptr->x_pix_coord = coord;
ptr->y_pix_coord = coord;
ptr->value_sum = value;
ptr->value_count = 1;
ptr->next = NULL;
DEBUGOUT3(" An x-pos. %d Wert %d eingefuegt\n", ptr->x_pix_coord, ptr->value_sum);
if(coord == ptr->x_pix_coord){
ptr->value_sum += value;
ptr->value_count++;
DEBUGOUT5(" Zu x-pos. %d %d. Wert (%d) hinzugefügt. Durchschn.: %d\n", ptr->x_pix_coord, ptr->value_count, value, (ptr->value_sum/ptr->value_count) );
} else {
ptr->next = malloc(sizeof(pix_list_t));
ptr = ptr->next;
ptr->timestamp = timestamp;
ptr->x_pix_coord = coord;
ptr->y_pix_coord = 0;
ptr->value_sum = value;
ptr->value_count = 1;
ptr->next = NULL;
DEBUGOUT3(" An x-pos. %d Wert %d eingefuegt\n", ptr->x_pix_coord, ptr->value_sum);
}
}
return ptr;
}

1
cronjob/chart/image_file/image_data.h
View File

@ -8,6 +8,7 @@ typedef struct pix_list {
int y_pix_coord;
int value_count;
int value_sum;
long timestamp;
} pix_list_t;

38
cronjob/chart/image_file/image_draw.c
View File

@ -12,13 +12,14 @@ static gdImagePtr create_image();
static gdImagePtr draw_image(gdImagePtr);
static void write_image_png(gdImagePtr, FILE *);
/* Baut ein Bild und schreibt es in die Datei */
int draw_to_file(FILE *fd){
gdImagePtr img = create_image();
draw_image(img);
write_image_png(img, fd);
}
/* Erstellt ein Bild mit Hintergrundfarbe */
static gdImagePtr create_image(){
gdImagePtr new_img = NULL;
color back;
@ -33,11 +34,42 @@ static gdImagePtr create_image(){
return new_img;
}
/* Baut das Bild */
static gdImagePtr draw_image(gdImagePtr img){
pix_list_ptr pix_list = get_pix_list(300);
scale_y_coords(pix_list, 100, 40, -10);
pix_list_ptr pix_list = NULL;
int max_val = 0;
int min_val = 0;
int offset_x_left = 0;
int offset_y_top = 0;
int offset_x_right = 0;
int offset_y_bottom = 0;
int dia_width = img_cfg.width - offset_x_left - offset_x_right;
int dia_height = img_cfg.height - offset_y_top - offset_y_bottom;
int zero_line = 0;
color val_line_c = gdImageColorAllocateAlpha(img, 0,0,0,0);
color zero_line_c = gdImageColorAllocateAlpha(img, 0,0,0,0);
pix_list = get_pix_list(dia_width);
/* y-Werte skalieren */
zero_line = scale_y_coords(pix_list, dia_height, 40, -10);
/* Nullinie */
gdImageLine(img, offset_x_left, zero_line + offset_y_top, img_cfg.width - offset_x_right, zero_line + offset_y_top, zero_line_c);
/* Werte Zeichnen */
for (; pix_list->next; pix_list = pix_list->next){
gdImageLine(img, (offset_x_left + pix_list->x_pix_coord), (zero_line + offset_y_top + pix_list->y_pix_coord), (offset_x_left + pix_list->next->x_pix_coord), (zero_line + offset_y_top + pix_list->next->y_pix_coord), val_line_c);
}
}
/* Schreibt das Bild in eine Datei */
static void write_image_png(gdImagePtr img, FILE *fd){
gdImageAlphaBlending(img, 0);
gdImageSaveAlpha(img, 1);

2
cronjob/chart/image_file/testimage.conf
View File

@ -4,7 +4,7 @@ manual_table no
manual_table_name auss2_data
table_field temp
gen_interval 15
show_interval 1h
show_interval 30d
label_interval 10m
label_sum no
width 400