X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=graph.c;h=9eae72722542cf7e4d477db49319562c281aa259;hp=1cd2caab0724ea4a59ed4644a47ba9c06a9352c1;hb=c9e8d6e3c5b5f87e17a1f4ee740f88b5b3818831;hpb=f3e8440f75f98ced28cdd19ba785718e734cf7c5

diff --git a/graph.c b/graph.c
index 1cd2caab..9eae7272 100644
--- a/graph.c
+++ b/graph.c
@@ -29,6 +29,7 @@
 #include <gtk/gtk.h>
 
 #include "tickmarks.h"
+#include "graph.h"
 
 struct xyvalue {
 	double x, y;
@@ -54,19 +55,33 @@ struct graph {
 	char *xtitle;
 	char *ytitle;
 	unsigned int xdim, ydim;
+	double xoffset, yoffset;
 	struct graph_label *labels;
 	struct graph_label *tail;
 	int per_label_limit;
 	const char *font;
+	graph_axis_unit_change_callback x_axis_unit_change_callback;
+	graph_axis_unit_change_callback y_axis_unit_change_callback;
 };
 
+void graph_set_size(struct graph *g, unsigned int xdim, unsigned int ydim)
+{
+	g->xdim = xdim;
+	g->ydim = ydim;
+}
+
+void graph_set_position(struct graph *g, double xoffset, double yoffset)
+{
+	g->xoffset = xoffset;
+	g->yoffset = yoffset;
+}
+
 struct graph *graph_new(unsigned int xdim, unsigned int ydim, const char *font)
 {
 	struct graph *g;
 
 	g = calloc(1, sizeof(*g));
-	g->xdim = xdim;
-	g->ydim = ydim;
+	graph_set_size(g, xdim, ydim);
 	g->per_label_limit = -1;
 	g->font = font;
 	if (!g->font)
@@ -74,6 +89,16 @@ struct graph *graph_new(unsigned int xdim, unsigned int ydim, const char *font)
 	return g;
 }
 
+void graph_x_axis_unit_change_notify(struct graph *g, graph_axis_unit_change_callback f)
+{
+	g->x_axis_unit_change_callback = f;
+}
+
+void graph_y_axis_unit_change_notify(struct graph *g, graph_axis_unit_change_callback f)
+{
+	g->y_axis_unit_change_callback = f;
+}
+
 static int count_labels(struct graph_label *labels)
 {
 	int count = 0;
@@ -186,22 +211,62 @@ static void draw_bars(struct graph *bg, cairo_t *cr, struct graph_label *lb,
 	}
 }
 
-static void draw_centered_text(struct graph *g, cairo_t *cr, double x, double y,
-			       double fontsize, const char *text)
+static void draw_aligned_text(struct graph *g, cairo_t *cr, double x, double y,
+			       double fontsize, const char *text, int alignment)
 {
+#define CENTERED 0
+#define LEFT_JUSTIFIED 1
+#define RIGHT_JUSTIFIED 2
+
+	double factor, direction;
 	cairo_text_extents_t extents;
 
+	switch(alignment) {
+		case CENTERED:
+			direction = -1.0;
+			factor = 0.5;
+			break;
+		case RIGHT_JUSTIFIED:
+			direction = -1.0;
+			factor = 1.0;
+			break;
+		case LEFT_JUSTIFIED:
+		default:
+			direction = 1.0;
+			factor = 1.0;
+			break;
+	}
 	cairo_select_font_face (cr, g->font, CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
 
 	cairo_set_font_size(cr, fontsize);
 	cairo_text_extents(cr, text, &extents);
-	x = x - (extents.width / 2 + extents.x_bearing);
+	x = x + direction * (factor * extents.width  + extents.x_bearing);
 	y = y - (extents.height / 2 + extents.y_bearing);
 
 	cairo_move_to(cr, x, y);
 	cairo_show_text(cr, text);
 }
 
+static inline void draw_centered_text(struct graph *g, cairo_t *cr, double x, double y,
+			       double fontsize, const char *text)
+{
+	draw_aligned_text(g, cr, x, y, fontsize, text, CENTERED);
+}
+
+static inline void draw_right_justified_text(struct graph *g, cairo_t *cr,
+				double x, double y,
+				double fontsize, const char *text)
+{
+	draw_aligned_text(g, cr, x, y, fontsize, text, RIGHT_JUSTIFIED);
+}
+
+static inline void draw_left_justified_text(struct graph *g, cairo_t *cr,
+				double x, double y,
+				double fontsize, const char *text)
+{
+	draw_aligned_text(g, cr, x, y, fontsize, text, LEFT_JUSTIFIED);
+}
+
 static void draw_vertical_centered_text(struct graph *g, cairo_t *cr, double x,
 					double y, double fontsize,
 					const char *text)
@@ -233,17 +298,10 @@ static void graph_draw_common(struct graph *g, cairo_t *cr,
         cairo_set_source_rgb(cr, 0, 0, 0);
         cairo_set_line_width (cr, 0.8);
 
-        cairo_move_to(cr, 0, 0);
-        cairo_line_to(cr, 0, g->ydim);
-        cairo_line_to(cr, g->xdim, g->ydim);
-        cairo_line_to(cr, g->xdim, 0);
-        cairo_line_to(cr, 0, 0);
-
-	/* for now just set margins at 10% of width.  This is not very good. */
-	*x1 = g->xdim / 10.0;	
-	*x2 = 9.0 * *x1;
-	*y1 = g->ydim / 10.0;	
-	*y2 = 9.0 * *y1;
+	*x1 = 0.15 * g->xdim;	
+	*x2 = 0.95 * g->xdim;
+	*y1 = 0.10 * g->ydim;	
+	*y2 = 0.90 * g->ydim;
 
 	cairo_move_to(cr, *x1, *y1);
 	cairo_line_to(cr, *x1, *y2);
@@ -264,10 +322,13 @@ static void graph_draw_x_ticks(struct graph *g, cairo_t *cr,
 {
 	struct tickmark *tm;
 	double tx;
-	int i;
+	int i, power_of_ten;
 	static double dash[] = { 1.0, 2.0 };
 
-	nticks = calc_tickmarks(minx, maxx, nticks, &tm);
+	nticks = calc_tickmarks(minx, maxx, nticks, &tm, &power_of_ten,
+		g->x_axis_unit_change_callback == NULL);
+	if (g->x_axis_unit_change_callback)
+		g->x_axis_unit_change_callback(g, power_of_ten);
 
 	for (i = 0; i < nticks; i++) {
 		tx = (((tm[i].value) - minx) / (maxx - minx)) * (x2 - x1) + x1;
@@ -302,10 +363,13 @@ static void graph_draw_y_ticks(struct graph *g, cairo_t *cr,
 {
 	struct tickmark *tm;
 	double ty;
-	int i;
+	int i, power_of_ten;
 	static double dash[] = { 2.0, 2.0 };
 
-	nticks = calc_tickmarks(miny, maxy, nticks, &tm);
+	nticks = calc_tickmarks(miny, maxy, nticks, &tm, &power_of_ten,
+		g->y_axis_unit_change_callback == NULL);
+	if (g->y_axis_unit_change_callback)
+		g->y_axis_unit_change_callback(g, power_of_ten);
 
 	for (i = 0; i < nticks; i++) {
 		ty = y2 - (((tm[i].value) - miny) / (maxy - miny)) * (y2 - y1);
@@ -326,7 +390,7 @@ static void graph_draw_y_ticks(struct graph *g, cairo_t *cr,
 		cairo_restore(cr);
 
 		/* draw tickmark label */
-		draw_centered_text(g, cr, x1 - (x2 - x1) * 0.04, ty, 12.0, tm[i].string);
+		draw_right_justified_text(g, cr, x1 - (x2 - x1) * 0.025, ty, 12.0, tm[i].string);
 		cairo_stroke(cr);
 	}
 }
@@ -340,6 +404,7 @@ void bar_graph_draw(struct graph *bg, cairo_t *cr)
 	struct graph_label *lb;
 
 	cairo_save(cr);
+	cairo_translate(cr, bg->xoffset, bg->yoffset);
 	graph_draw_common(bg, cr, &x1, &y1, &x2, &y2);
 
 	nlabels = count_labels(bg->labels);
@@ -392,10 +457,15 @@ static double find_xy_value(struct graph *g, xy_value_extractor getvalue, double
 	double tmp, answer = 0.0;
 	struct graph_label *i;
 	struct graph_value *j;
+	int first = 1;
 
 	for (i = g->labels; i; i = i->next)
 		for (j = i->values; j; j = j->next) {
 			tmp = getvalue(j);
+			if (first) {
+				first = 0;
+				answer = tmp;
+			}
 			answer = cmp(tmp, answer);	
 		}
 	return answer;
@@ -408,9 +478,10 @@ void line_graph_draw(struct graph *g, cairo_t *cr)
 	double tx, ty;
 	struct graph_label *i;
 	struct graph_value *j;
-	int first = 1;
+	int good_data = 1, first = 1;
 
 	cairo_save(cr);
+	cairo_translate(cr, g->xoffset, g->yoffset);
 	graph_draw_common(g, cr, &x1, &y1, &x2, &y2);
 
 	minx = find_xy_value(g, getx, mindouble);
@@ -419,18 +490,24 @@ void line_graph_draw(struct graph *g, cairo_t *cr)
 	maxy = find_xy_value(g, gety, maxdouble);
 
 	if (fabs(maxx - minx) < 1e-20 || fabs(maxy - miny) < 1e-20) {
-		draw_centered_text(g, cr,
-			x1 + (x2 - x1) / 2.0,
-			y1 + (y2 - y1) / 2.0, 20.0, "No good Data");
-		return;
+		good_data = 0;
+		minx = 0.0;
+		miny = 0.0;
+		maxx = 10.0;
+		maxy = 100.0;
 	}
 
 	graph_draw_x_ticks(g, cr, x1, y1, x2, y2, minx, maxx, 10);
 	graph_draw_y_ticks(g, cr, x1, y1, x2, y2, miny, maxy, 10);
 
+	if (!good_data)
+		goto skip_data;
+
 	cairo_set_line_width(cr, 1.5);
 	for (i = g->labels; i; i = i->next) {
 		first = 1;
+		if (i->r < 0) /* invisible data */
+			continue;
 		cairo_set_source_rgb(cr, i->r, i->g, i->b);
 		for (j = i->values; j; j = j->next) {
 			tx = ((getx(j) - minx) / (maxx - minx)) * (x2 - x1) + x1;
@@ -444,7 +521,10 @@ void line_graph_draw(struct graph *g, cairo_t *cr)
 		}
 		cairo_stroke(cr);
 	}
+
+skip_data:
 	cairo_restore(cr);
+
 }
 
 static void gfree(void *f)
@@ -520,11 +600,24 @@ static void graph_label_add_value(struct graph_label *i, void *value)
 
 	if (i->parent->per_label_limit != -1 &&
 		i->value_count > i->parent->per_label_limit) {
-		x = i->values;
-		i->values = i->values->next;
-		free(x->value);
-		free(x);
-		i->value_count--;
+		int to_drop = 1;
+
+		/*
+		 * If the limit was dynamically reduced, making us more
+		 * than 1 entry ahead after adding this one, drop two
+		 * entries. This will make us (eventually) reach the
+		 * specified limit.
+		 */
+		if (i->value_count - i->parent->per_label_limit >= 2)
+			to_drop = 2;
+
+		while (to_drop--) {
+			x = i->values;
+			i->values = i->values->next;
+			free(x->value);
+			free(x);
+			i->value_count--;
+		}
 	}
 }
 
@@ -588,16 +681,22 @@ void graph_set_color(struct graph *gr, const char *label,
 	struct graph_label *i;
 	double r, g, b;
 
-	r = fabs(red);
-	g = fabs(green);
-	b = fabs(blue);
-
-	if (r > 1.0)
-		r = 1.0;
-	if (g > 1.0)
-		g = 1.0;
-	if (b > 1.0)
-		b =1.0;
+	if (red < 0.0) { /* invisible color */
+		r = -1.0;
+		g = -1.0;
+		b = -1.0;
+	} else {
+		r = fabs(red);
+		g = fabs(green);
+		b = fabs(blue);
+
+		if (r > 1.0)
+			r = 1.0;
+		if (g > 1.0)
+			g = 1.0;
+		if (b > 1.0)
+			b =1.0;
+	}
 
 	for (i = gr->labels; i; i = i->next)
 		if (strcmp(i->label, label) == 0) {