Remove hardcoding of scale positions, fix more drawing bugs

Author: drahnr

src/goat-plot-enum.c

@@ -6,6 +6,7 @@ GType goat_orientation_get_type (void)
 
 if (!t) {
 static GEnumValue ts[] = {
+ {GOAT_ORIENTATION_INVALID, "INVALID", "invalid"},
  {GOAT_ORIENTATION_VERTICAL, "VERTICAL", "vertical"},
  {GOAT_ORIENTATION_HORIZONTAL, "HORIZONTAL", "horizontal"},
  {0, NULL, NULL},
@@ -21,11 +22,9 @@ GType goat_position_get_type (void)
 
 if (!t) {
 static GEnumValue ts[] = {
- {GOAT_POSITION_TOP, "TOP", "top"},
- {GOAT_POSITION_BOTTOM, "BOTTOM", "bottom"},
- {GOAT_POSITION_LEFT, "LEFT", "left"},
- {GOAT_POSITION_RIGHT, "RIGHT", "right"},
- {0, NULL, NULL},
+ {GOAT_POSITION_INVALID, "INVALID", "invalid"}, {GOAT_POSITION_TOP, "TOP", "top"},
+ {GOAT_POSITION_BOTTOM, "BOTTOM", "bottom"}, {GOAT_POSITION_LEFT, "LEFT", "left"},
+ {GOAT_POSITION_RIGHT, "RIGHT", "right"}, {0, NULL, NULL},
 };
 t = g_enum_register_static ("GoatPositionTypes", ts);
 }

src/goat-plot-enum.h

@@ -4,7 +4,7 @@
 #include <gtk/gtk.h>
 
 typedef enum {
-GOAT_ORIENTATION_UNKNOWN = 0,
+GOAT_ORIENTATION_INVALID = 0,
 GOAT_ORIENTATION_VERTICAL = 1,
 GOAT_ORIENTATION_HORIZONTAL = 2
 } GoatOrientation;
@@ -15,6 +15,7 @@ GType goat_orientation_get_type (void);
 
 
 typedef enum {
+GOAT_POSITION_INVALID = 0,
 GOAT_POSITION_TOP = 1,
 GOAT_POSITION_BOTTOM = 2,
 GOAT_POSITION_LEFT = 3,

src/goat-plot-internal.h

@@ -42,11 +42,11 @@ gboolean draw_scales (GoatPlot *plot, cairo_t *cr, GtkAllocation *allocation, Gt
 g_printf ("scale x : left=%i right=%i top=%i bottom=%i nil=%lf u2pix=%lf\n", left, right, top, bottom, x_nil,
  x_unit_to_pixel);
 
-goat_scale_draw (priv->scale_x, cr, left, right, top, bottom, x_nil, x_unit_to_pixel, GOAT_POSITION_TOP, TRUE);
+goat_scale_draw (priv->scale_x, cr, left, right, top, bottom, x_nil, x_unit_to_pixel);
 
 g_printf ("scale y : left=%i right=%i top=%i bottom=%i nil=%lf u2pix=%lf\n", left, right, top, bottom, y_nil,
  y_unit_to_pixel);
-goat_scale_draw (priv->scale_y, cr, left, right, top, bottom, y_nil, y_unit_to_pixel, GOAT_POSITION_LEFT, TRUE);
+goat_scale_draw (priv->scale_y, cr, left, right, top, bottom, y_nil, y_unit_to_pixel);
 return TRUE;
 }
 

src/goat-scale-interface.c

@@ -13,13 +13,13 @@ static void goat_scale_default_init (GoatScaleInterface *iface)
 }
 
 void goat_scale_draw (GoatScale *self, cairo_t *cr, gint left, gint right, gint top, gint bottom, gdouble nil,
- gdouble factor, GoatPosition where, gboolean grid)
+ gdouble factor)
 {
 GoatScaleInterface *iface;
 
 iface = GOAT_SCALE_GET_IFACE (self);
 if (iface->draw) {
-iface->draw (self, cr, left, right, top, bottom, nil, factor, where, grid);
+iface->draw (self, cr, left, right, top, bottom, nil, factor);
 } else {
 g_error ("Missing draw handler for GoatScaleInterface!");
 }
@@ -85,3 +85,13 @@ gboolean goat_scale_is_auto_range (GoatScale *self)
 }
 return FALSE;
 }
+
+void goat_scale_grid_show (GoatScale *self, gboolean show)
+{
+GoatScaleInterface *iface;
+
+iface = GOAT_SCALE_GET_IFACE (self);
+if (iface->show_grid) {
+iface->show_grid (self, show);
+}
+}

src/goat-scale-interface.h

@@ -12,14 +12,15 @@ G_DECLARE_INTERFACE (GoatScale, goat_scale, GOAT, SCALE, GObject)
 struct _GoatScaleInterface {
 GTypeInterface parent_iface;
 void (*draw) (GoatScale *self, cairo_t *cr, gint left, gint right, gint top, gint bottom, gdouble nil,
- gdouble factor, GoatPosition where, gboolean grid);
+ gdouble factor);
 void (*render) (GoatScale *self);
 void (*get_range) (GoatScale *self, gdouble *min, gdouble *max);
 void (*set_range) (GoatScale *self, gdouble min, gdouble max);
 void (*update_range) (GoatScale *self, gdouble min, gdouble max);
 void (*set_range_auto) (GoatScale *self);
 void (*set_auto_range) (GoatScale *self);
 gboolean (*is_auto_range) (GoatScale *scale);
+void (*show_grid) (GoatScale *scale, gboolean show);
 };
 
 
@@ -33,14 +34,14 @@ void goat_scale_render (GoatScale *self);
  * does the actual drawing
  */
 void goat_scale_draw (GoatScale *self, cairo_t *cr, gint left, gint right, gint top, gint bottom, gdouble nil,
- gdouble factor, GoatPosition where, gboolean grid);
+ gdouble factor);
 
 void goat_scale_get_range (GoatScale *scale, gdouble *min, gdouble *max);
 void goat_scale_set_range_auto (GoatScale *scale);
 void goat_scale_set_range (GoatScale *scale, gdouble min, gdouble max);
 void goat_scale_update_range (GoatScale *scale, gdouble min, gdouble max);
 gboolean goat_scale_is_auto_range (GoatScale *scale);
-
+void goat_scale_grid_show (GoatScale *scale, gboolean show);
 
 G_END_DECLS
 

src/goat-scale-linear.c

@@ -26,6 +26,8 @@ struct _GoatScaleLinearPrivate {
 gint width_minor;
 gint width_major;
 
+gboolean draw_grid;
+
 GoatOrientation orientation;
 GoatPosition position;
 };
@@ -39,6 +41,7 @@ G_DEFINE_TYPE_WITH_CODE (GoatScaleLinear, goat_scale_linear, G_TYPE_OBJECT,
 enum {
 PROP_0,
 
+PROP_GRID_VISIBLE,
 PROP_ORIENTATION,
 PROP_POSITION,
 
@@ -55,6 +58,9 @@ static void goat_scale_linear_set_property (GObject *object, guint property_id,
 GoatScaleLinearPrivate *priv = goat_scale_linear_get_instance_private (self);
 
 switch (property_id) {
+case PROP_GRID_VISIBLE:
+priv->draw_grid = g_value_get_boolean (value);
+break;
 case PROP_ORIENTATION:
 priv->orientation = g_value_get_enum (value);
 break;
@@ -73,6 +79,9 @@ static void goat_scale_linear_get_property (GObject *object, guint property_id,
 GoatScaleLinearPrivate *priv = goat_scale_linear_get_instance_private (self);
 
 switch (property_id) {
+case PROP_GRID_VISIBLE:
+g_value_set_boolean (value, priv->draw_grid);
+break;
 case PROP_ORIENTATION:
 g_value_set_enum (value, priv->orientation);
 break;
@@ -97,9 +106,12 @@ static void goat_scale_linear_class_init (GoatScaleLinearClass *klass)
 object_class->set_property = goat_scale_linear_set_property;
 object_class->get_property = goat_scale_linear_get_property;
 
+obj_properties[PROP_GRID_VISIBLE] =
+ g_param_spec_boolean ("grid-visible", "Show the grid", "To show or not to show", FALSE, G_PARAM_READWRITE);
+
 obj_properties[PROP_ORIENTATION] =
  g_param_spec_enum ("orientation", "Set orientation property", "Set the orientation ot vertical of horizontal",
- GOAT_TYPE_ORIENTATION, GOAT_ORIENTATION_HORIZONTAL, G_PARAM_READWRITE);
+ GOAT_TYPE_ORIENTATION, GOAT_ORIENTATION_INVALID, G_PARAM_READWRITE);
 obj_properties[PROP_POSITION] =
  g_param_spec_enum ("position", "Set position property", "Set the position to left,right,top or bottom",
  GOAT_TYPE_POSITION, GOAT_POSITION_LEFT, G_PARAM_READWRITE);
@@ -113,6 +125,7 @@ static void goat_scale_linear_init (GoatScaleLinear *self)
 {
 GoatScaleLinearPrivate *priv = self->priv = goat_scale_linear_get_instance_private (self);
 goat_scale_set_range_auto (GOAT_SCALE (self));
+priv->draw_grid = TRUE;
 priv->minors_per_major = 4;
 priv->major_delta = 10.;
 priv->width_minor = 5;
@@ -129,8 +142,8 @@ static void goat_scale_linear_init (GoatScaleLinear *self)
 priv->color_minor_grid.alpha = 0.3;
 priv->color_major_grid = priv->color_major;
 priv->color_major_grid.alpha = 0.3;
-priv->orientation = GOAT_ORIENTATION_HORIZONTAL;
-priv->position = GOAT_POSITION_TOP;
+priv->orientation = GOAT_ORIENTATION_INVALID;
+priv->position = GOAT_POSITION_INVALID;
 }
 
 GoatScaleLinear *goat_scale_linear_new (GoatPosition position, GoatOrientation orientation)
@@ -165,7 +178,7 @@ void goat_scale_linear_set_ticks (GoatScaleLinear *scale, gdouble major, gint mi
  * @param x/y-factor convert unit to pixel
  */
 static void draw (GoatScale *scale, cairo_t *cr, gint left, gint right, gint top, gint bottom, gdouble nil,
- gdouble factor, GoatPosition where, gboolean grid)
+ gdouble factor)
 {
 GoatScaleLinear *self = GOAT_SCALE_LINEAR (scale);
 GoatScaleLinearPrivate *priv = goat_scale_linear_get_instance_private (self);
@@ -183,11 +196,14 @@ static void draw (GoatScale *scale, cairo_t *cr, gint left, gint right, gint top
 GdkRGBA color_minor_grid = priv->color_minor_grid;
 GdkRGBA color_major_grid = priv->color_major_grid;
 
+GoatPosition where = priv->position;
+gboolean grid = priv->draw_grid;
+
 cairo_set_line_width (cr, 1.);
 
-for (i = start; i <= end; i++) {
-const gboolean register majorstip = (i % priv->minors_per_major == 0);
-if (where == GOAT_POSITION_LEFT) {
+if (where == GOAT_POSITION_LEFT) {
+for (i = start; i <= end; i++) {
+const gboolean register majorstip = (i % priv->minors_per_major == 0);
 const double register y = nil + top + step_minor * factor * i;
 if (grid) {
 cairo_move_to (cr, right, y);
@@ -213,7 +229,10 @@ static void draw (GoatScale *scale, cairo_t *cr, gint left, gint right, gint top
 const double register x = left - off;
 goat_util_draw_num (cr, x, y, step_minor * i, where);
 }
-if (where == GOAT_POSITION_RIGHT) {
+}
+if (where == GOAT_POSITION_RIGHT) {
+for (i = start; i <= end; i++) {
+const gboolean register majorstip = (i % priv->minors_per_major == 0);
 const double register y = nil + top + step_minor * factor * i;
 if (grid) {
 cairo_move_to (cr, left, y);
@@ -225,9 +244,9 @@ static void draw (GoatScale *scale, cairo_t *cr, gint left, gint right, gint top
 }
 cairo_stroke (cr);
 }
-cairo_move_to (cr, left, y);
+cairo_move_to (cr, right, y);
 if (majorstip) {
-cairo_line_to (cr, left + width_major, y);
+cairo_line_to (cr, right + width_major, y);
 gdk_cairo_set_source_rgba (cr, &color_major);
 } else {
 cairo_line_to (cr, right + width_minor, y);
@@ -239,7 +258,10 @@ static void draw (GoatScale *scale, cairo_t *cr, gint left, gint right, gint top
 const double register x = right + off;
 goat_util_draw_num (cr, x, y, step_minor * i, where);
 }
-if (where == GOAT_POSITION_BOTTOM) {
+}
+if (where == GOAT_POSITION_BOTTOM) {
+for (i = start; i <= end; i++) {
+const gboolean register majorstip = (i % priv->minors_per_major == 0);
 const double register x = nil + left + step_minor * factor * i;
 if (grid) {
 cairo_move_to (cr, x, top);
@@ -253,19 +275,22 @@ static void draw (GoatScale *scale, cairo_t *cr, gint left, gint right, gint top
 }
 cairo_move_to (cr, x, bottom);
 if (majorstip) {
-cairo_line_to (cr, x, bottom + width_major);
+cairo_line_to (cr, x, top - width_major);
 gdk_cairo_set_source_rgba (cr, &color_major);
 } else {
-cairo_line_to (cr, x, bottom + width_minor);
+cairo_line_to (cr, x, top - width_minor);
 gdk_cairo_set_source_rgba (cr, &color_minor);
 }
 cairo_stroke (cr);
 
 const double off = majorstip ? width_major : width_minor;
-const double register y = bottom + off;
+const double register y = top - off;
 goat_util_draw_num (cr, x, y, step_minor * i, where);
 }
-if (where == GOAT_POSITION_TOP) {
+}
+if (where == GOAT_POSITION_TOP) {
+for (i = start; i <= end; i++) {
+const gboolean register majorstip = (i % priv->minors_per_major == 0);
 const double register x = nil + left + step_minor * factor * i;
 if (grid) {
 cairo_move_to (cr, x, bottom);
@@ -277,19 +302,18 @@ static void draw (GoatScale *scale, cairo_t *cr, gint left, gint right, gint top
 }
 cairo_stroke (cr);
 }
-cairo_move_to (cr, x, top);
+cairo_move_to (cr, x, bottom);
 if (majorstip) {
-cairo_line_to (cr, x, top - width_major);
+cairo_line_to (cr, x, bottom + width_major);
 gdk_cairo_set_source_rgba (cr, &color_major);
 } else {
-cairo_line_to (cr, x, top - width_minor);
+cairo_line_to (cr, x, bottom + width_minor);
 gdk_cairo_set_source_rgba (cr, &color_minor);
 }
 cairo_stroke (cr);
 
 const double off = majorstip ? width_major : width_minor;
-const double register y = top + off;
-goat_util_draw_num (cr, x, y, step_minor * i, where);
+goat_util_draw_num (cr, x, bottom + off, step_minor * i, where);
 }
 }
 }
@@ -349,6 +373,13 @@ static gboolean is_auto_range (GoatScale *scale)
 return self->priv->autorange;
 }
 
+static void show_grid (GoatScale *scale, gboolean show)
+{
+GoatScaleLinear *self = GOAT_SCALE_LINEAR (scale);
+
+self->priv->draw_grid = show;
+}
+
 static void goat_scale_linear_interface_init (GoatScaleInterface *iface)
 {
 iface->draw = draw;
@@ -359,4 +390,5 @@ static void goat_scale_linear_interface_init (GoatScaleInterface *iface)
 iface->update_range = update_range;
 iface->is_auto_range = is_auto_range;
 iface->get_range = get_range;
+iface->show_grid = show_grid;
 }

src/goat-scale-linear.h

@@ -33,9 +33,6 @@ struct _GoatScaleLinearClass {
 GType goat_scale_linear_get_type (void) G_GNUC_CONST;
 GoatScaleLinear *goat_scale_linear_new (GoatPosition position, GoatOrientation orientation);
 
-gboolean goat_scale_linear_draw (GoatScaleLinear *scale, cairo_t *cr, int left, int right, int top, int bottom,
- double nil, gdouble factor, GoatPosition where, gboolean grid);
-
 void goat_scale_linear_set_ticks (GoatScaleLinear *scale, gdouble major_step, gint minors_per_major);
 void goat_scale_linear_set_label (GoatScaleLinear *plot, gchar *label);
 

src/goat-utils.h

@@ -22,36 +22,23 @@ void goat_util_draw_num (cairo_t *cr, double x, double y, double d, GoatPosition
 
 PangoRectangle logrect;
 pango_layout_get_pixel_extents (lay, NULL, &logrect);
-g_print ("logrect//// x=%i y=%i w=%i h=%i\n", logrect.x, logrect.y, logrect.width, logrect.height);
-g_print ("x=%lf y=%lf\n\n", x, y);
 double modifierx, modifiery;
-{
-GEnumClass *enum_class;
-GEnumValue *enum_value;
-
-enum_class = g_type_class_ref (GOAT_TYPE_POSITION);
-enum_value = g_enum_get_value (enum_class, penalty);
-
-g_print ("number where: %s\n", enum_value->value_name);
-
-g_type_class_unref (enum_class);
-}
 switch (penalty) {
 case GOAT_POSITION_BOTTOM:
 modifierx = (double)(logrect.width) * -0.5;
-modifiery = (double)(logrect.height) * -1.;
+modifiery = (double)(logrect.height) * 0.;
 break;
 case GOAT_POSITION_LEFT:
 modifierx = (double)(logrect.width) * -1.0;
 modifiery = (double)(logrect.height) * 0.5;
 break;
 case GOAT_POSITION_RIGHT:
-modifierx = (double)(logrect.width);
+modifierx = (double)(logrect.width) * 0.;
 modifiery = (double)(logrect.height) * 0.5;
 break;
 case GOAT_POSITION_TOP:
-modifierx = (double)(logrect.width)* -0.5;
-modifiery = (double)(logrect.height) * -1.;
+modifierx = (double)(logrect.width) * -0.5;
+modifiery = (double)(logrect.height) * 1.0;
 break;
 }
 cairo_move_to (cr, x + modifierx, y + modifiery);

tests/dynamic.c

@@ -30,14 +30,13 @@ int main (int argc, char *argv[])
 {
 GtkWidget *window;
 GoatPlot *plot;
-int i;
 
 gtk_init (&argc, &argv);
 
 window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
 GoatScale *scale_x = GOAT_SCALE (goat_scale_linear_new (GOAT_POSITION_BOTTOM, GOAT_ORIENTATION_HORIZONTAL));
-GoatScale *scale_y = GOAT_SCALE (goat_scale_linear_new (GOAT_POSITION_LEFT, GOAT_ORIENTATION_VERTICAL));
+GoatScale *scale_y = GOAT_SCALE (goat_scale_linear_new (GOAT_POSITION_RIGHT, GOAT_ORIENTATION_VERTICAL));
 
 plot = goat_plot_new (scale_x, scale_y);