style

[psensor.git] / src / graph.c

diff --git a/src/graph.c b/src/graph.c
index f4349d3..bd67a9e 100644 (file)
--- a/src/graph.c
+++ b/src/graph.c
@@ -1,22 +1,21 @@
 /*
-    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-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
+ */
 #include <stdlib.h>
 #include <sys/time.h>
 #include <gtk/gtk.h>
@@ -158,6 +157,7 @@ static void draw_sensor_curve(struct psensor *s,
                             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);
 
        for (i = 0; i < s->values_max_length; i++) {
@@ -165,9 +165,9 @@ static void draw_sensor_curve(struct psensor *s,
                double v;
 
                t = s->measures[i].time.tv_sec;
-               v = s->measures[i].value;
+               v = s->measures[i].value.d_num;
 
-               if (v == UNKNOWN_VALUE || !t || (t - bt) < 0)
+               if (v == UNKNOWN_DBL_VALUE || !t || (t - bt) < 0)
                        continue;
 
                x = (t - bt) * g_width / (et - bt) + g_xoff;
@@ -188,35 +188,37 @@ static void draw_sensor_curve(struct psensor *s,
 
 void
 graph_update(struct psensor **sensors,
-            GtkWidget *w_graph, struct config *config)
+            GtkWidget *w_graph,
+            struct config *config)
 {
        struct color *fgcolor = config->graph_fgcolor;
-       int et, bt;
-       double min_rpm = get_min_rpm(sensors);
-       double max_rpm = get_max_rpm(sensors);
-
-       double mint = get_min_temp(sensors);
-       char *strmin = psensor_value_to_string(SENSOR_TYPE_TEMP, mint);
-
-       double maxt = get_max_temp(sensors);
-       char *strmax = psensor_value_to_string(SENSOR_TYPE_TEMP, maxt);
-
-       int width, height, g_width, g_height;
-
+       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;
-
        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;
        GtkAllocation galloc;
 
+       if (!gtk_widget_is_drawable(w_graph))
+               return ;
+
+       min_rpm = get_min_rpm(sensors);
+       max_rpm = get_max_rpm(sensors);
+
+       mint = get_min_temp(sensors);
+       strmin = psensor_value_to_string(SENSOR_TYPE_TEMP, mint);
+
+       maxt = get_max_temp(sensors);
+       strmax = psensor_value_to_string(SENSOR_TYPE_TEMP, maxt);
+
+       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;
@@ -297,6 +299,11 @@ graph_update(struct psensor **sensors,
                                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;