gfio: right justify y-axis labels

[fio.git] / graph.c

diff --git a/graph.c b/graph.c
index d97da59568b268acf7a1b88e45d374d50a5f51f2..4a3a9938b008770594536f4dd9af191ba50a2e46 100644 (file)
--- a/graph.c
+++ b/graph.c
@@ -186,22 +186,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,12 +273,6 @@ 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;
@@ -326,7 +360,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);
        }
 }
@@ -392,10 +426,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,7 +447,7 @@ 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);
        graph_draw_common(g, cr, &x1, &y1, &x2, &y2);
@@ -419,15 +458,19 @@ 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;
@@ -446,7 +489,10 @@ void line_graph_draw(struct graph *g, cairo_t *cr)
                }
                cairo_stroke(cr);
        }
+
+skip_data:
        cairo_restore(cr);
+
 }
 
 static void gfree(void *f)