#include <string.h>
#include <stdarg.h>
+#include <stdbool.h>
#include <math.h>
+#include <lcms.h>
+
typedef struct _acre_data_point_2d {
double x;
double y;
} acre_data_point_2d_t;
struct _acre_data {
+ /* The name of this data set. */
char *name;
+ /* Minimum and mximum extents of data. */
+ acre_data_point_2d_t min;
+ acre_data_point_2d_t max;
+
+ /* The data itself. */
acre_data_point_2d_t *points;
unsigned int points_size;
unsigned int num_points;
+
+ /* The names of data points (if any).
+ *
+ * This array is indexed with the same index as the 'points' array
+ * to provide names for points. It is legal for this array to be
+ * NULL or smaller than 'points', (in which case, the
+ * corresponding points simply have no names).
+ */
+ char **names;
+ unsigned int names_size;
+ unsigned int num_names;
};
typedef struct _acre_axis {
char *label;
- double min;
- double max;
+
+ /* Range of data */
+ double data_min;
+ double data_max;
+
+ /* Range of data to be viewed. */
+ double view_min;
+ double view_max;
+
+ /* Has the view range been set? */
+ bool view_range_set;
} acre_axis_t;
+typedef struct _acre_color {
+ double red;
+ double green;
+ double blue;
+} acre_color_t;
+
struct _acre {
char *title;
acre_axis_t x_axis;
/* Data for drawing. */
cairo_t *cr;
PangoFontDescription *font;
+ acre_color_t *colors;
+ int colors_size;
+ int num_colors;
/* Total size including labels. */
int width;
PangoRectangle chart;
};
+static void
+_find_x_range_given_y_range (acre_t *acre,
+ double *x_min, double *x_max,
+ double y_min, double y_max);
+
+static void
+_find_y_range_given_x_range (acre_t *acre,
+ double *y_min, double *y_max,
+ double x_min, double x_max);
+
/* Create a new, empty plot. */
acre_t *
acre_create (void)
acre->title = NULL;
acre->x_axis.label = NULL;
- acre->x_axis.min = 0.0;
- acre->x_axis.max = 0.0;
+ acre->x_axis.data_min = 0.0;
+ acre->x_axis.data_max = 0.0;
+ acre->x_axis.view_min = 0.0;
+ acre->x_axis.view_max = 0.0;
+ acre->x_axis.view_range_set = false;
acre->y_axis.label = NULL;
- acre->y_axis.min = 0.0;
- acre->y_axis.max = 0.0;
+ acre->y_axis.data_min = 0.0;
+ acre->y_axis.data_max = 0.0;
+ acre->y_axis.view_min = 0.0;
+ acre->y_axis.view_max = 0.0;
+ acre->y_axis.view_range_set = false;
acre->data = NULL;
acre->data_size = 0;
acre->num_data = 0;
+ acre->cr = NULL;
+ acre->font = NULL;
+ acre->colors = NULL;
+ acre->num_colors = 0;
+ acre->colors_size = 0;
+
+ acre->width = 0;
+ acre->height = 0;
+
acre->chart.x = 0;
acre->chart.y = 0;
acre->chart.width = 0;
free (acre->data);
+ free (acre->colors);
+
free (acre);
}
acre->y_axis.label = strdup (label);
}
+void
+acre_get_x_axis_data_range (acre_t *acre, double *x_min, double *x_max)
+{
+ if (x_min)
+ *x_min = acre->x_axis.data_min;
+
+ if (x_max)
+ *x_max = acre->x_axis.data_max;
+}
+
+void
+acre_get_x_axis_range (acre_t *acre, double *x_min, double *x_max)
+{
+ /* If an X range has been set, return that. */
+ if (acre->x_axis.view_range_set) {
+ if (x_min)
+ *x_min = acre->x_axis.view_min;
+
+ if (x_max)
+ *x_max = acre->x_axis.view_max;
+
+ return;
+ }
+
+ /* Otherwise, if a Y range has been set, use that to compute X. */
+ if (acre->y_axis.view_range_set) {
+ _find_x_range_given_y_range (acre, x_min, x_max,
+ acre->y_axis.view_min,
+ acre->y_axis.view_max);
+
+ return;
+ }
+
+ /* Neither view range set. Return full, data-based X range. */
+ acre_get_x_axis_data_range (acre, x_min, x_max);
+}
+
+void
+acre_set_x_axis_range (acre_t *acre, double x_min, double x_max)
+{
+ acre->x_axis.view_min = x_min;
+ acre->x_axis.view_max = x_max;
+
+ acre->x_axis.view_range_set = true;
+}
+
+void
+acre_set_x_axis_range_auto (acre_t *acre)
+{
+ acre->x_axis.view_range_set = false;
+}
+
+void
+acre_get_y_axis_data_range (acre_t *acre, double *y_min, double *y_max)
+{
+ if (y_min)
+ *y_min = acre->y_axis.data_min;
+
+ if (y_max)
+ *y_max = acre->y_axis.data_max;
+}
+
+void
+acre_get_y_axis_range (acre_t *acre, double *y_min, double *y_max)
+{
+ /* If a Y range has been set, return that. */
+ if (acre->y_axis.view_range_set) {
+ if (y_min)
+ *y_min = acre->y_axis.view_min;
+
+ if (y_max)
+ *y_max = acre->y_axis.view_max;
+
+ return;
+ }
+
+ /* Otherwise, if an X range has been set, use that to compute Y. */
+ if (acre->x_axis.view_range_set) {
+ _find_y_range_given_x_range (acre, y_min, y_max,
+ acre->x_axis.view_min,
+ acre->x_axis.view_max);
+
+ return;
+ }
+
+ /* Neither view range set. Return full data-based Y range. */
+ acre_get_y_axis_data_range (acre, y_min, y_max);
+}
+
+void
+acre_set_y_axis_range (acre_t *acre, double y_min, double y_max)
+{
+ acre->y_axis.view_min = y_min;
+ acre->y_axis.view_max = y_max;
+
+ acre->y_axis.view_range_set = true;
+}
+
+void
+acre_set_y_axis_range_auto (acre_t *acre)
+{
+ acre->y_axis.view_range_set = false;
+}
+
/* Add a dataset to the plot. The plot assumes ownership of the
* dataset so it is not necessary to call acre_data_destroy on it. */
void
}
acre->data[acre->num_data] = data;
+
+ if (acre->num_data == 0) {
+ acre->x_axis.data_min = data->min.x;
+ acre->y_axis.data_min = data->min.y;
+
+ acre->x_axis.data_max = data->max.x;
+ acre->y_axis.data_max = data->max.y;
+ } else {
+ if (data->min.x < acre->x_axis.data_min)
+ acre->x_axis.data_min = data->min.x;
+ if (data->min.y < acre->y_axis.data_min)
+ acre->y_axis.data_min = data->min.y;
+
+ if (data->max.x > acre->x_axis.data_max)
+ acre->x_axis.data_max = data->max.x;
+ if (data->max.y > acre->y_axis.data_max)
+ acre->y_axis.data_max = data->max.y;
+ }
+
acre->num_data++;
}
#define ACRE_FONT_FAMILY "sans"
#define ACRE_FONT_SIZE 12
-#define ACRE_TITLE_FONT_SIZE 32
+#define ACRE_TITLE_FONT_SIZE 20
#define ACRE_PAD (ACRE_FONT_SIZE)
-#define ACRE_TICK_SIZE 6
+#define ACRE_TICK_MAJOR_SIZE 6
+#define ACRE_TICK_MINOR_SIZE 3
#define ACRE_X_TICK_VALUE_PAD 2
#define ACRE_Y_TICK_VALUE_PAD 4
+#define ACRE_LEGEND_PAD 4
+#define ACRE_LEGEND_LINE_SIZE 10
static PangoLayout *
_create_layout (acre_t *acre, const char *text)
{
PangoLayout *layout;
+ if (text == NULL)
+ text = "";
+
layout = pango_cairo_create_layout (acre->cr);
pango_layout_set_font_description (layout, acre->font);
pango_layout_set_text (layout, text, -1);
title_layout = _create_layout (acre, acre->title);
pango_layout_set_font_description (title_layout, title_font);
+ pango_font_description_free (title_font);
x_axis_layout = _create_layout (acre, acre->x_axis.label);
y_axis_layout = _create_layout (acre, acre->y_axis.label);
min_y = _create_layout_printf (acre, "%g",
- round (acre->y_axis.min));
+ round (acre->y_axis.view_min));
max_y = _create_layout_printf (acre, "%g",
- round (acre->y_axis.max));
+ round (acre->y_axis.view_max));
pango_layout_get_pixel_size (min_y, &min_y_width, NULL);
pango_layout_get_pixel_size (max_y, &max_y_width, NULL);
/* For a given axis range, compute a step size (in data space) to
* generate a suitable number of ticks (5 or so). */
static double
-_step_for_range (double range)
+_step_for_range (double range, int *minor_divisions)
{
double step, scale_factor;
* 10). The threshold values between these are computed
* logarithmically. */
if (step < 3.535533905932738) {
- if (step < 1.58113883008419)
+ if (step < 1.58113883008419) {
step = 1.0;
- else
+ *minor_divisions = 4;
+ } else {
step = 2.5;
+ *minor_divisions = 5;
+ }
} else {
- if (step < 7.071067811865475)
+ if (step < 7.071067811865475) {
step = 5.0;
- else
+ *minor_divisions = 5;
+ } else {
step = 10.0;
+ *minor_divisions = 4;
+ }
}
/* Un-normalize and we now have the data value that we want to
* nice-looking pixel-snapped ticks we want to expand the range
* slightly. */
static void
-_expand_range_for_width (double *axis_min, double *axis_max, int pixel_size)
+_expand_range_for_width (double *axis_min, double *axis_max, int pixel_range)
{
- double range, new_range, step, pixel_step;
+ double range, new_range, step, step_minor, pixel_step;
+ int minor_divisions;
range = *axis_max - *axis_min;
- step = _step_for_range (range);
- pixel_step = step * pixel_size / range;
+ step = _step_for_range (range, &minor_divisions);
+ step_minor = step / minor_divisions;
+
+ pixel_step = step_minor * (pixel_range / range);
/* We expand the range by the ratio of the pixel step to the floor
* of the pixel_step.
acre->chart.x,
acre->chart.y + acre->chart.height);
cairo_scale (cr,
- acre->chart.width / (acre->x_axis.max - acre->x_axis.min),
- - acre->chart.height /(acre->y_axis.max - acre->y_axis.min));
- cairo_translate (cr, -acre->x_axis.min, -acre->y_axis.min);
+ acre->chart.width / (acre->x_axis.view_max - acre->x_axis.view_min),
+ - acre->chart.height /(acre->y_axis.view_max - acre->y_axis.view_min));
+ cairo_translate (cr, -acre->x_axis.view_min, -acre->y_axis.view_min);
}
static void
-_compute_axis_ranges (acre_t *acre)
+_find_x_range_given_y_range (acre_t *acre,
+ double *x_min, double *x_max,
+ double y_min, double y_max)
{
- unsigned int d, i;
acre_data_t *data;
- double x_adjust, y_adjust;
- cairo_t *cr = acre->cr;
+ unsigned d, i;
+ bool first;
- acre->x_axis.min = acre->data[0]->points[0].x;
- acre->x_axis.max = acre->data[0]->points[0].x;
- acre->y_axis.min = acre->data[0]->points[0].y;
- acre->y_axis.min = acre->data[0]->points[0].y;
+ first = true;
- /* First, simply find the extrema of the data. */
for (d = 0; d < acre->num_data; d++) {
data = acre->data[d];
for (i = 0; i < data->num_points; i++) {
- if (data->points[i].x < acre->x_axis.min)
- acre->x_axis.min = data->points[i].x;
- if (data->points[i].x > acre->x_axis.max)
- acre->x_axis.max = data->points[i].x;
-
- if (data->points[i].y < acre->y_axis.min)
- acre->y_axis.min = data->points[i].y;
- if (data->points[i].y > acre->y_axis.max)
- acre->y_axis.max = data->points[i].y;
+ if (data->points[i].y >= y_min &&
+ data->points[i].y <= y_max)
+ {
+ if (first) {
+ *x_min = data->points[i].x;
+ *x_max = data->points[i].x;
+ first = false;
+ } else {
+ if (data->points[i].x < *x_min)
+ *x_min = data->points[i].x;
+ if (data->points[i].x > *x_max)
+ *x_max = data->points[i].x;
+ }
+ }
}
}
- /* Next, increase the axis ranges just enough so that the step
+ /* If nothing is visible, punt to full X data range. */
+ if (first) {
+ *x_min = acre->x_axis.data_min;
+ *x_max = acre->x_axis.data_max;
+ }
+}
+
+static void
+_find_y_range_given_x_range (acre_t *acre,
+ double *y_min, double *y_max,
+ double x_min, double x_max)
+{
+ acre_data_t *data;
+ unsigned d, i;
+ bool first;
+
+ first = true;
+
+ for (d = 0; d < acre->num_data; d++) {
+ data = acre->data[d];
+ for (i = 0; i < data->num_points; i++) {
+ if (data->points[i].x >= x_min &&
+ data->points[i].x <= x_max)
+ {
+ if (first) {
+ *y_min = data->points[i].y;
+ *y_max = data->points[i].y;
+ first = false;
+ } else {
+ if (data->points[i].y < *y_min)
+ *y_min = data->points[i].y;
+ if (data->points[i].y > *y_max)
+ *y_max = data->points[i].y;
+ }
+ }
+ }
+ }
+
+ /* If nothing is visible, punt to full Y data range. */
+ if (first) {
+ *y_min = acre->y_axis.data_min;
+ *y_max = acre->y_axis.data_max;
+ }
+}
+
+static void
+_compute_axis_ranges (acre_t *acre)
+{
+ double x_adjust, y_adjust;
+ cairo_t *cr = acre->cr;
+
+ /* If neither view range is set, set both to data ranges. */
+ if (! acre->x_axis.view_range_set && ! acre->y_axis.view_range_set)
+ {
+ acre->x_axis.view_min = acre->x_axis.data_min;
+ acre->x_axis.view_max = acre->x_axis.data_max;
+
+ acre->y_axis.view_min = acre->y_axis.data_min;
+ acre->y_axis.view_max = acre->y_axis.data_max;
+ } else {
+ /* Otherwise, auto-fit unset range based on data. */
+ if (acre->x_axis.view_range_set && ! acre->y_axis.view_range_set) {
+ _find_y_range_given_x_range (acre,
+ &acre->y_axis.view_min,
+ &acre->y_axis.view_max,
+ acre->x_axis.view_min,
+ acre->x_axis.view_max);
+ }
+ else if (acre->y_axis.view_range_set && ! acre->x_axis.view_range_set) {
+ _find_x_range_given_y_range (acre,
+ &acre->x_axis.view_min,
+ &acre->x_axis.view_max,
+ acre->y_axis.view_min,
+ acre->y_axis.view_max);
+ }
+ }
+
+ /* Then, increase the axis ranges just enough so that the step
* sizes for the ticks will be integers.
*/
- _expand_range_for_width (&acre->x_axis.min,
- &acre->x_axis.max,
+ _expand_range_for_width (&acre->x_axis.view_min,
+ &acre->x_axis.view_max,
acre->chart.width);
- _expand_range_for_width (&acre->y_axis.min,
- &acre->y_axis.max,
+ _expand_range_for_width (&acre->y_axis.view_min,
+ &acre->y_axis.view_max,
acre->chart.height);
/* Finally, we also translate the axis ranges slightly so that the
y_adjust = (round (y_adjust + 0.5) - 0.5) - y_adjust;
cairo_device_to_user_distance (cr, &x_adjust, &y_adjust);
- acre->x_axis.min -= x_adjust;
- acre->x_axis.max -= x_adjust;
+ acre->x_axis.view_min -= x_adjust;
+ acre->x_axis.view_max -= x_adjust;
- acre->y_axis.min -= y_adjust;
- acre->y_axis.max -= y_adjust;
+ acre->y_axis.view_min -= y_adjust;
+ acre->y_axis.view_max -= y_adjust;
}
cairo_restore (cr);
}
+static void
+_choose_colors (acre_t *acre)
+{
+ cmsHPROFILE lab_profile, srgb_profile;
+ cmsHTRANSFORM lab_to_srgb;
+ int i;
+ double theta, radius, srgb[3];
+ cmsCIELab lab;
+
+ lab_profile = cmsCreateLabProfile (NULL); /* D50 */
+ srgb_profile = cmsCreate_sRGBProfile ();
+
+ lab_to_srgb = cmsCreateTransform (lab_profile, TYPE_Lab_DBL,
+ srgb_profile, TYPE_RGB_DBL,
+ INTENT_PERCEPTUAL, 0);
+
+ acre->num_colors = acre->num_data;
+
+ if (acre->num_colors > acre->colors_size) {
+ acre->colors_size = acre->num_colors;
+ acre->colors = xrealloc (acre->colors,
+ acre->colors_size * sizeof (acre_color_t));
+ }
+
+ lab.L = 36;
+ radius = 130;
+ for (i = 0; i < acre->num_colors; i++) {
+ theta = 0.713 + 2 * M_PI * (double) i / acre->num_colors;
+ lab.a = radius * cos (theta);
+ lab.b = radius * sin (theta);
+
+ cmsDoTransform (lab_to_srgb, &lab, srgb, 1);
+
+ acre->colors[i].red = srgb[0];
+ acre->colors[i].green = srgb[1];
+ acre->colors[i].blue = srgb[2];
+ }
+
+ cmsDeleteTransform (lab_to_srgb);
+ cmsCloseProfile (lab_profile);
+ cmsCloseProfile (srgb_profile);
+}
+
static void
_draw_data (acre_t *acre)
{
cairo_save (cr);
+ cairo_rectangle (cr,
+ acre->chart.x, acre->chart.y,
+ acre->chart.width, acre->chart.height);
+ cairo_clip (cr);
+
cairo_set_source_rgb (cr, 0, 0, 0);
_set_transform_to_data_space (acre);
for (d = 0; d < acre->num_data; d++) {
+ int color = d % acre->num_colors;
+ cairo_set_source_rgb (cr,
+ acre->colors[color].red,
+ acre->colors[color].green,
+ acre->colors[color].blue);
data = acre->data[d];
+
cairo_new_path (cr);
+
for (i = 0; i < data->num_points; i++) {
cairo_line_to (cr,
data->points[i].x,
acre_ticks_t ticks)
{
cairo_t *cr = acre->cr;
- double i, step;
+ double t, step, sub_step;
+ int minor_divisions;
cairo_save (cr);
_set_transform_to_data_space (acre);
- step = _step_for_range (axis_max - axis_min);
- i = (floor (axis_min / step) + 1) * step;
+ step = _step_for_range (axis_max - axis_min, &minor_divisions);
+ sub_step = step / minor_divisions;
- while (i <= axis_max) {
- if (ticks == ACRE_TICKS_X)
- cairo_move_to (cr, i, acre->y_axis.min);
+ for (t = (floor (axis_min / sub_step) + 1) * sub_step;
+ t <= axis_max;
+ t += sub_step)
+ {
+ int tick_size;
+ if (fabs((t / step) - round (t / step)) < 0.5 * (sub_step / step))
+ tick_size = ACRE_TICK_MAJOR_SIZE;
else
- cairo_move_to (cr, acre->x_axis.min, i);
+ tick_size = ACRE_TICK_MINOR_SIZE;
/* tick */
cairo_save (cr);
{
+ if (ticks == ACRE_TICKS_X)
+ cairo_move_to (cr, t, acre->y_axis.view_min);
+ else
+ cairo_move_to (cr, acre->x_axis.view_min, t);
+
cairo_identity_matrix (cr);
+
if (ticks == ACRE_TICKS_X) {
cairo_rel_line_to (cr, 0, 0.5);
- cairo_rel_line_to (cr, 0, -ACRE_TICK_SIZE-0.5);
+ cairo_rel_line_to (cr, 0, -tick_size - 0.5);
} else {
cairo_rel_line_to (cr, -0.5, 0);
- cairo_rel_line_to (cr, ACRE_TICK_SIZE+0.5, 0);
+ cairo_rel_line_to (cr, tick_size + 0.5, 0);
}
+
cairo_set_line_width (cr, 1.0);
cairo_stroke (cr);
}
cairo_restore (cr);
/* label */
- cairo_save (cr);
+ if (tick_size == ACRE_TICK_MAJOR_SIZE)
{
PangoLayout *layout;
int width, height;
- layout = _create_layout_printf (acre, "%g", i);
+ cairo_save (cr);
+
+ layout = _create_layout_printf (acre, "%g", t);
if (ticks == ACRE_TICKS_X)
- cairo_move_to (cr, i, acre->y_axis.min);
+ cairo_move_to (cr, t, acre->y_axis.view_min);
else
- cairo_move_to (cr, acre->x_axis.min, i);
+ cairo_move_to (cr, acre->x_axis.view_min, t);
cairo_identity_matrix (cr);
pango_layout_get_pixel_size (layout, &width, &height);
-height/2);
_show_layout (cr, layout);
+
+ cairo_restore (cr);
}
- cairo_restore (cr);
+ }
- i += step;
+ cairo_restore (cr);
+}
+
+static void
+_draw_legend (acre_t *acre)
+{
+ PangoLayout *layout;
+ int label_width, max_label_width = 0;
+ int width, height;
+ unsigned int i;
+ cairo_t *cr = acre->cr;
+
+ cairo_save (cr);
+
+ for (i = 0; i < acre->num_data; i++) {
+ layout = _create_layout (acre, acre->data[i]->name);
+ pango_layout_get_pixel_size (layout, &label_width, NULL);
+ _destroy_layout (layout);
+ if (label_width > max_label_width)
+ max_label_width = label_width;
+ }
+
+ width = ACRE_LEGEND_PAD + ACRE_LEGEND_LINE_SIZE + ACRE_LEGEND_PAD +
+ max_label_width + ACRE_LEGEND_PAD;
+ height = ACRE_LEGEND_PAD +
+ acre->num_data * (ACRE_FONT_SIZE + ACRE_LEGEND_PAD);
+
+ cairo_translate (cr, acre->chart.x, acre->chart.y);
+
+ cairo_translate (cr,
+ acre->chart.width - ACRE_LEGEND_PAD - width,
+ ACRE_LEGEND_PAD);
+
+ cairo_rectangle (cr, -0.5, -0.5, width + 1.0, height + 1.0);
+ cairo_set_source_rgb (cr, 0, 0, 0);
+ cairo_set_line_width (cr, 1.0);
+ cairo_stroke (cr);
+
+ cairo_translate (cr, ACRE_LEGEND_PAD, ACRE_LEGEND_PAD);
+
+ for (i = 0; i < acre->num_data; i++) {
+ cairo_rectangle (cr,
+ 0, ACRE_LEGEND_LINE_SIZE / 2,
+ ACRE_LEGEND_LINE_SIZE, ACRE_LEGEND_LINE_SIZE / 2);
+ cairo_set_source_rgb (cr,
+ acre->colors[i % acre->num_colors].red,
+ acre->colors[i % acre->num_colors].green,
+ acre->colors[i % acre->num_colors].blue);
+ cairo_fill (cr);
+
+ layout = _create_layout (acre, acre->data[i]->name);
+ cairo_move_to (cr, ACRE_LEGEND_LINE_SIZE + ACRE_LEGEND_PAD, 0);
+ cairo_set_source_rgb (cr, 0, 0, 0);
+ _show_layout (cr, layout);
+
+ cairo_translate (cr, 0, ACRE_LEGEND_PAD + ACRE_FONT_SIZE);
}
cairo_restore (cr);
cairo_set_source_rgb (cr, 0, 0, 0); /* black */
/* ticks */
- _draw_ticks (acre, acre->x_axis.min, acre->x_axis.max, ACRE_TICKS_X);
- _draw_ticks (acre, acre->y_axis.min, acre->y_axis.max, ACRE_TICKS_Y);
+ _draw_ticks (acre, acre->x_axis.view_min, acre->x_axis.view_max, ACRE_TICKS_X);
+ _draw_ticks (acre, acre->y_axis.view_min, acre->y_axis.view_max, ACRE_TICKS_Y);
/* frame */
cairo_rectangle (cr,
cairo_set_source_rgb (cr, 1, 1, 1);
+ _choose_colors (acre);
+
/* We compute the axis ranges before doing label layout so that we
* can account for the width of the y-axis value labels. */
_compute_axis_ranges (acre);
_draw_data (acre);
+ if (acre->num_data > 1)
+ _draw_legend (acre);
+
_draw_frame_and_ticks (acre);
}
void
acre_data_destroy (acre_data_t *data)
{
+ unsigned i;
+
+ for (i = 0; i < data->num_names; i++) {
+ if (data->names[i])
+ free (data->names[i]);
+ }
+ free (data->names);
+
+ free (data->name);
+
free (data->points);
free (data);
data->points[data->num_points].x = x;
data->points[data->num_points].y = y;
+
+ if (data->num_points == 0) {
+ data->min.x = x;
+ data->min.y = y;
+
+ data->max.x = x;
+ data->max.y = y;
+ } else {
+ if (x < data->min.x)
+ data->min.x = x;
+ if (y < data->min.y)
+ data->min.y = y;
+
+ if (x > data->max.x)
+ data->max.x = x;
+ if (y > data->max.y)
+ data->max.y = y;
+ }
+
data->num_points++;
}
+
+/* Add a datapoint with a name to the given dataset. */
+void
+acre_data_add_point_2d_named (acre_data_t *data, double x, double y, const char *name)
+{
+ unsigned i;
+
+ acre_data_add_point_2d (data, x, y);
+
+ if (data->names_size < data->points_size) {
+ data->names_size = data->points_size;
+ data->names = xrealloc_ab (data->names,
+ data->names_size,
+ sizeof (char *));
+ }
+
+ /* Initialize any newly-created holes in the array to NULL. */
+ for (i = data->num_names; i < data->num_points - 1; i++)
+ data->names[i] = NULL;
+
+ data->num_names = data->num_points;
+
+ data->names[data->num_names - 1] = xstrdup (name);
+}