* Seems to be coming along. Not convinced that the bowing conversions are right.

[scdataviz] / graphwidget.c

diff --git a/graphwidget.c b/graphwidget.c
index 3dec40e..95b9722 100644 (file)
--- a/graphwidget.c
+++ b/graphwidget.c
@@ -34,6 +34,8 @@
 
 G_DEFINE_TYPE(GraphWidget, graph_widget, GTK_TYPE_DRAWING_AREA);
 
+#define INSET_PERCENT 0.1
+
 struct drawing_context {
   GtkWidget *widget;
   cairo_t *cr;
@@ -45,21 +47,43 @@ struct drawing_context {
 };
 
 static void draw_point(gpointer data, gpointer user_data) {
-  struct drawing_context *cxt = (struct drawing_context *) user_data;
-  double *d = (double*)data;
-  fprintf(stderr, "draw_point(x=%g(%g) y=%g(%g)) xscaling=%g yscaling=%g xoffset=%g yoffset=%g\n", d[0], (d[0] + cxt->xoffset)*cxt->xscaling, d[1], (d[1] + cxt->yoffset)*cxt->yscaling, cxt->xscaling, cxt->yscaling, cxt->xoffset, cxt->yoffset);
-  cairo_arc(cxt->cr, (d[0] + cxt->xoffset)*cxt->xscaling, (d[1] + cxt->yoffset)*cxt->yscaling, cxt->radius, 0, 2*M_PI);
-  cairo_set_source_rgb(cxt->cr, 1, 1, 1);
-  cairo_fill_preserve(cxt->cr);
-  cairo_set_source_rgb(cxt->cr, 0, 0, 0);
-  cairo_stroke(cxt->cr);
+  struct drawing_context *cxt = user_data;
+  struct graph_point *pt = data;
+  double x = (pt->x + cxt->xoffset)*cxt->xscaling;
+  double y = (pt->y + cxt->yoffset)*cxt->yscaling;
+  cairo_move_to(cxt->cr, x, y);
+  cairo_arc(cxt->cr, x, y, cxt->radius, 0, 2*M_PI);
+  if(pt->label != NULL) {
+    cairo_save(cxt->cr);
+    cairo_scale(cxt->cr, 1, -1);
+    cairo_show_text(cxt->cr, pt->label->str);
+    cairo_restore(cxt->cr);
+  }
+}
+
+static void draw_lines(gpointer data, gpointer user_data) {
+  struct drawing_context *cxt = user_data;
+  struct graph_line *l = data;
+  double p0_x = (l->p0_x + cxt->xoffset)*cxt->xscaling;
+  double p0_y = (l->p0_y + cxt->yoffset)*cxt->yscaling;
+  double p1_x = (l->p1_x + cxt->xoffset)*cxt->xscaling;
+  double p1_y = (l->p1_y + cxt->yoffset)*cxt->yscaling;
+  double p2_x = (l->p2_x + cxt->xoffset)*cxt->xscaling;
+  double p2_y = (l->p2_y + cxt->yoffset)*cxt->yscaling;
+  double p3_x = (l->p3_x + cxt->xoffset)*cxt->xscaling;
+  double p3_y = (l->p3_y + cxt->yoffset)*cxt->yscaling;
+  #ifdef DEBUG
+  fprintf(stderr, "draw_lines: p0_x=%g, p0_y=%g, p1_x=%g, p1_y=%g, p2_x=%g, p2_y=%g, p3_x=%g, p3_y=%g\n", p0_x, p0_y, p1_x, p1_y, p2_x, p2_y, p3_x, p3_y);
+  #endif
+  cairo_move_to(cxt->cr, p0_x, p0_y);
+  cairo_curve_to(cxt->cr, p1_x, p1_y, p2_x, p2_y, p3_x, p3_y);
 }
 
 static void draw(GtkWidget *graph, cairo_t *cr) {
   struct drawing_context cxt;
   GraphWidget *gw = GRAPH_WIDGET(graph);
   #ifdef DEBUG
-  fprintf(stderr, "draw(%d, %d)\n", graph, cr);
+  fprintf(stderr, "draw(%d, %d)\n", (int)graph, (int)cr);
   fprintf(stderr, "allocation.x=%d, allocation.y=%d, allocation.height=%d, allocation.width=%d\n", graph->allocation.x, graph->allocation.y, graph->allocation.height, graph->allocation.width);
   #endif
   double x0=graph->allocation.x;
@@ -68,20 +92,37 @@ static void draw(GtkWidget *graph, cairo_t *cr) {
   double width=graph->allocation.width;
   cxt.widget = graph;
   cxt.cr = cr;
-  cxt.radius = 0.1;
+  cxt.radius = 0.01;
   cxt.xscaling = (gw->graph->points->len == 1)? 1 : (1/(gw->graph->maxx - gw->graph->minx));
   cxt.yscaling = (gw->graph->points->len == 1)? 1 : (1/(gw->graph->maxy - gw->graph->miny));
   cxt.xoffset = (gw->graph->points->len == 1)? (-gw->graph->minx/2) : (-gw->graph->minx);
   cxt.yoffset = (gw->graph->points->len == 1)? (-gw->graph->miny/2) : (-gw->graph->miny);
   #ifdef DEBUG
+  fprintf(stderr, "minx=%g, maxx=%g, miny=%g, maxy=%g, xscaling=%g, yscaling=%g, xoffset=%g, yoffset=%g\n", gw->graph->minx, gw->graph->maxx, gw->graph->miny, gw->graph->maxy, cxt.xscaling, cxt.yscaling, cxt.xoffset, cxt.yoffset);
   fprintf(stderr, "x0=%g, y0=%g, width=%g, height=%g\n", x0, y0, height, width);
-  fprintf(stderr, "move_to(%d, %g->%g, %g->%g)\n", cr, graph_data[0], graph->allocation.x + graph_data[0]*(graph->allocation.width), graph_data[1], graph->allocation.y + graph_data[1]*(graph->allocation.height));
-  #endif
+  fprintf(stderr, "translate=(%g, %g)\n", x0 + ((width>height)?(width-height)/2.0:0), y0+((width > height)?height:width) + ((height>width)?(height-width)/2.0:0));
+#endif
+  double offset_height =  ((width>=height)?height*INSET_PERCENT:0);;
+  double offset_width = ((height>=width)?width*INSET_PERCENT:0); 
+  double inset_height = height - offset_height;
+  double inset_width = width - offset_width;
   cairo_save(cr);
-  cairo_translate(cr, x0, y0+height);
-  cairo_scale(cr, width, -height);
-  cairo_set_line_width(cr, 0.05);
-  g_ptr_array_foreach(GRAPH_WIDGET(graph)->graph->points, &draw_point, (gpointer)&cxt);
+  cairo_translate(cr, x0 + ((inset_width>inset_height)?(inset_width-inset_height)/2.0:0) + offset_width/2, y0+((inset_width > inset_height)?inset_height:inset_width) + ((inset_width>=inset_height)?0:(inset_height-inset_width)/2.0) + offset_height/2 );
+  cairo_scale(cr, (inset_width > inset_height)?inset_height:inset_width, (inset_width > inset_height)?-inset_height:-inset_width);
+  cairo_set_line_width(cr, 0.005);
+  cairo_select_font_face (cr, "Georgia",
+                         CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_BOLD);
+  cairo_set_font_size (cr, 0.05);
+  if(gw->graph->lines != NULL) {
+    cairo_set_source_rgba(cr, 0, 0, 0, 0.25);
+    g_ptr_array_foreach(gw->graph->lines, &draw_lines, (gpointer)&cxt);
+    cairo_stroke(cr);
+  }
+  cairo_set_source_rgb(cr, 1, 1, 1);
+  cairo_fill_preserve(cr);
+  cairo_set_source_rgb(cr, 0, 0, 0);
+  g_ptr_array_foreach(gw->graph->points, &draw_point, (gpointer)&cxt);
+  cairo_stroke(cr);
   cairo_restore(cr);
 }
 
@@ -112,3 +153,4 @@ GtkWidget *graph_widget_new(void) {
 Graph* graph_widget_get_graph(GraphWidget* gw) {
   return gw->graph;
 }
+