} acre_data_point_2d_t;
struct _acre_data {
+ /* The name of this data set. */
char *name;
+ /* The style for rendering (line, bar, etc.) */
+ acre_style_t style;
+
+ /* 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 {
cmsCloseProfile (srgb_profile);
}
+/* Draw the given dataset as a line. */
+static void
+_draw_data_line (acre_t *acre, acre_data_t *data)
+{
+ unsigned i;
+ cairo_t *cr = acre->cr;
+
+ cairo_save (cr);
+
+ cairo_new_path (cr);
+
+ for (i = 0; i < data->num_points; i++) {
+ cairo_line_to (cr,
+ data->points[i].x,
+ data->points[i].y);
+ }
+
+ cairo_identity_matrix (cr);
+ cairo_set_line_width (cr, 1.0);
+ cairo_stroke (cr);
+
+ cairo_restore (cr);
+}
+
+/* Draw all the datasets of the chart. */
static void
_draw_data (acre_t *acre)
{
cairo_t *cr = acre->cr;
- unsigned int d, i;
+ unsigned int i;
acre_data_t *data;
cairo_save (cr);
_set_transform_to_data_space (acre);
- for (d = 0; d < acre->num_data; d++) {
- int color = d % acre->num_colors;
+ for (i = 0; i < acre->num_data; i++) {
+ int color = i % 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);
+ data = acre->data[i];
- for (i = 0; i < data->num_points; i++) {
- cairo_line_to (cr,
- data->points[i].x,
- data->points[i].y);
- }
- cairo_save (cr);
- {
- cairo_identity_matrix (cr);
- cairo_set_line_width (cr, 1.0);
- cairo_stroke (cr);
+ switch (data->style) {
+ case ACRE_STYLE_LINE:
+ _draw_data_line (acre, data);
+ break;
}
- cairo_restore (cr);
}
cairo_restore (cr);
data->name = NULL;
+ data->style = ACRE_STYLE_LINE;
+
data->points = NULL;
data->points_size = 0;
data->num_points = 0;
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);
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);
+}