X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=acre.c;h=92ee39beea6aa92e8e623d3c7ab0d9c36e4db63c;hb=c04dc4e942a60d51a540c32e5b0e574be609e49a;hp=12be71d249952421f0fb17caa956e3cd74377a0f;hpb=af6a6a5cafbbbbb1d5e1cffcab4c5903853d9758;p=acre

diff --git a/acre.c b/acre.c
index 12be71d..92ee39b 100644
--- a/acre.c
+++ b/acre.c
@@ -28,6 +28,8 @@
 #include <stdarg.h>
 #include <math.h>
 
+#include <lcms.h>
+
 typedef struct _acre_data_point_2d {
     double x;
     double y;
@@ -36,6 +38,9 @@ typedef struct _acre_data_point_2d {
 struct _acre_data {
     char *name;
 
+    acre_data_point_2d_t min;
+    acre_data_point_2d_t max;
+
     acre_data_point_2d_t *points;
     unsigned int points_size;
     unsigned int num_points;
@@ -43,10 +48,18 @@ struct _acre_data {
 
 typedef struct _acre_axis {
     char *label;
-    double min;
-    double max;
+    double data_min;
+    double data_max;
+    double view_min;
+    double view_max;
 } 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;
@@ -59,6 +72,9 @@ struct _acre {
     /* Data for drawing. */
     cairo_t *cr;
     PangoFontDescription *font;
+    acre_color_t *colors;
+    int colors_size;
+    int num_colors;
 
     /* Total size including labels. */
     int width;
@@ -79,17 +95,29 @@ 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->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->data = NULL;
     acre->data_size = 0;
     acre->num_data = 0;
 
+    acre->cr = NULL;
+    acre->font = NULL;
+    acre->colors = NULL;
+    acre->num_colors = 0;
+
+    acre->width = 0;
+    acre->height = 0;
+
     acre->chart.x = 0;
     acre->chart.y = 0;
     acre->chart.width = 0;
@@ -113,6 +141,8 @@ acre_destroy (acre_t *acre)
 
     free (acre->data);
 
+    free (acre->colors);
+
     free (acre);
 }
 
@@ -155,6 +185,25 @@ acre_add_data (acre_t *acre, acre_data_t *data)
     }
 
     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++;
 }
 
@@ -166,6 +215,8 @@ acre_add_data (acre_t *acre, acre_data_t *data)
 #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)
@@ -262,9 +313,9 @@ _draw_title_and_labels (acre_t *acre)
     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);
@@ -411,39 +462,23 @@ _set_transform_to_data_space (acre_t *acre)
 		     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)
 {
-    unsigned int d, i;
-    acre_data_t *data;
     double x_adjust, y_adjust;
     cairo_t *cr = acre->cr;
 
-    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, simply set view ranges to data ranges. */
+    acre->x_axis.view_min = acre->x_axis.data_min;
+    acre->x_axis.view_max = acre->x_axis.data_max;
 
-    /* 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;
-	}
-    }
+    acre->y_axis.view_min = acre->y_axis.data_min;
+    acre->y_axis.view_max = acre->y_axis.data_max;
 
     /* Next, we want to ensure that the data never collides with the
      * ticks. So we expand each axis on its minimum side as needed. */
@@ -457,20 +492,20 @@ _compute_axis_ranges (acre_t *acre)
 	y = ACRE_TICK_MAJOR_SIZE + 2.0;
 	cairo_device_to_user_distance (cr, &x, &y);
 
-	acre->x_axis.min -= x;
-	acre->y_axis.min += y;
+	acre->x_axis.view_min -= x;
+	acre->y_axis.view_min += y;
     }
     cairo_restore (cr);
 
     /* 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
@@ -487,31 +522,113 @@ _compute_axis_ranges (acre_t *acre)
 	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
+_acre_color_from_hsv (acre_color_t *color,
+		      double hue,
+		      double saturation,
+		      double value)
+{
+    double f, p, q, t;
+    int hmod6;
+
+    hmod6 = (int) floor (hue / 60) % 6;
+    f = hue / 60 - floor (hue / 60);
+    p = value * (1 - saturation);
+    q = value * (1 - f * saturation);
+    t = value * (1 - (1 - f) * saturation);
+    
+    switch (hmod6) {
+      case 0:
+	color->red = value;
+	color->green = t;
+	color->blue = p;
+	break;
+      case 1:
+	color->red = q;
+	color->green = value;
+	color->blue = p;
+	break;
+      case 2:
+	color->red = p;
+	color->green = value;
+	color->blue = t;
+	break;
+      case 3:
+	color->red = p;
+	color->green = q;
+	color->blue = value;
+	break;
+      case 4:
+	color->red = t;
+	color->green = p;
+	color->blue = value;
+	break;
+      case 5:
+	color->red = value;
+	color->green = p;
+	color->blue = q;
+	break;
+    }
+}
+
+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_t *cr = acre->cr;
     unsigned int d, i;
     acre_data_t *data;
-#define NUM_COLORS 3
-    struct {
-	double r;
-	double g;
-	double b;
-    } colors [NUM_COLORS] = {
-	{1, 0, 0},
-	{0, 1, 0},
-	{0, 0, 1}
-    };
 
     cairo_save (cr);
 
@@ -520,11 +637,11 @@ _draw_data (acre_t *acre)
     _set_transform_to_data_space (acre);
 
     for (d = 0; d < acre->num_data; d++) {
-	int color = d % NUM_COLORS;
+	int color = d % acre->num_colors;
 	cairo_set_source_rgb (cr,
-			      colors[color].r,
-			      colors[color].g,
-			      colors[color].b);
+			      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++) {
@@ -576,9 +693,9 @@ _draw_ticks (acre_t *acre,
 	cairo_save (cr);
 	{
 	    if (ticks == ACRE_TICKS_X)
-		cairo_move_to (cr, t, acre->y_axis.min);
+		cairo_move_to (cr, t, acre->y_axis.view_min);
 	    else
-		cairo_move_to (cr, acre->x_axis.min, t);
+		cairo_move_to (cr, acre->x_axis.view_min, t);
 
 	    cairo_identity_matrix (cr);
 
@@ -606,9 +723,9 @@ _draw_ticks (acre_t *acre,
 	    layout = _create_layout_printf (acre, "%g", t);
 
 	    if (ticks == ACRE_TICKS_X)
-		cairo_move_to (cr, t, acre->y_axis.min);
+		cairo_move_to (cr, t, acre->y_axis.view_min);
 	    else
-		cairo_move_to (cr, acre->x_axis.min, t);
+		cairo_move_to (cr, acre->x_axis.view_min, t);
 
 	    cairo_identity_matrix (cr);
 	    pango_layout_get_pixel_size (layout, &width, &height);
@@ -628,6 +745,64 @@ _draw_ticks (acre_t *acre,
     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);
+}
+
 static void
 _draw_frame_and_ticks (acre_t *acre)
 {
@@ -638,8 +813,8 @@ _draw_frame_and_ticks (acre_t *acre)
     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,
@@ -671,6 +846,8 @@ acre_draw (acre_t *acre, cairo_t *cr, int width, int height)
 
     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);
@@ -683,6 +860,9 @@ acre_draw (acre_t *acre, cairo_t *cr, int width, int height)
 
     _draw_data (acre);
 
+    if (acre->num_data > 1)
+	_draw_legend (acre);
+
     _draw_frame_and_ticks (acre);
 }
 
@@ -738,5 +918,24 @@ acre_data_add_point_2d (acre_data_t *data, double x, double y)
 
     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++;
 }