X-Git-Url: https://git.wpitchoune.net/gitweb/?p=psensor.git;a=blobdiff_plain;f=src%2Fgraph.c;h=71090aa4f4e38600da10a780e59e41bd04e2c5eb;hp=79b9d6f001287a45445dac79cb017d5d61d5f2cb;hb=c1e20f2631a1249720e9c75d753eacfcb0f6c7b9;hpb=682f5f95c5232eaea99907814bf8c5e523ceabe7 diff --git a/src/graph.c b/src/graph.c index 79b9d6f..71090aa 100644 --- a/src/graph.c +++ b/src/graph.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2014 jeanfi@gmail.com + * Copyright (C) 2010-2016 jeanfi@gmail.com * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License as @@ -27,54 +27,110 @@ #include #include +#include +#include #include #include /* horizontal padding */ -#define GRAPH_H_PADDING 4 +static const int GRAPH_H_PADDING = 4; /* vertical padding */ -#define GRAPH_V_PADDING 4 +static const int GRAPH_V_PADDING = 4; bool is_smooth_curves_enabled; struct graph_info { - /* Horizontal position of the central region (curves) */ + /* Horizontal position of the central area (curves) */ int g_xoff; - /* Vertical position of the central region (curves) */ + /* Vertical position of the central area (curves) */ int g_yoff; + /* Width of the central area (curves) */ + int g_width; + /* Height of the central area (curves) */ + int g_height; + /* Height of the drawing canvas */ int height; + /* Width of the drawing canvas */ + int width; +}; - /* Background color of the current desktop theme */ - GdkRGBA theme_bg_color; +static GtkStyleContext *style; +/* Foreground color of the current desktop theme */ +static GdkRGBA theme_fg_color; +/* Background color of the current desktop theme */ +static GdkRGBA theme_bg_color; - /* Foreground color of the current desktop theme */ - GdkRGBA theme_fg_color; -}; +static void update_theme(GtkWidget *w) +{ + style = gtk_widget_get_style_context(w); + + gtk_style_context_get_background_color(style, + GTK_STATE_FLAG_NORMAL, + &theme_bg_color); + gtk_style_context_get_color(style, + GTK_STATE_FLAG_NORMAL, + &theme_fg_color); +} + +static struct psensor **list_filter_graph_enabled(struct psensor **sensors) +{ + int n, i; + struct psensor **result, **cur, *s; + + if (!sensors) + return NULL; + + n = psensor_list_size(sensors); + result = malloc((n+1) * sizeof(struct psensor *)); + for (cur = sensors, i = 0; *cur; cur++) { + s = *cur; + + if (config_is_sensor_graph_enabled(s->id)) + result[i++] = s; + } + + result[i] = NULL; + + return result; +} /* Return the end time of the graph i.e. the more recent measure. If * no measure are available, return 0. + * If Bezier curves are used return the measure n-3 to avoid to + * display a part of the curve outside the graph area. */ static time_t get_graph_end_time_s(struct psensor **sensors) { time_t ret, t; struct psensor *s; struct measure *measures; - int i; + int i, n; ret = 0; while (*sensors) { s = *sensors; measures = s->measures; + if (is_smooth_curves_enabled) + n = 2; + else + n = 0; + for (i = s->values_max_length - 1; i >= 0; i--) { if (measures[i].value != UNKNOWN_DBL_VALUE) { - t = measures[i].time.tv_sec; + if (!n) { + t = measures[i].time.tv_sec; - if (t > ret) - ret = t; + if (t > ret) { + ret = t; + break; + } + } else { + n--; + } } i--; } @@ -119,19 +175,33 @@ static char *time_to_str(time_t s) static void draw_left_region(cairo_t *cr, struct graph_info *info) { cairo_set_source_rgb(cr, - info->theme_bg_color.red, - info->theme_bg_color.green, - info->theme_bg_color.blue); + theme_bg_color.red, + theme_bg_color.green, + theme_bg_color.blue); cairo_rectangle(cr, 0, 0, info->g_xoff, info->height); cairo_fill(cr); } +static void draw_right_region(cairo_t *cr, struct graph_info *info) +{ + cairo_set_source_rgb(cr, + theme_bg_color.red, + theme_bg_color.green, + theme_bg_color.blue); + + + cairo_rectangle(cr, + info->g_xoff + info->g_width, + 0, + info->g_xoff + info->g_width + GRAPH_H_PADDING, + info->height); + cairo_fill(cr); +} + static void draw_graph_background(cairo_t *cr, - int g_xoff, int g_yoff, - int g_width, int g_height, - int width, int height, struct config *config, + struct config *config, struct graph_info *info) { struct color *bgcolor; @@ -140,17 +210,17 @@ draw_graph_background(cairo_t *cr, if (config->alpha_channel_enabled) cairo_set_source_rgba(cr, - info->theme_bg_color.red, - info->theme_bg_color.green, - info->theme_bg_color.blue, + theme_bg_color.red, + theme_bg_color.green, + theme_bg_color.blue, config->graph_bg_alpha); else cairo_set_source_rgb(cr, - info->theme_bg_color.red, - info->theme_bg_color.green, - info->theme_bg_color.blue); + theme_bg_color.red, + theme_bg_color.green, + theme_bg_color.blue); - cairo_rectangle(cr, g_xoff, 0, g_width, height); + cairo_rectangle(cr, info->g_xoff, 0, info->g_width, info->height); cairo_fill(cr); if (config->alpha_channel_enabled) @@ -165,7 +235,11 @@ draw_graph_background(cairo_t *cr, bgcolor->green, bgcolor->blue); - cairo_rectangle(cr, g_xoff, g_yoff, g_width, g_height); + cairo_rectangle(cr, + info->g_xoff, + info->g_yoff, + info->g_width, + info->g_height); cairo_fill(cr); } @@ -174,44 +248,49 @@ static double dashes[] = { 1.0, /* ink */ 2.0, /* skip */ }; -static int ndash = sizeof(dashes) / sizeof(dashes[0]); +static int ndash = ARRAY_SIZE(dashes); static void draw_background_lines(cairo_t *cr, - struct color *color, - int g_width, int g_height, - int g_xoff, int g_yoff, - int min, int max) + int min, int max, + struct config *config, + struct graph_info *info) { int i; + double x, y; + struct color *color; + + color = config->graph_fgcolor; /* draw background lines */ cairo_set_line_width(cr, 1); cairo_set_dash(cr, dashes, ndash, 0); - cairo_set_source_rgb(cr, - color->red, color->green, color->blue); + cairo_set_source_rgb(cr, color->red, color->green, color->blue); /* vertical lines representing time steps */ for (i = 0; i <= 5; i++) { - int x = i * (g_width / 5) + g_xoff; - - cairo_move_to(cr, x, g_yoff); - cairo_line_to(cr, x, g_yoff + g_height); - cairo_stroke(cr); + x = i * ((double)info->g_width / 5) + info->g_xoff; + cairo_move_to(cr, x, info->g_yoff); + cairo_line_to(cr, x, info->g_yoff + info->g_height); } /* horizontal lines draws a line for each 10C step */ for (i = min; i < max; i++) { if (i % 10 == 0) { - int y = compute_y(i, min, max, g_height, g_yoff); - - cairo_move_to(cr, g_xoff, y); - cairo_line_to(cr, g_xoff + g_width, y); - cairo_stroke(cr); + y = compute_y(i, + min, + max, + info->g_height, + info->g_yoff); + + cairo_move_to(cr, info->g_xoff, y); + cairo_line_to(cr, info->g_xoff + info->g_width, y); } } + cairo_stroke(cr); + /* back to normal line style */ - cairo_set_dash(cr, 0, 0, 0); + cairo_set_dash(cr, NULL, 0, 0); } /* Keys: sensor identifier. @@ -227,14 +306,12 @@ static void draw_sensor_smooth_curve(struct psensor *s, double max, int bt, int et, - int g_width, - int g_height, - int g_xoff, - int g_yoff) + struct graph_info *info) { int i, dt, vdt, j, k, found; double x[4], y[4], v; time_t t, t0, *stimes; + GdkRGBA *color; if (!times) times = g_hash_table_new_full(g_str_hash, @@ -244,15 +321,19 @@ static void draw_sensor_smooth_curve(struct psensor *s, stimes = g_hash_table_lookup(times, s->id); + color = config_get_sensor_color(s->id); + cairo_set_source_rgb(cr, - s->color->red, - s->color->green, - s->color->blue); + color->red, + color->green, + color->blue); + gdk_rgba_free(color); /* search the index of the first measure used as a start point * of a Bezier curve. The start and end points of the Bezier * curves must be preserved to ensure the same overall shape - * of the graph. */ + * of the graph. + */ i = 0; if (stimes) { while (i < s->values_max_length) { @@ -301,8 +382,13 @@ static void draw_sensor_smooth_curve(struct psensor *s, vdt = t - bt; - x[0 + j] = ((double)vdt * g_width) / dt + g_xoff; - y[0 + j] = compute_y(v, min, max, g_height, g_yoff); + x[0 + j] = ((double)vdt * info->g_width) + / dt + info->g_xoff; + y[0 + j] = compute_y(v, + min, + max, + info->g_height, + info->g_yoff); if (j == 0) t0 = t; @@ -328,18 +414,18 @@ static void draw_sensor_curve(struct psensor *s, double max, int bt, int et, - int g_width, - int g_height, - int g_xoff, - int g_yoff) + struct graph_info *info) { int first, i, t, dt, vdt; double v, x, y; + GdkRGBA *color; + color = config_get_sensor_color(s->id); cairo_set_source_rgb(cr, - s->color->red, - s->color->green, - s->color->blue); + color->red, + color->green, + color->blue); + gdk_rgba_free(color); dt = et - bt; first = 1; @@ -352,9 +438,9 @@ static void draw_sensor_curve(struct psensor *s, vdt = t - bt; - x = ((double)vdt * g_width) / dt + g_xoff; + x = ((double)vdt * info->g_width) / dt + info->g_xoff; - y = compute_y(v, min, max, g_height, g_yoff); + y = compute_y(v, min, max, info->g_height, info->g_yoff); if (first) { cairo_move_to(cr, x, y); @@ -391,38 +477,40 @@ graph_update(struct psensor **sensors, struct config *config, GtkWidget *window) { - struct color *fgcolor = config->graph_fgcolor; int et, bt, width, height, g_width, g_height; double min_rpm, max_rpm, mint, maxt, min, max; char *strmin, *strmax; /* horizontal and vertical offset of the graph */ - int g_xoff, g_yoff, no_graphs; + int g_xoff, g_yoff, no_graphs, use_celsius; cairo_surface_t *cst; cairo_t *cr, *cr_pixmap; char *str_btime, *str_etime; cairo_text_extents_t te_btime, te_etime, te_max, te_min; struct psensor **sensor_cur, **enabled_sensors; GtkAllocation galloc; - GtkStyleContext *style_ctx; struct graph_info info; if (!gtk_widget_is_drawable(w_graph)) return; - enabled_sensors = psensor_list_filter_graph_enabled(sensors); + if (!style) + update_theme(window); + + enabled_sensors = list_filter_graph_enabled(sensors); min_rpm = get_min_rpm(enabled_sensors); max_rpm = get_max_rpm(enabled_sensors); + if (config_get_temperature_unit() == CELSIUS) + use_celsius = 1; + else + use_celsius = 0; + mint = get_min_temp(enabled_sensors); - strmin = psensor_value_to_str(SENSOR_TYPE_TEMP, - mint, - config->temperature_unit == CELSIUS); + strmin = psensor_value_to_str(SENSOR_TYPE_TEMP, mint, use_celsius); maxt = get_max_temp(enabled_sensors); - strmax = psensor_value_to_str(SENSOR_TYPE_TEMP, - maxt, - config->temperature_unit == CELSIUS); + strmax = psensor_value_to_str(SENSOR_TYPE_TEMP, maxt, use_celsius); et = get_graph_end_time_s(enabled_sensors); bt = get_graph_begin_time_s(config, et); @@ -432,7 +520,10 @@ graph_update(struct psensor **sensors, gtk_widget_get_allocation(w_graph, &galloc); width = galloc.width; + info.width = galloc.width; height = galloc.height; + info.height = height; + cst = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); cr = cairo_create(cst); @@ -449,6 +540,7 @@ graph_update(struct psensor **sensors, cairo_text_extents(cr, strmin, &te_min); g_yoff = GRAPH_V_PADDING; + info.g_yoff = g_yoff; g_height = height - GRAPH_V_PADDING; if (te_etime.height > te_btime.height) @@ -456,36 +548,25 @@ graph_update(struct psensor **sensors, else g_height -= GRAPH_V_PADDING + te_btime.height + GRAPH_V_PADDING; + info.g_height = g_height; + if (te_min.width > te_max.width) g_xoff = (2 * GRAPH_H_PADDING) + te_max.width; else g_xoff = (2 * GRAPH_H_PADDING) + te_min.width; info.g_xoff = g_xoff; - info.g_yoff = g_yoff; - info.height = height; - - style_ctx = gtk_widget_get_style_context(window); - gtk_style_context_get_background_color(style_ctx, - GTK_STATE_FLAG_NORMAL, - &info.theme_bg_color); - gtk_style_context_get_color(style_ctx, - GTK_STATE_FLAG_NORMAL, - &info.theme_fg_color); - g_width = width - g_xoff - GRAPH_H_PADDING; + info.g_width = g_width; - draw_graph_background(cr, - g_xoff, g_yoff, g_width, g_height, - width, height, config, - &info); + draw_graph_background(cr, config, &info); /* Set the color for text drawing */ cairo_set_source_rgb(cr, - info.theme_fg_color.red, - info.theme_fg_color.green, - info.theme_fg_color.blue); + theme_fg_color.red, + theme_fg_color.green, + theme_fg_color.blue); /* draw graph begin time */ cairo_move_to(cr, g_xoff, height - GRAPH_V_PADDING); @@ -499,10 +580,7 @@ graph_update(struct psensor **sensors, cairo_show_text(cr, str_etime); free(str_etime); - draw_background_lines(cr, fgcolor, - g_width, g_height, - g_xoff, g_yoff, - mint, maxt); + draw_background_lines(cr, mint, maxt, config, &info); /* .. and finaly draws the temperature graphs */ if (bt && et) { @@ -531,14 +609,12 @@ graph_update(struct psensor **sensors, draw_sensor_smooth_curve(s, cr, min, max, bt, et, - g_width, g_height, - g_xoff, g_yoff); + &info); else draw_sensor_curve(s, cr, min, max, bt, et, - g_width, g_height, - g_xoff, g_yoff); + &info); sensor_cur++; } @@ -550,12 +626,13 @@ graph_update(struct psensor **sensors, } draw_left_region(cr, &info); + draw_right_region(cr, &info); /* draw min and max temp */ cairo_set_source_rgb(cr, - info.theme_fg_color.red, - info.theme_fg_color.green, - info.theme_fg_color.blue); + theme_fg_color.red, + theme_fg_color.green, + theme_fg_color.blue); cairo_move_to(cr, GRAPH_H_PADDING, te_max.height + GRAPH_V_PADDING); cairo_show_text(cr, strmax);