X-Git-Url: https://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fgraph.c;h=578ad7331697f5a1d5218572df84727affbeb810;hb=5f275b753e5b28de21690bd9bacb53262e59c58a;hp=f5d0d5a1be5f08a5bb8c75aed74559364d47fe48;hpb=8865a607fb59810cbb9ced7a120bed63ffa67589;p=psensor.git

diff --git a/src/graph.c b/src/graph.c
index f5d0d5a..578ad73 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010-2012 jeanfi@gmail.com
+ * 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
@@ -24,9 +24,9 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
-#include "cfg.h"
-#include "log.h"
-#include "psensor.h"
+#include <cfg.h>
+#include <plog.h>
+#include <psensor.h>
 
 /* horizontal padding */
 #define GRAPH_H_PADDING 4
@@ -111,15 +111,15 @@ draw_graph_background(cairo_t *cr,
 	cairo_fill(cr);
 	if (config->alpha_channel_enabled)
 		cairo_set_source_rgba(cr,
-				      bgcolor->f_red,
-				      bgcolor->f_green,
-				      bgcolor->f_blue,
+				      bgcolor->red,
+				      bgcolor->green,
+				      bgcolor->blue,
 				      config->graph_bg_alpha);
 	else
 		cairo_set_source_rgb(cr,
-				     bgcolor->f_red,
-				     bgcolor->f_green,
-				     bgcolor->f_blue);
+				     bgcolor->red,
+				     bgcolor->green,
+				     bgcolor->blue);
 
 	cairo_rectangle(cr, g_xoff, g_yoff, g_width, g_height);
 	cairo_fill(cr);
@@ -144,7 +144,7 @@ static void draw_background_lines(cairo_t *cr,
 	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);
+			     color->red, color->green, color->blue);
 
 	/* vertical lines representing time steps */
 	for (i = 0; i <= 5; i++) {
@@ -184,9 +184,9 @@ static void draw_sensor_curve(struct psensor *s,
 	double v;
 
 	cairo_set_source_rgb(cr,
-			     s->color->f_red,
-			     s->color->f_green,
-			     s->color->f_blue);
+			     s->color->red,
+			     s->color->green,
+			     s->color->blue);
 
 	dt = et - bt;
 	first = 1;
@@ -250,7 +250,7 @@ graph_update(struct psensor **sensors,
 	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;
@@ -258,19 +258,20 @@ graph_update(struct psensor **sensors,
 	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);
+	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 == CELCIUS);
+				      config->temperature_unit == CELSIUS);
 
-	maxt = get_max_temp(sensors);
+	maxt = get_max_temp(enabled_sensors);
 	strmax = psensor_value_to_str(SENSOR_TYPE_TEMP,
 				      maxt,
-				      config->temperature_unit == CELCIUS);
+				      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());
@@ -351,7 +352,7 @@ 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);
@@ -359,28 +360,25 @@ graph_update(struct psensor **sensors,
 		while (*sensor_cur) {
 			struct psensor *s = *sensor_cur;
 
-			if (s->enabled) {
-				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
-						(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 (s->type & SENSOR_TYPE_RPM) {
+				min = min_rpm;
+				max = max_rpm;
+			} else if (s->type & SENSOR_TYPE_PERCENT) {
+				min = 0;
+				max = get_max_value(enabled_sensors,
+						    SENSOR_TYPE_PERCENT);
+			} else {
+				min = mint;
+				max = maxt;
 			}
 
+			draw_sensor_curve(s, cr,
+					  min, max,
+					  bt, et,
+					  g_width, g_height,
+					  g_xoff, g_yoff);
+
 			sensor_cur++;
 		}
 
@@ -393,7 +391,6 @@ graph_update(struct psensor **sensors,
 	cr_pixmap = gdk_cairo_create(gtk_widget_get_window(w_graph));
 
 	if (cr_pixmap) {
-
 		if (config->alpha_channel_enabled)
 			cairo_set_operator(cr_pixmap, CAIRO_OPERATOR_SOURCE);
 
@@ -401,6 +398,8 @@ graph_update(struct psensor **sensors,
 		cairo_paint(cr_pixmap);
 	}
 
+	free(enabled_sensors);
+
 	cairo_destroy(cr_pixmap);
 	cairo_surface_destroy(cst);
 	cairo_destroy(cr);