X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fgraph.c;h=7205e63f26ab0d3bac92b7c417880d539786ec0f;hb=0e52be5c9e4d3bfe732f90abe7ca3cbfa32ad59c;hp=51dd1c8be2ab27afaaebe2ad1fc79b6f54b2332a;hpb=276294af0c56ea5cd7d7b11349a893852245f348;p=psensor.git diff --git a/src/graph.c b/src/graph.c index 51dd1c8..7205e63 100644 --- a/src/graph.c +++ b/src/graph.c @@ -1,27 +1,31 @@ /* - Copyright (C) 2010-2011 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 published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301 USA -*/ - + * Copyright (C) 2010-2014 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 + * published by the Free Software Foundation; either version 2 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA + * 02110-1301 USA + */ #include +#include + #include + +#include #include #include "cfg.h" +#include #include "psensor.h" /* horizontal padding */ @@ -74,31 +78,57 @@ static char *time_to_str(time_t s) static void draw_graph_background(cairo_t *cr, - int width, int height, struct config *config) + int g_xoff, int g_yoff, + int g_width, int g_height, + int width, int height, struct config *config, + GtkWidget *widget, + GtkWidget *window) { - struct color *bgcolor = config->graph_bgcolor; + GtkStyleContext *style_ctx; + struct color *bgcolor; + GdkRGBA rgba; + + bgcolor = config->graph_bgcolor; - /* draw background */ + 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, + config->graph_bg_alpha); + else + cairo_set_source_rgb(cr, + rgba.red, + rgba.green, + rgba.blue); + + cairo_rectangle(cr, 0, 0, width, height); + cairo_fill(cr); if (config->alpha_channel_enabled) 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, 0, 0, width, height); + cairo_rectangle(cr, g_xoff, g_yoff, g_width, g_height); cairo_fill(cr); } /* setup dash style */ static double dashes[] = { 1.0, /* ink */ - 1.0, /* skip */ - 1.0, /* ink */ - 1.0 /* skip */ + 2.0, /* skip */ }; static int ndash = sizeof(dashes) / sizeof(dashes[0]); @@ -111,8 +141,8 @@ static void draw_background_lines(cairo_t *cr, int i; /* draw background lines */ - cairo_set_dash(cr, dashes, ndash, 0); cairo_set_line_width(cr, 1); + cairo_set_dash(cr, dashes, ndash, 0); cairo_set_source_rgb(cr, color->f_red, color->f_green, color->f_blue); @@ -137,7 +167,6 @@ static void draw_background_lines(cairo_t *cr, /* back to normal line style */ cairo_set_dash(cr, 0, 0, 0); - } static void draw_sensor_curve(struct psensor *s, @@ -151,26 +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_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; - if (v == UNKNOWN_VALUE || !t || (t - bt) < 0) + if (v == UNKNOWN_DBL_VALUE || !t) + continue; + + 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); @@ -185,41 +216,66 @@ static void draw_sensor_curve(struct psensor *s, cairo_stroke(cr); } - -void -graph_update(struct psensor **sensors, - GtkWidget *w_graph, struct config *config) +static void display_no_graphs_warning(cairo_t *cr, int x, int y) { - struct color *fgcolor = config->graph_fgcolor; - int et, bt; - double min_rpm = get_min_rpm(sensors); - double max_rpm = get_max_rpm(sensors); + char *msg; - double mint = get_min_temp(sensors); - char *strmin = psensor_value_to_string(SENSOR_TYPE_TEMP, mint); + msg = strdup(_("No graphs enabled")); - double maxt = get_max_temp(sensors); - char *strmax = psensor_value_to_string(SENSOR_TYPE_TEMP, maxt); + cairo_select_font_face(cr, + "sans-serif", + CAIRO_FONT_SLANT_NORMAL, + CAIRO_FONT_WEIGHT_NORMAL); + cairo_set_font_size(cr, 18.0); - int width, height, g_width, g_height; + cairo_move_to(cr, x, y); + cairo_show_text(cr, msg); - /* horizontal and vertical offset of the graph */ - int g_xoff, g_yoff; + free(msg); +} +void +graph_update(struct psensor **sensors, + GtkWidget *w_graph, + 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, no_graphs, min, max; cairo_surface_t *cst; cairo_t *cr, *cr_pixmap; - - char *str_btime = time_to_str(get_graph_begin_time_s(config)); - char *str_etime = time_to_str(get_graph_end_time_s()); - + 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 ; + enabled_sensors = psensor_list_filter_graph_enabled(sensors); + + min_rpm = get_min_rpm(enabled_sensors); + max_rpm = get_max_rpm(enabled_sensors); + + mint = get_min_temp(enabled_sensors); + strmin = psensor_value_to_str(SENSOR_TYPE_TEMP, + mint, + config->temperature_unit == CELSIUS); + + maxt = get_max_temp(enabled_sensors); + strmax = psensor_value_to_str(SENSOR_TYPE_TEMP, + 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()); + gtk_widget_get_allocation(w_graph, &galloc); width = galloc.width; height = galloc.height; @@ -227,8 +283,6 @@ graph_update(struct psensor **sensors, cst = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height); cr = cairo_create(cst); - draw_graph_background(cr, width, height, config); - cairo_select_font_face(cr, "sans-serif", CAIRO_FONT_SLANT_NORMAL, @@ -255,8 +309,16 @@ graph_update(struct psensor **sensors, g_width = width - g_xoff - GRAPH_H_PADDING; - cairo_set_source_rgb(cr, - fgcolor->f_red, fgcolor->f_green, fgcolor->f_blue); + draw_graph_background(cr, + g_xoff, g_yoff, g_width, g_height, + width, height, config, + w_graph, + window); + + /** 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); @@ -290,30 +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 { - 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)); @@ -327,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);