genfio: Splitting gen_template in 2 parts

[fio.git] / graph.c

diff --git a/graph.c b/graph.c
index 040e344ffcf4072f810c19315e98cf96b440655e..5c865dcf2964fc4c809b1011d45fdbe45c9f3f65 100644 (file)
--- a/graph.c
+++ b/graph.c
@@ -180,7 +180,7 @@ static double maxdouble(double a, double b)
 static double find_double_values(struct graph_label *l, double_comparator cmp)
 {
        struct flist_head *entry;
-       double answer, tmp;
+       double answer = 0.0, tmp;
        int first = 1;
 
        if (flist_empty(&l->value_list))
@@ -343,15 +343,15 @@ static void graph_draw_x_ticks(struct graph *g, cairo_t *cr,
                        continue;
 
                /* Draw tick mark */
-               cairo_set_line_width(cr, 0.8);
+               cairo_set_line_width(cr, 1.0);
                cairo_move_to(cr, tx, y2);
                cairo_line_to(cr, tx, y2 + (y2 - y1) * 0.03);
                cairo_stroke(cr);
 
                /* draw grid lines */
                cairo_save(cr);
-               cairo_set_dash(cr, dash, 2, 2.0);
-               cairo_set_line_width(cr, 0.5);
+               cairo_set_dash(cr, dash, 2, 0.66);
+               cairo_set_line_width(cr, 0.33);
                cairo_move_to(cr, tx, y1);
                cairo_line_to(cr, tx, y2);
                cairo_stroke(cr);
@@ -373,7 +373,7 @@ static double graph_draw_y_ticks(struct graph *g, cairo_t *cr,
        struct tickmark *tm;
        double ty;
        int i, power_of_ten;
-       static double dash[] = { 2.0, 2.0 };
+       static double dash[] = { 1.0, 2.0 };
 
        nticks = calc_tickmarks(miny, maxy, nticks, &tm, &power_of_ten,
                g->y_axis_unit_change_callback == NULL, g->base_offset);
@@ -412,8 +412,8 @@ static double graph_draw_y_ticks(struct graph *g, cairo_t *cr,
 
                /* draw grid lines */
                cairo_save(cr);
-               cairo_set_dash(cr, dash, 2, 2.0);
-               cairo_set_line_width(cr, 0.5);
+               cairo_set_dash(cr, dash, 2, 0.66);
+               cairo_set_line_width(cr, 0.33);
                cairo_move_to(cr, x1, ty);
                cairo_line_to(cr, x2, ty);
                cairo_stroke(cr);
@@ -586,6 +586,8 @@ void line_graph_draw(struct graph *g, cairo_t *cr)
                goto skip_data;
 
        cairo_set_line_width(cr, 1.5);
+       cairo_set_line_join(cr, CAIRO_LINE_JOIN_ROUND);
+
        flist_for_each(lentry, &g->label_list) {
                i = flist_entry(lentry, struct graph_label, list);
                first = 1;
@@ -600,9 +602,8 @@ void line_graph_draw(struct graph *g, cairo_t *cr)
                        if (first) {
                                cairo_move_to(cr, tx, ty);
                                first = 0;
-                       } else {
+                       } else
                                cairo_line_to(cr, tx, ty);
-                       }
                }
                cairo_stroke(cr);
        }
@@ -852,6 +853,17 @@ static void graph_free_labels(struct graph *g)
        }
 }
 
+void graph_clear_values(struct graph *g)
+{
+       struct flist_head *node;
+       struct graph_label *i;
+
+       flist_for_each(node, &g->label_list) {
+               i = flist_entry(node, struct graph_label, list);
+               graph_free_values(i);
+       }
+}
+
 void graph_set_color(struct graph *gr, graph_label_t label, double red,
                     double green, double blue)
 {