X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fgraph.c;h=e2bea20056d0fb75d2f96d7df0bf75c4b3a417cf;hb=ec06b97ed6370f1a6a489d8c6b9f3ad55e9ab018;hp=749544fc60608fbfd5aac8049e7a263213d62106;hpb=8a3d16ade26321374c684080d627cf12ba71e598;p=psensor.git diff --git a/src/graph.c b/src/graph.c index 749544f..e2bea20 100644 --- a/src/graph.c +++ b/src/graph.c @@ -24,37 +24,79 @@ #include #include +#include + #include #include #include /* horizontal padding */ -#define GRAPH_H_PADDING 4 +const int GRAPH_H_PADDING = 4; /* vertical padding */ -#define GRAPH_V_PADDING 4 +const int GRAPH_V_PADDING = 4; bool is_smooth_curves_enabled; -static time_t get_graph_end_time_s() +struct graph_info { + /* Horizontal position of the central area (curves) */ + int g_xoff; + /* 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; + /* Foreground color of the current desktop theme */ + GdkRGBA theme_fg_color; +}; + + +/* Return the end time of the graph i.e. the more recent measure. If + * no measure are available, return 0. + */ +static time_t get_graph_end_time_s(struct psensor **sensors) { - struct timeval tv; + time_t ret, t; + struct psensor *s; + struct measure *measures; + int i; - if (gettimeofday(&tv, NULL) == 0) - return tv.tv_sec; + ret = 0; + while (*sensors) { + s = *sensors; + measures = s->measures; - return 0; -} + for (i = s->values_max_length - 1; i >= 0; i--) { + if (measures[i].value != UNKNOWN_DBL_VALUE) { + t = measures[i].time.tv_sec; -static time_t get_graph_begin_time_s(struct config *cfg) -{ - int ct; + if (t > ret) + ret = t; + } + i--; + } - ct = get_graph_end_time_s(); + sensors++; + } - if (!ct) + return ret; +} + +static time_t get_graph_begin_time_s(struct config *cfg, time_t etime) +{ + if (!etime) return 0; - return ct - cfg->graph_monitoring_duration * 60; + return etime - cfg->graph_monitoring_duration * 60; } static double @@ -80,39 +122,41 @@ static char *time_to_str(time_t s) return str; } +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); + + cairo_rectangle(cr, 0, 0, info->g_xoff, 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, - GtkWidget *widget, - GtkWidget *window) + struct config *config, + struct graph_info *info) { - GtkStyleContext *style_ctx; struct color *bgcolor; - GdkRGBA rgba; bgcolor = config->graph_bgcolor; - style_ctx = gtk_widget_get_style_context(window); - gtk_style_context_get_background_color(style_ctx, - GTK_STATE_FLAG_NORMAL, - &rgba); - if (config->alpha_channel_enabled) cairo_set_source_rgba(cr, - rgba.red, - rgba.green, - rgba.blue, + info->theme_bg_color.red, + info->theme_bg_color.green, + info->theme_bg_color.blue, config->graph_bg_alpha); else cairo_set_source_rgb(cr, - rgba.red, - rgba.green, - rgba.blue); + info->theme_bg_color.red, + info->theme_bg_color.green, + info->theme_bg_color.blue); - cairo_rectangle(cr, 0, 0, width, height); + cairo_rectangle(cr, info->g_xoff, 0, info->g_width, info->height); cairo_fill(cr); + if (config->alpha_channel_enabled) cairo_set_source_rgba(cr, bgcolor->red, @@ -125,7 +169,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); } @@ -137,39 +185,44 @@ static double dashes[] = { static int ndash = sizeof(dashes) / sizeof(dashes[0]); 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); } @@ -187,10 +240,7 @@ 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; @@ -261,8 +311,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; @@ -288,10 +343,7 @@ 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; @@ -311,12 +363,10 @@ static void draw_sensor_curve(struct psensor *s, continue; vdt = t - bt; - if (vdt < 0) - continue; - 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); @@ -353,7 +403,6 @@ 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; @@ -366,7 +415,7 @@ graph_update(struct psensor **sensors, struct psensor **sensor_cur, **enabled_sensors; GtkAllocation galloc; GtkStyleContext *style_ctx; - GdkRGBA rgba; + struct graph_info info; if (!gtk_widget_is_drawable(w_graph)) return; @@ -386,12 +435,18 @@ graph_update(struct psensor **sensors, maxt, config->temperature_unit == CELSIUS); - str_btime = time_to_str(get_graph_begin_time_s(config)); - str_etime = time_to_str(get_graph_end_time_s()); + et = get_graph_end_time_s(enabled_sensors); + bt = get_graph_begin_time_s(config, et); + + str_btime = time_to_str(bt); + str_etime = time_to_str(et); 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); @@ -408,6 +463,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) @@ -415,23 +471,34 @@ 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; + + 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, - w_graph, - window); + draw_graph_background(cr, config, &info); - /** Set the color for text drawing */ - style_ctx = gtk_widget_get_style_context(window); - gtk_style_context_get_color(style_ctx, GTK_STATE_FLAG_NORMAL, &rgba); - cairo_set_source_rgb(cr, rgba.red, rgba.green, rgba.blue); + /* 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); /* draw graph begin time */ cairo_move_to(cr, g_xoff, height - GRAPH_V_PADDING); @@ -445,25 +512,9 @@ graph_update(struct psensor **sensors, cairo_show_text(cr, str_etime); free(str_etime); - /* draw min and max temp */ - cairo_move_to(cr, GRAPH_H_PADDING, te_max.height + GRAPH_V_PADDING); - cairo_show_text(cr, strmax); - free(strmax); - - cairo_move_to(cr, - GRAPH_H_PADDING, height - (te_min.height / 2) - g_yoff); - cairo_show_text(cr, strmin); - free(strmin); - - 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 */ - bt = get_graph_begin_time_s(config); - et = get_graph_end_time_s(); - if (bt && et) { sensor_cur = enabled_sensors; @@ -490,14 +541,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++; } @@ -508,6 +557,23 @@ graph_update(struct psensor **sensors, g_height / 2); } + draw_left_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); + + cairo_move_to(cr, GRAPH_H_PADDING, te_max.height + GRAPH_V_PADDING); + cairo_show_text(cr, strmax); + free(strmax); + + cairo_move_to(cr, + GRAPH_H_PADDING, height - (te_min.height / 2) - g_yoff); + cairo_show_text(cr, strmin); + free(strmin); + cr_pixmap = gdk_cairo_create(gtk_widget_get_window(w_graph)); if (cr_pixmap) { @@ -524,3 +590,15 @@ graph_update(struct psensor **sensors, cairo_surface_destroy(cst); cairo_destroy(cr); } + +int compute_values_max_length(struct config *c) +{ + int n, duration, interval; + + duration = c->graph_monitoring_duration * 60; + interval = c->sensor_update_interval; + + n = 3 + ceil((((double)duration) / interval) + 0.5) + 3; + + return n; +}