X-Git-Url: http://git.wpitchoune.net/gitweb/?a=blobdiff_plain;f=src%2Fgraph.c;h=0ac3143b5372972d4baeb19fcd5fb0124f60d24e;hb=0acbbfd3bee0ebad1faae5b8314aea10a9cc123e;hp=e2bea20056d0fb75d2f96d7df0bf75c4b3a417cf;hpb=ec06b97ed6370f1a6a489d8c6b9f3ad55e9ab018;p=psensor.git

diff --git a/src/graph.c b/src/graph.c
index e2bea20..0ac3143 100644
--- a/src/graph.c
+++ b/src/graph.c
@@ -27,13 +27,14 @@
 #include <math.h>
 
 #include <cfg.h>
+#include <graph.h>
 #include <plog.h>
 #include <psensor.h>
 
 /* horizontal padding */
-const int GRAPH_H_PADDING = 4;
+static const int GRAPH_H_PADDING = 4;
 /* vertical padding */
-const int GRAPH_V_PADDING = 4;
+static const int GRAPH_V_PADDING = 4;
 
 bool is_smooth_curves_enabled;
 
@@ -59,28 +60,63 @@ struct graph_info {
 	GdkRGBA theme_fg_color;
 };
 
+static struct psensor **list_filter_graph_enabled(struct psensor **sensors)
+{
+	int n, i;
+	struct psensor **result, **cur, *s;
+
+	if (!sensors)
+		return NULL;
+
+	n = psensor_list_size(sensors);
+	result = malloc((n+1) * sizeof(struct psensor *));
+
+	for (cur = sensors, i = 0; *cur; cur++) {
+		s = *cur;
+
+		if (config_is_sensor_graph_enabled(s->id))
+			result[i++] = s;
+	}
+
+	result[i] = NULL;
+
+	return result;
+}
 
 /* Return the end time of the graph i.e. the more recent measure.  If
  * no measure are available, return 0.
+ * If Bezier curves are used return the measure n-3 to avoid to
+ * display a part of the curve outside the graph area.
  */
 static time_t get_graph_end_time_s(struct psensor **sensors)
 {
 	time_t ret, t;
 	struct psensor *s;
 	struct measure *measures;
-	int i;
+	int i, n;
 
 	ret = 0;
 	while (*sensors) {
 		s = *sensors;
 		measures = s->measures;
 
+		if (is_smooth_curves_enabled)
+			n = 2;
+		else
+			n = 0;
+
 		for (i = s->values_max_length - 1; i >= 0; i--) {
 			if (measures[i].value != UNKNOWN_DBL_VALUE) {
-				t = measures[i].time.tv_sec;
+				if (!n) {
+					t = measures[i].time.tv_sec;
 
-				if (t > ret)
-					ret = t;
+					if (t > ret) {
+						ret = t;
+						break;
+					}
+				} else {
+					n--;
+				}
 			}
 			i--;
 		}
@@ -133,6 +169,22 @@ static void draw_left_region(cairo_t *cr, struct graph_info *info)
 	cairo_fill(cr);
 }
 
+static void draw_right_region(cairo_t *cr, struct graph_info *info)
+{
+	cairo_set_source_rgb(cr,
+			     info->theme_bg_color.red,
+			     info->theme_bg_color.green,
+			     info->theme_bg_color.blue);
+
+
+	cairo_rectangle(cr,
+			info->g_xoff + info->g_width,
+			0,
+			info->g_xoff + info->g_width + GRAPH_H_PADDING,
+			info->height);
+	cairo_fill(cr);
+}
+
 static void
 draw_graph_background(cairo_t *cr,
 		      struct config *config,
@@ -224,7 +276,7 @@ static void draw_background_lines(cairo_t *cr,
 	cairo_stroke(cr);
 
 	/* back to normal line style */
-	cairo_set_dash(cr, 0, 0, 0);
+	cairo_set_dash(cr, NULL, 0, 0);
 }
 
 /* Keys: sensor identifier.
@@ -245,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,
@@ -254,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
@@ -347,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;
@@ -420,7 +479,7 @@ graph_update(struct psensor **sensors,
 	if (!gtk_widget_is_drawable(w_graph))
 		return;
 
-	enabled_sensors = psensor_list_filter_graph_enabled(sensors);
+	enabled_sensors = list_filter_graph_enabled(sensors);
 
 	min_rpm = get_min_rpm(enabled_sensors);
 	max_rpm = get_max_rpm(enabled_sensors);
@@ -488,7 +547,6 @@ graph_update(struct psensor **sensors,
 				    GTK_STATE_FLAG_NORMAL,
 				    &info.theme_fg_color);
 
-
 	g_width = width - g_xoff - GRAPH_H_PADDING;
 	info.g_width = g_width;
 
@@ -558,6 +616,7 @@ graph_update(struct psensor **sensors,
 	}
 
 	draw_left_region(cr, &info);
+	draw_right_region(cr, &info);
 
 	/* draw min and max temp */
 	cairo_set_source_rgb(cr,