X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fgraph.c;h=71e8396ebf05962446097934c86788bff5247fd7;hb=1410f23801330c83c83caf21353860ff2bc18399;hp=a3701bccd14ece978385b969c16c882ed0801699;hpb=b558a7525745bbf0e5ef5030de6418cfcb30fe3d;p=psensor.git diff --git a/src/graph.c b/src/graph.c index a3701bc..71e8396 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,25 +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); - - for (i = 0; i < s->values_max_length; i++) { - int x, y, t; - double v; + dt = et - bt; + first = 1; + for (i = 0; i < s->values_max_length; i++) { 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); @@ -204,24 +216,44 @@ 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; GtkAllocation galloc; + GtkStyleContext *style_ctx; + GdkRGBA rgba; if (!gtk_widget_is_drawable(w_graph)) return ; @@ -230,10 +262,15 @@ graph_update(struct psensor **sensors, max_rpm = get_max_rpm(sensors); mint = get_min_temp(sensors); - strmin = psensor_value_to_string(SENSOR_TYPE_TEMP, mint); + + strmin = psensor_value_to_str(SENSOR_TYPE_TEMP, + mint, + config->temperature_unit == CELCIUS); maxt = get_max_temp(sensors); - strmax = psensor_value_to_string(SENSOR_TYPE_TEMP, maxt); + 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()); @@ -274,10 +311,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); @@ -315,13 +355,12 @@ graph_update(struct psensor **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 (s->graph_enabled) { + no_graphs = 0; if (is_fan_type(s->type)) { min = min_rpm; max = max_rpm; @@ -344,6 +383,11 @@ graph_update(struct psensor **sensors, 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));