X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fgraph.c;h=862ac860b3ab7063d6dcc32292b0a06bbcf5c0db;hb=51450a36b7143fe230197dfa89b5fd072af7421c;hp=9f87eda76877947871b093410e75f25266a63dff;hpb=9d77e6ab0ca102b9d42072df4fd9d2378897a5ca;p=psensor.git

diff --git a/src/graph.c b/src/graph.c
index 9f87eda..862ac86 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -297,6 +297,7 @@ static void draw_sensor_smooth_curve(struct psensor *s,
 	int i, dt, vdt, j, k, found;
 	double x[4], y[4], v;
 	time_t t, t0, *stimes;
+	GdkRGBA *color;
 
 	if (!times)
 		times = g_hash_table_new_full(g_str_hash,
@@ -306,10 +307,13 @@ static void draw_sensor_smooth_curve(struct psensor *s,
 
 	stimes = g_hash_table_lookup(times, s->id);
 
+	color = config_get_sensor_color(s->id);
+
 	cairo_set_source_rgb(cr,
-			     s->color->red,
-			     s->color->green,
-			     s->color->blue);
+			     color->red,
+			     color->green,
+			     color->blue);
+	gdk_rgba_free(color);
 
 	/* search the index of the first measure used as a start point
 	 * of a Bezier curve. The start and end points of the Bezier
@@ -399,11 +403,14 @@ static void draw_sensor_curve(struct psensor *s,
 {
 	int first, i, t, dt, vdt;
 	double v, x, y;
+	GdkRGBA *color;
 
+	color = config_get_sensor_color(s->id);
 	cairo_set_source_rgb(cr,
-			     s->color->red,
-			     s->color->green,
-			     s->color->blue);
+			     color->red,
+			     color->green,
+			     color->blue);
+	gdk_rgba_free(color);
 
 	dt = et - bt;
 	first = 1;
@@ -459,7 +466,7 @@ graph_update(struct psensor **sensors,
 	double min_rpm, max_rpm, mint, maxt, min, max;
 	char *strmin, *strmax;
 	/* horizontal and vertical offset of the graph */
-	int g_xoff, g_yoff, no_graphs;
+	int g_xoff, g_yoff, no_graphs, use_celsius;
 	cairo_surface_t *cst;
 	cairo_t *cr, *cr_pixmap;
 	char *str_btime, *str_etime;
@@ -477,15 +484,16 @@ graph_update(struct psensor **sensors,
 	min_rpm = get_min_rpm(enabled_sensors);
 	max_rpm = get_max_rpm(enabled_sensors);
 
+	if (config_get_temperature_unit() == CELSIUS)
+		use_celsius = 1;
+	else
+		use_celsius = 0;
+
 	mint = get_min_temp(enabled_sensors);
-	strmin = psensor_value_to_str(SENSOR_TYPE_TEMP,
-				      mint,
-				      config->temperature_unit == CELSIUS);
+	strmin = psensor_value_to_str(SENSOR_TYPE_TEMP, mint, use_celsius);
 
 	maxt = get_max_temp(enabled_sensors);
-	strmax = psensor_value_to_str(SENSOR_TYPE_TEMP,
-				      maxt,
-				      config->temperature_unit == CELSIUS);
+	strmax = psensor_value_to_str(SENSOR_TYPE_TEMP, maxt, use_celsius);
 
 	et = get_graph_end_time_s(enabled_sensors);
 	bt = get_graph_begin_time_s(config, et);