ardour/livetrax
13
0
Fork 0
Code

fix up some basic conceptual errors with canvas-simpleline, mostly relating to coordinate spaces

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@8358 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-12-29 13:46:52 +00:00
parent a48cdf5ba6
commit 6e0330a304
2 changed files with 69 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
gtk2_ardour/canvas-simpleline.c
View File

@ -304,8 +304,62 @@ gnome_canvas_simpleline_update (GnomeCanvasItem *item, double *affine, ArtSVP *c
if (parent_class->update) if (parent_class->update)
(* parent_class->update) (item, affine, clip_path, flags); (* parent_class->update) (item, affine, clip_path, flags);
/* redraw old location */
gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2);
/* get current bounding box in parent-relative world coordinates */
gnome_canvas_simpleline_bounds (item, &x1, &y1, &x2, &y2); gnome_canvas_simpleline_bounds (item, &x1, &y1, &x2, &y2);
gnome_canvas_update_bbox (item, x1, y1, x2, y2);
/* convert parent-relative item coordinates to world coordinates */
gnome_canvas_item_i2w (item, &x1, &y1);
gnome_canvas_item_i2w (item, &x2, &y2);
/* reset item bounding box (canvas coordinates, so integral. but stored in doubles) */
gnome_canvas_w2c_d (GNOME_CANVAS(item->canvas), x1, y1, &item->x1, &item->y1);
gnome_canvas_w2c_d (GNOME_CANVAS(item->canvas), x2, y2, &item->x2, &item->y2);
/* don't suffer from rounding errors */
item->x1 = floor (item->x1);
item->y1 = floor (item->y1);
item->x2 = ceil (item->x2);
item->y2 = ceil (item->y2);
/* force non-zero dimensionality for both axes */
if (item->x1 == item->x2) {
item->x2 += 1.0;
}
if (item->y1 == item->y2) {
item->y2 += 1.0;
}
/* redraw new location */
gnome_canvas_request_redraw (item->canvas, item->x1, item->y1, item->x2, item->y2);
/* store actual line coords as canvas coordinates for use in render() */
x1 = simpleline->x1;
y1 = simpleline->y1;
x2 = simpleline->x2;
y2 = simpleline->y2;
/* convert to world */
gnome_canvas_item_i2w (item, &x1, &y1);
gnome_canvas_item_i2w (item, &x2, &y2);
/* avoid rounding errors */
x1 = (int) floor (item->x1);
y1 = (int) floor (item->y1);
x2 = (int) ceil (item->x2);
y2 = (int) ceil (item->y2);
/* convert to canvas coordinates, integral, stored in integers */
gnome_canvas_w2c (GNOME_CANVAS(item->canvas), x1, y1, &simpleline->cx1, &simpleline->cy1);
gnome_canvas_w2c (GNOME_CANVAS(item->canvas), x2, y2, &simpleline->cx2, &simpleline->cy2);
} }
static void static void
@ -318,9 +372,9 @@ gnome_canvas_simpleline_render (GnomeCanvasItem *item,
simpleline = GNOME_CANVAS_SIMPLELINE (item); simpleline = GNOME_CANVAS_SIMPLELINE (item);
x1 = rint (simpleline->x1); x1 = simpleline->cx1;
x2 = rint (simpleline->x2); x2 = simpleline->cx2;
y1 = (int) rint (simpleline->y1); y1 = simpleline->cy1;
if (buf->is_bg) { if (buf->is_bg) {
gnome_canvas_buf_ensure_buf (buf); gnome_canvas_buf_ensure_buf (buf);
@ -331,8 +385,8 @@ gnome_canvas_simpleline_render (GnomeCanvasItem *item,
PAINT_HORIZA(buf, simpleline->r, simpleline->g, simpleline->b, simpleline->a, PAINT_HORIZA(buf, simpleline->r, simpleline->g, simpleline->b, simpleline->a,
x1, x2, y1); x1, x2, y1);
} else { } else {
y2 = (int) rint (simpleline->y2); y2 = simpleline->cy2;
PAINT_VERTA(buf, simpleline->r, simpleline->g, simpleline->b, simpleline->a, PAINT_VERTA (buf, simpleline->r, simpleline->g, simpleline->b, simpleline->a,
x1, y1, y2); x1, y1, y2);
} }
@ -356,19 +410,10 @@ gnome_canvas_simpleline_bounds (GnomeCanvasItem *item, double *x1, double *y1, d
{ {
GnomeCanvasSimpleLine *simpleline = GNOME_CANVAS_SIMPLELINE (item); GnomeCanvasSimpleLine *simpleline = GNOME_CANVAS_SIMPLELINE (item);
if (simpleline->x1 != simpleline->x2) { *x1 = simpleline->x1;
/* horizontal */ *y1 = simpleline->y1;
*x1 = floor (simpleline->x1); *x2 = simpleline->x1;
*y1 = floor (simpleline->y1); *y2 = simpleline->y2;
*x2 = ceil (simpleline->x2);
*y2 = ceil (simpleline->y1 + 1);
} else {
/* vertical */
*x1 = floor (simpleline->x1);
*y1 = floor (simpleline->y1);
*x2 = ceil (simpleline->x1 + 1);
*y2 = ceil (simpleline->y2);
}
} }
static double static double

3
gtk2_ardour/canvas-simpleline.h
View File

@ -44,7 +44,8 @@ typedef struct _GnomeCanvasSimpleLineClass GnomeCanvasSimpleLineClass;
struct _GnomeCanvasSimpleLine struct _GnomeCanvasSimpleLine
{ {
GnomeCanvasItem item; GnomeCanvasItem item;
double x1, y1, x2, y2; double x1, y1, x2, y2; /* parent-relative, world coordinates */
gint32 cx1, cy1, cx2, cy2; /* global, canvas coordinates */
uint32_t color; uint32_t color;
/* cached values set during update/used during render */ /* cached values set during update/used during render */