X-Git-Url: http://wpitchoune.net/gitweb/?p=psensor-pkg-debian.git;a=blobdiff_plain;f=src%2Fgraph.c;h=f12a155fbdf7a714d51ee2388c302b5458af0c0f;hp=f40e442c08b8aea72d7d1275ef4a2c9d2b82bd5d;hb=ee0b7212d29624b6321a0eda9c7ba1e17817ba25;hpb=f055e7507526592d3a74c652f5f053701614c9c0 diff --git a/src/graph.c b/src/graph.c index f40e442..f12a155 100644 --- a/src/graph.c +++ b/src/graph.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010-2012 jeanfi@gmail.com + * Copyright (C) 2010-2013 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 @@ -17,10 +17,15 @@ * 02110-1301 USA */ #include +#include + #include + +#include #include #include "cfg.h" +#include "log.h" #include "psensor.h" /* horizontal padding */ @@ -76,27 +81,31 @@ 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 *widget, + GtkWidget *window) { - GtkStyle *style; - struct color *bgcolor = config->graph_bgcolor; - GdkColor *bg; + GtkStyleContext *style_ctx; + struct color *bgcolor; + GdkRGBA rgba; - style = gtk_widget_get_style(widget); + bgcolor = config->graph_bgcolor; - bg = &style->bg[GTK_STATE_NORMAL]; + 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, - ((double)bg->red) / 65535, - ((double)bg->green) / 65535, - ((double)bg->blue) / 65535, + rgba.red, + rgba.green, + rgba.blue, config->graph_bg_alpha); else cairo_set_source_rgb(cr, - ((double)bg->red) / 65535, - ((double)bg->green) / 65535, - ((double)bg->blue) / 65535); + rgba.red, + rgba.green, + rgba.blue); cairo_rectangle(cr, 0, 0, width, height); cairo_fill(cr); @@ -104,13 +113,13 @@ draw_graph_background(cairo_t *cr, cairo_set_source_rgba(cr, bgcolor->f_red, bgcolor->f_green, - bgcolor->f_blue, config->graph_bg_alpha); + bgcolor->f_blue, + config->graph_bg_alpha); else cairo_set_source_rgb(cr, bgcolor->f_red, - bgcolor->f_green, bgcolor->f_blue); - - + bgcolor->f_green, + bgcolor->f_blue); cairo_rectangle(cr, g_xoff, g_yoff, g_width, g_height); cairo_fill(cr); @@ -171,27 +180,28 @@ static void draw_sensor_curve(struct psensor *s, int g_xoff, int g_yoff) { - int first = 1; - int i; + int first, i, x, y, t, dt, vdt; + double v; cairo_set_source_rgb(cr, s->color->f_red, s->color->f_green, s->color->f_blue); - cairo_set_line_join(cr, CAIRO_LINE_JOIN_ROUND); - cairo_set_line_width(cr, 1); + dt = et - bt; + first = 1; for (i = 0; i < s->values_max_length; i++) { - int x, y, t; - double v; - t = s->measures[i].time.tv_sec; - v = s->measures[i].value.d_num; + v = s->measures[i].value; + + if (v == UNKNOWN_DBL_VALUE || !t) + continue; - if (v == UNKNOWN_DBL_VALUE || !t || (t - bt) < 0) + vdt = t - bt; + if (vdt < 0) continue; - x = (t - bt) * g_width / (et - bt) + g_xoff; + x = vdt * g_width / dt + g_xoff; y = compute_y(v, min, max, g_height, g_yoff); @@ -206,36 +216,62 @@ static void draw_sensor_curve(struct psensor *s, cairo_stroke(cr); } +static void display_no_graphs_warning(cairo_t *cr, int x, int y) +{ + char *msg; + + msg = strdup(_("No graphs enabled")); + + cairo_select_font_face(cr, + "sans-serif", + CAIRO_FONT_SLANT_NORMAL, + CAIRO_FONT_WEIGHT_NORMAL); + cairo_set_font_size(cr, 18.0); + + cairo_move_to(cr, x, y); + cairo_show_text(cr, msg); + + free(msg); +} void graph_update(struct psensor **sensors, GtkWidget *w_graph, - struct config *config) + 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; char *strmin, *strmax; /* horizontal and vertical offset of the graph */ - int g_xoff, g_yoff; + int g_xoff, g_yoff, no_graphs, min, max; 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; + struct psensor **sensor_cur, **enabled_sensors; GtkAllocation galloc; + GtkStyleContext *style_ctx; + GdkRGBA rgba; if (!gtk_widget_is_drawable(w_graph)) return ; - min_rpm = get_min_rpm(sensors); - max_rpm = get_max_rpm(sensors); + enabled_sensors = psensor_list_filter_graph_enabled(sensors); - mint = get_min_temp(sensors); - strmin = psensor_value_to_string(SENSOR_TYPE_TEMP, mint); + min_rpm = get_min_rpm(enabled_sensors); + max_rpm = get_max_rpm(enabled_sensors); - maxt = get_max_temp(sensors); - strmax = psensor_value_to_string(SENSOR_TYPE_TEMP, maxt); + mint = get_min_temp(enabled_sensors); + strmin = psensor_value_to_str(SENSOR_TYPE_TEMP, + mint, + config->temperature_unit == CELCIUS); + + maxt = get_max_temp(enabled_sensors); + strmax = psensor_value_to_str(SENSOR_TYPE_TEMP, + maxt, + config->temperature_unit == CELCIUS); str_btime = time_to_str(get_graph_begin_time_s(config)); str_etime = time_to_str(get_graph_end_time_s()); @@ -276,10 +312,13 @@ graph_update(struct psensor **sensors, draw_graph_background(cr, g_xoff, g_yoff, g_width, g_height, width, height, config, - w_graph); + w_graph, + window); - cairo_set_source_rgb(cr, - fgcolor->f_red, fgcolor->f_green, fgcolor->f_blue); + /** 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); /* draw graph begin time */ cairo_move_to(cr, g_xoff, height - GRAPH_V_PADDING); @@ -313,35 +352,40 @@ graph_update(struct psensor **sensors, et = get_graph_end_time_s(); if (bt && et) { - sensor_cur = sensors; + sensor_cur = enabled_sensors; + + cairo_set_line_join(cr, CAIRO_LINE_JOIN_ROUND); + cairo_set_line_width(cr, 1); + no_graphs = 1; while (*sensor_cur) { struct psensor *s = *sensor_cur; - if (s->enabled) { - double min, max; - - if (is_fan_type(s->type)) { - min = min_rpm; - max = max_rpm; - } else if (s->type & SENSOR_TYPE_CPU_USAGE) { - min = 0; - max = get_max_value - (sensors, - SENSOR_TYPE_CPU_USAGE); - } else { - min = mint; - max = maxt; - } - - draw_sensor_curve(s, cr, - min, max, - bt, et, - g_width, g_height, - g_xoff, g_yoff); + no_graphs = 0; + if (is_fan_type(s->type)) { + min = min_rpm; + max = max_rpm; + } else if (s->type & SENSOR_TYPE_CPU_USAGE) { + min = 0; + max = get_max_value(enabled_sensors, + SENSOR_TYPE_CPU_USAGE); + } else { + min = mint; + max = maxt; } + draw_sensor_curve(s, cr, + min, max, + bt, et, + g_width, g_height, + g_xoff, g_yoff); + sensor_cur++; } + + if (no_graphs) + display_no_graphs_warning(cr, + g_xoff + 12, + g_height / 2); } cr_pixmap = gdk_cairo_create(gtk_widget_get_window(w_graph)); @@ -355,6 +399,8 @@ graph_update(struct psensor **sensors, cairo_paint(cr_pixmap); } + free(enabled_sensors); + cairo_destroy(cr_pixmap); cairo_surface_destroy(cst); cairo_destroy(cr);