const double box_right = box_centre + box_width / 2.0;
- double box_bottom ;
- double box_top ;
- double bottom_whisker ;
- double top_whisker ;
+ double box_bottom;
+ double box_top;
+ double bottom_whisker;
+ double top_whisker;
box_whisker_whiskers (bw, whisker);
box_whisker_hinges (bw, hinge);
- box_bottom = geom->axis[SCALE_ORDINATE].data_min + (hinge[0] - geom->axis[SCALE_ORDINATE].min ) * geom->axis[SCALE_ORDINATE].scale;
+ box_bottom = geom->axis[SCALE_ORDINATE].data_min + (hinge[0] - geom->axis[SCALE_ORDINATE].min) * geom->axis[SCALE_ORDINATE].scale;
- box_top = geom->axis[SCALE_ORDINATE].data_min + (hinge[2] - geom->axis[SCALE_ORDINATE].min ) * geom->axis[SCALE_ORDINATE].scale;
+ box_top = geom->axis[SCALE_ORDINATE].data_min + (hinge[2] - geom->axis[SCALE_ORDINATE].min) * geom->axis[SCALE_ORDINATE].scale;
bottom_whisker = geom->axis[SCALE_ORDINATE].data_min + (whisker[0] - geom->axis[SCALE_ORDINATE].min) *
geom->axis[SCALE_ORDINATE].scale;
cairo_stroke (cr);
/* Draw top whisker */
- cairo_move_to (cr, box_left, top_whisker);
- cairo_line_to (cr, box_right, top_whisker);
- cairo_stroke (cr);
+ if (! isnan (top_whisker))
+ {
+ cairo_move_to (cr, box_left, top_whisker);
+ cairo_line_to (cr, box_right, top_whisker);
+ cairo_stroke (cr);
+ }
- /* Draw centre line.
- (bottom half) */
- cairo_move_to (cr, box_centre, bottom_whisker);
- cairo_line_to (cr, box_centre, box_bottom);
- cairo_stroke (cr);
+ /* Draw centre line. */
+ if (! isnan (bottom_whisker) && ! isnan (box_bottom))
+ {
+ /* (bottom half) */
+ cairo_move_to (cr, box_centre, bottom_whisker);
+ cairo_line_to (cr, box_centre, box_bottom);
+ cairo_stroke (cr);
+ }
- /* (top half) */
- cairo_move_to (cr, box_centre, top_whisker);
- cairo_line_to (cr, box_centre, box_top);
- cairo_stroke (cr);
+ if (! isnan (top_whisker) && ! isnan (box_top))
+ {
+ /* (top half) */
+ cairo_move_to (cr, box_centre, top_whisker);
+ cairo_line_to (cr, box_centre, box_top);
+ cairo_stroke (cr);
+ }
outliers = box_whisker_outliers (bw);
for (ll = ll_head (outliers);
}
/* Draw tick mark on x axis */
- draw_tick(cr, geom, SCALE_ABSCISSA, box_centre - geom->axis[SCALE_ABSCISSA].data_min, "%s", name);
-}
-
-static void
-boxplot_draw_yscale (cairo_t *cr, struct xrchart_geometry *geom,
- double y_max, double y_min)
-{
- double y_tick;
- double d;
-
- geom->axis[SCALE_ORDINATE].max = y_max;
- geom->axis[SCALE_ORDINATE].min = y_min;
-
- y_tick = chart_rounded_tick (fabs (geom->axis[SCALE_ORDINATE].max - geom->axis[SCALE_ORDINATE].min) / 5.0);
-
- geom->axis[SCALE_ORDINATE].min = (ceil (geom->axis[SCALE_ORDINATE].min / y_tick) - 1.0) * y_tick;
-
- geom->axis[SCALE_ORDINATE].max = (floor (geom->axis[SCALE_ORDINATE].max / y_tick) + 1.0) * y_tick;
-
- geom->axis[SCALE_ORDINATE].scale = (fabs (geom->axis[SCALE_ORDINATE].data_max - geom->axis[SCALE_ORDINATE].data_min)
- / fabs (geom->axis[SCALE_ORDINATE].max - geom->axis[SCALE_ORDINATE].min));
-
- for (d = geom->axis[SCALE_ORDINATE].min; d <= geom->axis[SCALE_ORDINATE].max; d += y_tick)
- draw_tick (cr, geom, SCALE_ORDINATE,
- (d - geom->axis[SCALE_ORDINATE].min) * geom->axis[SCALE_ORDINATE].scale, "%g", d);
+ draw_tick (cr, geom, SCALE_ABSCISSA, false,
+ box_centre - geom->axis[SCALE_ABSCISSA].data_min, "%s", name);
}
void
-xrchart_draw_boxplot (const struct chart_item *chart_item, cairo_t *cr,
+xrchart_draw_boxplot (const struct chart *chart, cairo_t *cr,
struct xrchart_geometry *geom)
{
- const struct boxplot *boxplot = to_boxplot (chart_item);
+ const struct boxplot *boxplot = to_boxplot (chart);
double box_width;
size_t i;
- boxplot_draw_yscale (cr, geom, boxplot->y_max, boxplot->y_min);
- xrchart_write_title (cr, geom, "%s", chart_item->title);
+ if (! xrchart_write_yscale (cr, geom, boxplot->y_min, boxplot->y_max))
+ return;
+
+ xrchart_write_title (cr, geom, "%s", chart->title);
box_width = (geom->axis[SCALE_ABSCISSA].data_max - geom->axis[SCALE_ABSCISSA].data_min) / boxplot->n_boxes / 2.0;
for (i = 0; i < boxplot->n_boxes; i++)