aboutsummaryrefslogtreecommitdiff
path: root/grid.c
diff options
context:
space:
mode:
Diffstat (limited to 'grid.c')
-rw-r--r--grid.c640
1 files changed, 324 insertions, 316 deletions
diff --git a/grid.c b/grid.c
index bfa4cec..4759543 100644
--- a/grid.c
+++ b/grid.c
@@ -64,30 +64,30 @@ static char *grid_version = "grid: version 0.8, written by Yves Degoyon (ydego
/* drawing functions */
static void grid_draw_update(t_grid *x, t_glist *glist)
{
- t_canvas *canvas=glist_getcanvas(glist);
- t_int xpoint=x->x_current, ypoint=x->y_current;
+ t_canvas *canvas=glist_getcanvas(glist);
+ t_int xpoint=x->x_current, ypoint=x->y_current;
- // later : try to figure out what's this test for ??
+ // later : try to figure out what's this test for ??
// if (glist_isvisible(glist))
// {
- // delete previous point if existing
- if (x->x_point)
- {
- GRID_SYS_VGUI3(".x%lx.c delete %lxPOINT\n", canvas, x);
- }
-
- if ( x->x_current < text_xpix(&x->x_obj, glist) ) xpoint = text_xpix(&x->x_obj, glist);
- if ( x->x_current > text_xpix(&x->x_obj, glist) + x->x_width - pointsize )
- xpoint = text_xpix(&x->x_obj, glist) + x->x_width - pointsize;
- if ( x->y_current < text_ypix(&x->x_obj, glist) ) ypoint = text_ypix(&x->x_obj, glist);
- if ( x->y_current > text_ypix(&x->x_obj, glist) + x->x_height - pointsize )
- ypoint = text_ypix(&x->x_obj, glist) + x->x_height - pointsize;
- // draw the selected point
- GRID_SYS_VGUI7(".x%lx.c create rectangle %d %d %d %d -fill #FF0000 -tags %lxPOINT\n",
- canvas, xpoint, ypoint, xpoint+pointsize, ypoint+pointsize, x);
- x->x_point = 1;
- // }
- // else
+ // delete previous point if existing
+ if (x->x_point)
+ {
+ GRID_SYS_VGUI3(".x%lx.c delete %lxPOINT\n", canvas, x);
+ }
+
+ if ( x->x_current < text_xpix(&x->x_obj, glist) ) xpoint = text_xpix(&x->x_obj, glist);
+ if ( x->x_current > text_xpix(&x->x_obj, glist) + x->x_width - pointsize )
+ xpoint = text_xpix(&x->x_obj, glist) + x->x_width - pointsize;
+ if ( x->y_current < text_ypix(&x->x_obj, glist) ) ypoint = text_ypix(&x->x_obj, glist);
+ if ( x->y_current > text_ypix(&x->x_obj, glist) + x->x_height - pointsize )
+ ypoint = text_ypix(&x->x_obj, glist) + x->x_height - pointsize;
+ // draw the selected point
+ GRID_SYS_VGUI7(".x%lx.c create rectangle %d %d %d %d -fill #FF0000 -tags %lxPOINT\n",
+ canvas, xpoint, ypoint, xpoint+pointsize, ypoint+pointsize, x);
+ x->x_point = 1;
+ // }
+ // else
// {
// post( "grid : position updated in an invisible grid" );
// }
@@ -95,142 +95,142 @@ static void grid_draw_update(t_grid *x, t_glist *glist)
static void grid_draw_new(t_grid *x, t_glist *glist)
{
- t_canvas *canvas=glist_getcanvas(glist);
+ t_canvas *canvas=glist_getcanvas(glist);
GRID_SYS_VGUI8(".x%lx.c create rectangle %d %d %d %d -fill %s -tags %lxGRID\n",
- canvas, text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist),
- text_xpix(&x->x_obj, glist) + x->x_width, text_ypix(&x->x_obj, glist) + x->x_height,
- x->x_bgcolor, x);
+ canvas, text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist),
+ text_xpix(&x->x_obj, glist) + x->x_width, text_ypix(&x->x_obj, glist) + x->x_height,
+ x->x_bgcolor, x);
GRID_SYS_VGUI7(".x%lx.c create rectangle %d %d %d %d -tags %lxo0\n",
- canvas, text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist) + x->x_height+1,
- text_xpix(&x->x_obj, glist)+7, text_ypix(&x->x_obj, glist) + x->x_height+2,
- x);
+ canvas, text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist) + x->x_height+1,
+ text_xpix(&x->x_obj, glist)+7, text_ypix(&x->x_obj, glist) + x->x_height+2,
+ x);
GRID_SYS_VGUI7(".x%lx.c create rectangle %d %d %d %d -tags %lxo1\n",
- canvas, text_xpix(&x->x_obj, glist)+x->x_width-7, text_ypix(&x->x_obj, glist) + x->x_height+1,
- text_xpix(&x->x_obj, glist)+x->x_width, text_ypix(&x->x_obj, glist) + x->x_height+2,
- x);
+ canvas, text_xpix(&x->x_obj, glist)+x->x_width-7, text_ypix(&x->x_obj, glist) + x->x_height+1,
+ text_xpix(&x->x_obj, glist)+x->x_width, text_ypix(&x->x_obj, glist) + x->x_height+2,
+ x);
- if ( x->x_grid )
+ if ( x->x_grid )
{
- int xlpos = text_xpix(&x->x_obj, glist)+x->x_width/x->x_xlines;
- int ylpos = text_ypix(&x->x_obj, glist)+x->x_height/x->x_ylines;
- int xcount = 1;
- int ycount = 1;
- while ( xlpos < text_xpix(&x->x_obj, glist)+x->x_width )
- {
- GRID_SYS_VGUI9(".x%lx.c create line %d %d %d %d -fill #FFFFFF -tags %lxLINE%d%d\n",
- canvas, xlpos, text_ypix(&x->x_obj, glist),
- xlpos, text_ypix(&x->x_obj, glist)+x->x_height,
- x, xcount, 0 );
- xlpos+=x->x_width/x->x_xlines;
- xcount++;
- }
- while ( ylpos < text_ypix(&x->x_obj, glist)+x->x_height )
- {
- GRID_SYS_VGUI9(".x%lx.c create line %d %d %d %d -fill #FFFFFF -tags %lxLINE%d%d\n",
- canvas, text_xpix(&x->x_obj, glist), ylpos,
- text_xpix(&x->x_obj, glist)+x->x_width, ylpos,
- x, 0, ycount);
- ylpos+=x->x_height/x->x_ylines;
- ycount++;
- }
+ int xlpos = text_xpix(&x->x_obj, glist)+x->x_width/x->x_xlines;
+ int ylpos = text_ypix(&x->x_obj, glist)+x->x_height/x->x_ylines;
+ int xcount = 1;
+ int ycount = 1;
+ while ( xlpos < text_xpix(&x->x_obj, glist)+x->x_width )
+ {
+ GRID_SYS_VGUI9(".x%lx.c create line %d %d %d %d -fill #FFFFFF -tags %lxLINE%d%d\n",
+ canvas, xlpos, text_ypix(&x->x_obj, glist),
+ xlpos, text_ypix(&x->x_obj, glist)+x->x_height,
+ x, xcount, 0 );
+ xlpos+=x->x_width/x->x_xlines;
+ xcount++;
+ }
+ while ( ylpos < text_ypix(&x->x_obj, glist)+x->x_height )
+ {
+ GRID_SYS_VGUI9(".x%lx.c create line %d %d %d %d -fill #FFFFFF -tags %lxLINE%d%d\n",
+ canvas, text_xpix(&x->x_obj, glist), ylpos,
+ text_xpix(&x->x_obj, glist)+x->x_width, ylpos,
+ x, 0, ycount);
+ ylpos+=x->x_height/x->x_ylines;
+ ycount++;
+ }
}
canvas_fixlinesfor( canvas, (t_text*)x );
}
static void grid_draw_move(t_grid *x, t_glist *glist)
{
- t_canvas *canvas=glist_getcanvas(glist);
+ t_canvas *canvas=glist_getcanvas(glist);
GRID_SYS_VGUI7(".x%lx.c coords %lxGRID %d %d %d %d\n",
- canvas, x,
- text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist),
- text_xpix(&x->x_obj, glist)+x->x_width, text_ypix(&x->x_obj, glist)+x->x_height);
+ canvas, x,
+ text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist),
+ text_xpix(&x->x_obj, glist)+x->x_width, text_ypix(&x->x_obj, glist)+x->x_height);
GRID_SYS_VGUI7(".x%lx.c coords %lxo0 %d %d %d %d\n",
- canvas, x,
- text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist) + x->x_height+1,
- text_xpix(&x->x_obj, glist)+7, text_ypix(&x->x_obj, glist) + x->x_height+2 );
+ canvas, x,
+ text_xpix(&x->x_obj, glist), text_ypix(&x->x_obj, glist) + x->x_height+1,
+ text_xpix(&x->x_obj, glist)+7, text_ypix(&x->x_obj, glist) + x->x_height+2 );
GRID_SYS_VGUI7(".x%lx.c coords %lxo1 %d %d %d %d\n",
- canvas, x,
- text_xpix(&x->x_obj, glist)+x->x_width-7, text_ypix(&x->x_obj, glist) + x->x_height+1,
- text_xpix(&x->x_obj, glist)+x->x_width, text_ypix(&x->x_obj, glist) + x->x_height+2 );
- if ( x->x_point )
+ canvas, x,
+ text_xpix(&x->x_obj, glist)+x->x_width-7, text_ypix(&x->x_obj, glist) + x->x_height+1,
+ text_xpix(&x->x_obj, glist)+x->x_width, text_ypix(&x->x_obj, glist) + x->x_height+2 );
+ if ( x->x_point )
{
- grid_draw_update(x, glist);
+ grid_draw_update(x, glist);
}
- if ( x->x_grid )
+ if ( x->x_grid )
{
- int xlpos = text_xpix(&x->x_obj, glist)+x->x_width/x->x_xlines;
- int ylpos = text_ypix(&x->x_obj, glist)+x->x_height/x->x_ylines;
- int xcount = 1;
- int ycount = 1;
- while ( xlpos < text_xpix(&x->x_obj, glist)+x->x_width )
- {
- GRID_SYS_VGUI9(".x%lx.c coords %lxLINE%d%d %d %d %d %d\n",
- canvas, x, xcount, 0, xlpos, text_ypix(&x->x_obj, glist),
- xlpos, text_ypix(&x->x_obj, glist) + x->x_height);
- xlpos+=x->x_width/x->x_xlines;
- xcount++;
- }
- while ( ylpos < text_ypix(&x->x_obj, glist)+x->x_height )
- {
- GRID_SYS_VGUI9(".x%lx.c coords %lxLINE%d%d %d %d %d %d\n",
- canvas, x, 0, ycount, text_xpix(&x->x_obj, glist), ylpos,
- text_xpix(&x->x_obj, glist) + x->x_width, ylpos);
- ylpos+=x->x_height/x->x_ylines;
- ycount++;
- }
+ int xlpos = text_xpix(&x->x_obj, glist)+x->x_width/x->x_xlines;
+ int ylpos = text_ypix(&x->x_obj, glist)+x->x_height/x->x_ylines;
+ int xcount = 1;
+ int ycount = 1;
+ while ( xlpos < text_xpix(&x->x_obj, glist)+x->x_width )
+ {
+ GRID_SYS_VGUI9(".x%lx.c coords %lxLINE%d%d %d %d %d %d\n",
+ canvas, x, xcount, 0, xlpos, text_ypix(&x->x_obj, glist),
+ xlpos, text_ypix(&x->x_obj, glist) + x->x_height);
+ xlpos+=x->x_width/x->x_xlines;
+ xcount++;
+ }
+ while ( ylpos < text_ypix(&x->x_obj, glist)+x->x_height )
+ {
+ GRID_SYS_VGUI9(".x%lx.c coords %lxLINE%d%d %d %d %d %d\n",
+ canvas, x, 0, ycount, text_xpix(&x->x_obj, glist), ylpos,
+ text_xpix(&x->x_obj, glist) + x->x_width, ylpos);
+ ylpos+=x->x_height/x->x_ylines;
+ ycount++;
+ }
}
canvas_fixlinesfor( canvas, (t_text*)x );
}
static void grid_draw_erase(t_grid* x,t_glist* glist)
{
- t_canvas *canvas=glist_getcanvas(glist);
- int i;
+ t_canvas *canvas=glist_getcanvas(glist);
+ int i;
GRID_SYS_VGUI3(".x%lx.c delete %lxGRID\n", canvas, x);
GRID_SYS_VGUI3(".x%lx.c delete %lxo0\n", canvas, x);
GRID_SYS_VGUI3(".x%lx.c delete %lxo1\n", canvas, x);
- if (x->x_grid)
+ if (x->x_grid)
{
- for (i=1; i<x->x_xlines; i++ )
- {
- GRID_SYS_VGUI4(".x%lx.c delete %lxLINE%d0\n", canvas, x, i);
- }
- for (i=1; i<x->x_ylines; i++ )
- {
- GRID_SYS_VGUI4(".x%lx.c delete %lxLINE0%d\n", canvas, x, i);
- }
+ for (i=1; i<x->x_xlines; i++ )
+ {
+ GRID_SYS_VGUI4(".x%lx.c delete %lxLINE%d0\n", canvas, x, i);
+ }
+ for (i=1; i<x->x_ylines; i++ )
+ {
+ GRID_SYS_VGUI4(".x%lx.c delete %lxLINE0%d\n", canvas, x, i);
+ }
}
- if (x->x_point)
+ if (x->x_point)
{
- GRID_SYS_VGUI3(".x%lx.c delete %lxPOINT\n", canvas, x);
- x->x_point = 0;
+ GRID_SYS_VGUI3(".x%lx.c delete %lxPOINT\n", canvas, x);
+ x->x_point = 0;
}
}
static void grid_draw_select(t_grid* x,t_glist* glist)
{
- t_canvas *canvas=glist_getcanvas(glist);
+ t_canvas *canvas=glist_getcanvas(glist);
if(x->x_selected)
{
- pd_bind(&x->x_obj.ob_pd, x->x_name);
+ pd_bind(&x->x_obj.ob_pd, x->x_name);
/* sets the item in blue */
- GRID_SYS_VGUI3(".x%lx.c itemconfigure %lxGRID -outline #0000FF\n", canvas, x);
+ GRID_SYS_VGUI3(".x%lx.c itemconfigure %lxGRID -outline #0000FF\n", canvas, x);
}
else
{
- pd_unbind(&x->x_obj.ob_pd, x->x_name);
- GRID_SYS_VGUI3(".x%lx.c itemconfigure %lxGRID -outline #000000\n", canvas, x);
+ pd_unbind(&x->x_obj.ob_pd, x->x_name);
+ GRID_SYS_VGUI3(".x%lx.c itemconfigure %lxGRID -outline #000000\n", canvas, x);
}
}
static void grid_output_current(t_grid* x)
{
- t_float xvalue, yvalue;
- t_float xmodstep, ymodstep;
+ t_float xvalue, yvalue;
+ t_float xmodstep, ymodstep;
xvalue = x->x_min + (x->x_current - text_xpix(&x->x_obj, x->x_glist)) * (x->x_max-x->x_min) / x->x_width ;
if (xvalue < x->x_min ) xvalue = x->x_min;
@@ -251,103 +251,105 @@ static void grid_output_current(t_grid* x)
static void grid_getrect(t_gobj *z, t_glist *owner,
- int *xp1, int *yp1, int *xp2, int *yp2)
+ int *xp1, int *yp1, int *xp2, int *yp2)
{
- t_grid* x = (t_grid*)z;
+ t_grid* x = (t_grid*)z;
- *xp1 = text_xpix(&x->x_obj, x->x_glist);
- *yp1 = text_ypix(&x->x_obj, x->x_glist);
- *xp2 = text_xpix(&x->x_obj, x->x_glist)+x->x_width;
- *yp2 = text_ypix(&x->x_obj, x->x_glist)+x->x_height;
+ *xp1 = text_xpix(&x->x_obj, x->x_glist);
+ *yp1 = text_ypix(&x->x_obj, x->x_glist);
+ *xp2 = text_xpix(&x->x_obj, x->x_glist)+x->x_width;
+ *yp2 = text_ypix(&x->x_obj, x->x_glist)+x->x_height;
}
static void grid_save(t_gobj *z, t_binbuf *b)
{
- t_grid *x = (t_grid *)z;
-
- // post( "saving grid : %s", x->x_name->s_name );
- binbuf_addv(b, "ssiissiffiffiffiiff", gensym("#X"),gensym("obj"),
- (t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix,
- atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
- x->x_name, x->x_width, x->x_min,
- x->x_max, x->x_height,
+ t_grid *x = (t_grid *)z;
+
+ // post( "saving grid : %s", x->x_name->s_name );
+ binbuf_addv(b, "ssiissiffiffiffiiff", gensym("#X"),gensym("obj"),
+ (t_int)x->x_obj.te_xpix, (t_int)x->x_obj.te_ypix,
+ atom_getsymbol(binbuf_getvec(x->x_obj.te_binbuf)),
+ x->x_name, x->x_width, x->x_min,
+ x->x_max, x->x_height,
x->y_min, x->y_max,
- x->x_grid, x->x_xstep,
- x->x_ystep, x->x_xlines, x->x_ylines,
+ x->x_grid, x->x_xstep,
+ x->x_ystep, x->x_xlines, x->x_ylines,
x->x_current, x->y_current );
- binbuf_addv(b, ";");
+ binbuf_addv(b, ";");
}
static void grid_properties(t_gobj *z, t_glist *owner)
{
- char buf[800];
- t_grid *x=(t_grid *)z;
+ char buf[800];
+ t_grid *x=(t_grid *)z;
- sprintf(buf, "pdtk_grid_dialog %%s %s %d %.2f %.2f %d %.2f %.2f %d %.2f %.2f %d %d\n",
- x->x_name->s_name, x->x_width, x->x_min, x->x_max, x->x_height,
+ sprintf(buf, "pdtk_grid_dialog %%s %s %d %.2f %.2f %d %.2f %.2f %d %.2f %.2f %d %d\n",
+ x->x_name->s_name, x->x_width, x->x_min, x->x_max, x->x_height,
x->y_min, x->y_max, x->x_grid, x->x_xstep, x->x_ystep,
x->x_xlines, x->x_ylines );
- // post("grid_properties : %s", buf );
- gfxstub_new(&x->x_obj.ob_pd, x, buf);
+ // post("grid_properties : %s", buf );
+ gfxstub_new(&x->x_obj.ob_pd, x, buf);
}
static void grid_select(t_gobj *z, t_glist *glist, int selected)
{
- t_grid *x = (t_grid *)z;
+ t_grid *x = (t_grid *)z;
- x->x_selected = selected;
- grid_draw_select( x, glist );
+ x->x_selected = selected;
+ grid_draw_select( x, glist );
}
static void grid_vis(t_gobj *z, t_glist *glist, int vis)
{
- t_grid *x = (t_grid *)z;
-
- if (vis)
- {
- grid_draw_new( x, glist );
- grid_draw_update( x, glist );
- grid_output_current(x);
- }
- else
- {
- grid_draw_erase( x, glist );
- }
+ t_grid *x = (t_grid *)z;
+
+ if (vis)
+ {
+ grid_draw_new( x, glist );
+ grid_draw_update( x, glist );
+ grid_output_current(x);
+ }
+ else
+ {
+ grid_draw_erase( x, glist );
+ }
}
static void grid_dialog(t_grid *x, t_symbol *s, int argc, t_atom *argv)
{
- if ( !x ) {
- post( "grid : error :tried to set properties on an unexisting object" );
- }
- if ( argc != 12 )
- {
- pd_error(x, "grid : error in the number of arguments ( %d instead of 12 )", argc );
- return;
- }
- if ( argv[0].a_type != A_SYMBOL || argv[1].a_type != A_FLOAT ||
- argv[2].a_type != A_FLOAT || argv[3].a_type != A_FLOAT ||
- argv[4].a_type != A_FLOAT || argv[5].a_type != A_FLOAT ||
- argv[6].a_type != A_FLOAT || argv[7].a_type != A_FLOAT ||
- argv[8].a_type != A_FLOAT || argv[9].a_type != A_FLOAT ||
- argv[10].a_type != A_FLOAT || argv[11].a_type != A_FLOAT ) {
- pd_error(x, "grid : wrong arguments" );
- return;
- }
- x->x_name = argv[0].a_w.w_symbol;
- x->x_width = (int)argv[1].a_w.w_float;
- x->x_min = argv[2].a_w.w_float;
- x->x_max = argv[3].a_w.w_float;
- x->x_height = (int)argv[4].a_w.w_float;
- x->y_min = argv[5].a_w.w_float;
- x->y_max = argv[6].a_w.w_float;
- x->x_grid = argv[7].a_w.w_float;
- x->x_xstep = argv[8].a_w.w_float;
- x->x_ystep = argv[9].a_w.w_float;
- x->x_xlines = argv[10].a_w.w_float;
- x->x_ylines = argv[11].a_w.w_float;
- grid_draw_erase(x, x->x_glist);
- grid_draw_new(x, x->x_glist);
+ if ( !x )
+ {
+ post( "grid : error :tried to set properties on an unexisting object" );
+ }
+ if ( argc != 12 )
+ {
+ pd_error(x, "grid : error in the number of arguments ( %d instead of 12 )", argc );
+ return;
+ }
+ if ( argv[0].a_type != A_SYMBOL || argv[1].a_type != A_FLOAT ||
+ argv[2].a_type != A_FLOAT || argv[3].a_type != A_FLOAT ||
+ argv[4].a_type != A_FLOAT || argv[5].a_type != A_FLOAT ||
+ argv[6].a_type != A_FLOAT || argv[7].a_type != A_FLOAT ||
+ argv[8].a_type != A_FLOAT || argv[9].a_type != A_FLOAT ||
+ argv[10].a_type != A_FLOAT || argv[11].a_type != A_FLOAT )
+ {
+ pd_error(x, "grid : wrong arguments" );
+ return;
+ }
+ x->x_name = argv[0].a_w.w_symbol;
+ x->x_width = (int)argv[1].a_w.w_float;
+ x->x_min = argv[2].a_w.w_float;
+ x->x_max = argv[3].a_w.w_float;
+ x->x_height = (int)argv[4].a_w.w_float;
+ x->y_min = argv[5].a_w.w_float;
+ x->y_max = argv[6].a_w.w_float;
+ x->x_grid = argv[7].a_w.w_float;
+ x->x_xstep = argv[8].a_w.w_float;
+ x->x_ystep = argv[9].a_w.w_float;
+ x->x_xlines = argv[10].a_w.w_float;
+ x->x_ylines = argv[11].a_w.w_float;
+ grid_draw_erase(x, x->x_glist);
+ grid_draw_new(x, x->x_glist);
}
static void grid_delete(t_gobj *z, t_glist *glist)
@@ -369,7 +371,7 @@ static void grid_displace(t_gobj *z, t_glist *glist, int dx, int dy)
x->y_current += dy;
if(xold != text_xpix(&x->x_obj, glist) || yold != text_ypix(&x->x_obj, glist))
{
- grid_draw_move(x, x->x_glist);
+ grid_draw_move(x, x->x_glist);
}
}
@@ -385,24 +387,24 @@ static void grid_motion(t_grid *x, t_floatarg dx, t_floatarg dy)
if(xold != x->x_current || yold != x->y_current)
{
grid_output_current(x);
- grid_draw_update(x, x->x_glist);
+ grid_draw_update(x, x->x_glist);
}
}
static int grid_click(t_gobj *z, struct _glist *glist,
- int xpix, int ypix, int shift, int alt, int dbl, int doit)
+ int xpix, int ypix, int shift, int alt, int dbl, int doit)
{
t_grid* x = (t_grid *)z;
// post( "grid_click doit=%d x=%d y=%d", doit, xpix, ypix );
- if ( doit)
+ if ( doit)
{
- x->x_current = xpix;
- x->y_current = ypix;
- grid_output_current(x);
- grid_draw_update(x, glist);
- glist_grab(glist, &x->x_obj.te_g, (t_glistmotionfn)grid_motion,
- 0, xpix, ypix);
+ x->x_current = xpix;
+ x->y_current = ypix;
+ grid_output_current(x);
+ grid_draw_update(x, glist);
+ glist_grab(glist, &x->x_obj.te_g, (t_glistmotionfn)grid_motion,
+ 0, xpix, ypix);
}
return (1);
}
@@ -468,112 +470,117 @@ static void grid_new_color(t_grid *x, t_floatarg color1, t_floatarg color2, t_fl
static void grid_values(t_grid* x, t_floatarg xvalue, t_floatarg yvalue)
{
- int xold = x->x_current;
- int yold = x->y_current;
+ int xold = x->x_current;
+ int yold = x->y_current;
- if (xvalue < x->x_min ) xvalue = x->x_min;
- if (xvalue > x->x_max ) xvalue = x->x_max;
+ if (xvalue < x->x_min ) xvalue = x->x_min;
+ if (xvalue > x->x_max ) xvalue = x->x_max;
- x->x_current = text_xpix(&x->x_obj, x->x_glist) + ((xvalue - x->x_min) / x->x_max) * x->x_width;
+ x->x_current = text_xpix(&x->x_obj, x->x_glist) + ((xvalue - x->x_min) / x->x_max) * x->x_width;
- if (yvalue < x->y_min ) yvalue = x->y_min;
- if (yvalue > x->y_max ) yvalue = x->y_max;
+ if (yvalue < x->y_min ) yvalue = x->y_min;
+ if (yvalue > x->y_max ) yvalue = x->y_max;
- x->y_current = text_ypix(&x->x_obj, x->x_glist) + (1 - ((yvalue - x->y_min) / x->y_max)) * x->x_height;
+ x->y_current = text_ypix(&x->x_obj, x->x_glist) + (1 - ((yvalue - x->y_min) / x->y_max)) * x->x_height;
- if(xold != x->x_current || yold != x->y_current) {
+ if(xold != x->x_current || yold != x->y_current)
+ {
grid_output_current(x);
grid_draw_update(x, x->x_glist);
- }
+ }
}
static void grid_xvalues(t_grid* x, t_floatarg xvalue, t_floatarg yvalue)
{
- int xold = x->x_current;
- int yold = x->y_current;
+ int xold = x->x_current;
+ int yold = x->y_current;
- if (xvalue < x->x_min ) xvalue = x->x_min;
- if (xvalue > x->x_max ) xvalue = x->x_max;
+ if (xvalue < x->x_min ) xvalue = x->x_min;
+ if (xvalue > x->x_max ) xvalue = x->x_max;
- x->x_current = text_xpix(&x->x_obj, x->x_glist) + ((xvalue - x->x_min) / x->x_max) * x->x_width;
+ x->x_current = text_xpix(&x->x_obj, x->x_glist) + ((xvalue - x->x_min) / x->x_max) * x->x_width;
- if (yvalue < x->y_min ) yvalue = x->y_min;
- if (yvalue > x->y_max ) yvalue = x->y_max;
+ if (yvalue < x->y_min ) yvalue = x->y_min;
+ if (yvalue > x->y_max ) yvalue = x->y_max;
- x->y_current = text_ypix(&x->x_obj, x->x_glist) + (1 - ((yvalue - x->y_min) / x->y_max)) * x->x_height;
+ x->y_current = text_ypix(&x->x_obj, x->x_glist) + (1 - ((yvalue - x->y_min) / x->y_max)) * x->x_height;
- if(xold != x->x_current || yold != x->y_current) {
+ if(xold != x->x_current || yold != x->y_current)
+ {
grid_draw_update(x, x->x_glist);
- }
+ }
}
static void grid_valuemotion(t_grid* x, t_floatarg dx, t_floatarg dy)
{
- int xold = x->x_current;
- int yold = x->y_current;
- t_float xvalue, yvalue;
+ int xold = x->x_current;
+ int yold = x->y_current;
+ t_float xvalue, yvalue;
- xvalue = x->x_min + (x->x_current - text_xpix(&x->x_obj, x->x_glist)) * (x->x_max-x->x_min) / x->x_width ;
- if (xvalue < x->x_min ) xvalue = x->x_min;
- if (xvalue > x->x_max ) xvalue = x->x_max;
+ xvalue = x->x_min + (x->x_current - text_xpix(&x->x_obj, x->x_glist)) * (x->x_max-x->x_min) / x->x_width ;
+ if (xvalue < x->x_min ) xvalue = x->x_min;
+ if (xvalue > x->x_max ) xvalue = x->x_max;
- yvalue = x->y_max - (x->y_current - text_ypix(&x->x_obj, x->x_glist) ) * (x->y_max-x->y_min) / x->x_height ;
- if (yvalue < x->y_min ) yvalue = x->y_min;
- if (yvalue > x->y_max ) yvalue = x->y_max;
+ yvalue = x->y_max - (x->y_current - text_ypix(&x->x_obj, x->x_glist) ) * (x->y_max-x->y_min) / x->x_height ;
+ if (yvalue < x->y_min ) yvalue = x->y_min;
+ if (yvalue > x->y_max ) yvalue = x->y_max;
- xvalue += dx;
- yvalue += dy;
+ xvalue += dx;
+ yvalue += dy;
- if (xvalue < x->x_min ) xvalue = x->x_min;
- if (xvalue > x->x_max ) xvalue = x->x_max;
+ if (xvalue < x->x_min ) xvalue = x->x_min;
+ if (xvalue > x->x_max ) xvalue = x->x_max;
- x->x_current = text_xpix(&x->x_obj, x->x_glist) + ((xvalue - x->x_min) / x->x_max) * x->x_width;
+ x->x_current = text_xpix(&x->x_obj, x->x_glist) + ((xvalue - x->x_min) / x->x_max) * x->x_width;
- if (yvalue < x->y_min ) yvalue = x->y_min;
- if (yvalue > x->y_max ) yvalue = x->y_max;
+ if (yvalue < x->y_min ) yvalue = x->y_min;
+ if (yvalue > x->y_max ) yvalue = x->y_max;
- x->y_current = text_ypix(&x->x_obj, x->x_glist) + (1 - ((yvalue - x->y_min) / x->y_max)) * x->x_height;
+ x->y_current = text_ypix(&x->x_obj, x->x_glist) + (1 - ((yvalue - x->y_min) / x->y_max)) * x->x_height;
- if(xold != x->x_current || yold != x->y_current) {
+ if(xold != x->x_current || yold != x->y_current)
+ {
grid_output_current(x);
grid_draw_update(x, x->x_glist);
- }
+ }
}
static void grid_xvaluemotion(t_grid* x, t_floatarg dx, t_floatarg dy)
{
- int xold = x->x_current;
- int yold = x->y_current;
- t_float xvalue, yvalue;
+ int xold = x->x_current;
+ int yold = x->y_current;
+ t_float xvalue, yvalue;
- xvalue = x->x_min + (x->x_current - text_xpix(&x->x_obj, x->x_glist)) * (x->x_max-x->x_min) / x->x_width ;
- if (xvalue < x->x_min ) xvalue = x->x_min;
- if (xvalue > x->x_max ) xvalue = x->x_max;
+ xvalue = x->x_min + (x->x_current - text_xpix(&x->x_obj, x->x_glist)) * (x->x_max-x->x_min) / x->x_width ;
+ if (xvalue < x->x_min ) xvalue = x->x_min;
+ if (xvalue > x->x_max ) xvalue = x->x_max;
- yvalue = x->y_max - (x->y_current - text_ypix(&x->x_obj, x->x_glist) ) * (x->y_max-x->y_min) / x->x_height ;
- if (yvalue < x->y_min ) yvalue = x->y_min;
- if (yvalue > x->y_max ) yvalue = x->y_max;
+ yvalue = x->y_max - (x->y_current - text_ypix(&x->x_obj, x->x_glist) ) * (x->y_max-x->y_min) / x->x_height ;
+ if (yvalue < x->y_min ) yvalue = x->y_min;
+ if (yvalue > x->y_max ) yvalue = x->y_max;
- xvalue += dx;
- yvalue += dy;
+ xvalue += dx;
+ yvalue += dy;
- if (xvalue < x->x_min ) xvalue = x->x_min;
- if (xvalue > x->x_max ) xvalue = x->x_max;
+ if (xvalue < x->x_min ) xvalue = x->x_min;
+ if (xvalue > x->x_max ) xvalue = x->x_max;
- x->x_current = text_xpix(&x->x_obj, x->x_glist) + ((xvalue - x->x_min) / x->x_max) * x->x_width;
+ x->x_current = text_xpix(&x->x_obj, x->x_glist) + ((xvalue - x->x_min) / x->x_max) * x->x_width;
- if (yvalue < x->y_min ) yvalue = x->y_min;
- if (yvalue > x->y_max ) yvalue = x->y_max;
+ if (yvalue < x->y_min ) yvalue = x->y_min;
+ if (yvalue > x->y_max ) yvalue = x->y_max;
- x->y_current = text_ypix(&x->x_obj, x->x_glist) + (1 - ((yvalue - x->y_min) / x->y_max)) * x->x_height;
+ x->y_current = text_ypix(&x->x_obj, x->x_glist) + (1 - ((yvalue - x->y_min) / x->y_max)) * x->x_height;
- if(xold != x->x_current || yold != x->y_current) {
+ if(xold != x->x_current || yold != x->y_current)
+ {
grid_draw_update(x, x->x_glist);
- }
+ }
}
-static void grid_bang(t_grid *x) {
- grid_output_current(x);
+static void grid_bang(t_grid *x)
+{
+ grid_output_current(x);
}
static t_grid *grid_new(t_symbol *s, int argc, t_atom *argv)
@@ -581,87 +588,88 @@ static t_grid *grid_new(t_symbol *s, int argc, t_atom *argv)
int zz;
t_grid *x;
char *str;
-
+
// post( "grid_new : create : %s argc =%d", s->s_name, argc );
x = (t_grid *)pd_new(grid_class);
- // new grid created from the gui
+ // new grid created from the gui
if ( argc != 0 )
{
- if ( argc != 14 )
- {
- pd_error(x, "grid : error in the number of arguments ( %d instead of 14 )", argc );
- return NULL;
- }
- if ( argv[0].a_type != A_SYMBOL || argv[1].a_type != A_FLOAT ||
- argv[2].a_type != A_FLOAT || argv[3].a_type != A_FLOAT ||
- argv[4].a_type != A_FLOAT || argv[5].a_type != A_FLOAT ||
- argv[6].a_type != A_FLOAT || argv[7].a_type != A_FLOAT ||
- argv[8].a_type != A_FLOAT || argv[9].a_type != A_FLOAT ||
- argv[10].a_type != A_FLOAT || argv[11].a_type != A_FLOAT ||
- argv[12].a_type != A_FLOAT || argv[13].a_type != A_FLOAT ) {
- pd_error(x, "grid : wrong arguments" );
- return NULL;
- }
-
- // update grid count
- if (!strncmp((str = argv[0].a_w.w_symbol->s_name), "grid", 5)
- && (zz = atoi(str + 5)) > gridcount)
- {
- gridcount = zz;
- }
- x->x_name = argv[0].a_w.w_symbol;
- pd_bind(&x->x_obj.ob_pd, x->x_name);
- x->x_width = argv[1].a_w.w_float;
- x->x_min = argv[2].a_w.w_float;
- x->x_max = argv[3].a_w.w_float;
- x->x_height = argv[4].a_w.w_float;
- x->y_min = argv[5].a_w.w_float;
- x->y_max = argv[6].a_w.w_float;
- x->x_grid = argv[7].a_w.w_float;
- x->x_xstep = argv[8].a_w.w_float;
- x->x_ystep = argv[9].a_w.w_float;
- x->x_xlines = argv[10].a_w.w_float;
- x->x_ylines = argv[11].a_w.w_float;
- x->x_current = argv[12].a_w.w_float;
- x->y_current = argv[13].a_w.w_float;
- x->x_point = 1;
+ if ( argc != 14 )
+ {
+ pd_error(x, "grid : error in the number of arguments ( %d instead of 14 )", argc );
+ return NULL;
+ }
+ if ( argv[0].a_type != A_SYMBOL || argv[1].a_type != A_FLOAT ||
+ argv[2].a_type != A_FLOAT || argv[3].a_type != A_FLOAT ||
+ argv[4].a_type != A_FLOAT || argv[5].a_type != A_FLOAT ||
+ argv[6].a_type != A_FLOAT || argv[7].a_type != A_FLOAT ||
+ argv[8].a_type != A_FLOAT || argv[9].a_type != A_FLOAT ||
+ argv[10].a_type != A_FLOAT || argv[11].a_type != A_FLOAT ||
+ argv[12].a_type != A_FLOAT || argv[13].a_type != A_FLOAT )
+ {
+ pd_error(x, "grid : wrong arguments" );
+ return NULL;
+ }
+
+ // update grid count
+ if (!strncmp((str = argv[0].a_w.w_symbol->s_name), "grid", 5)
+ && (zz = atoi(str + 5)) > gridcount)
+ {
+ gridcount = zz;
+ }
+ x->x_name = argv[0].a_w.w_symbol;
+ pd_bind(&x->x_obj.ob_pd, x->x_name);
+ x->x_width = argv[1].a_w.w_float;
+ x->x_min = argv[2].a_w.w_float;
+ x->x_max = argv[3].a_w.w_float;
+ x->x_height = argv[4].a_w.w_float;
+ x->y_min = argv[5].a_w.w_float;
+ x->y_max = argv[6].a_w.w_float;
+ x->x_grid = argv[7].a_w.w_float;
+ x->x_xstep = argv[8].a_w.w_float;
+ x->x_ystep = argv[9].a_w.w_float;
+ x->x_xlines = argv[10].a_w.w_float;
+ x->x_ylines = argv[11].a_w.w_float;
+ x->x_current = argv[12].a_w.w_float;
+ x->y_current = argv[13].a_w.w_float;
+ x->x_point = 1;
}
else
{
- char buf[40];
-
- sprintf(buf, "grid%d", ++gridcount);
- s = gensym(buf);
-
- x->x_name = s;
- pd_bind(&x->x_obj.ob_pd, x->x_name);
-
- x->x_width = DEFAULT_GRID_WIDTH;
- x->x_min = 0;
- x->x_max = DEFAULT_GRID_WIDTH - 1;
- x->x_height = DEFAULT_GRID_HEIGHT;
- x->y_min = 0;
- x->y_max = DEFAULT_GRID_HEIGHT - 1;
- x->x_grid = 1;
- x->x_xstep = 1.0;
- x->x_ystep = 1.0;
- x->x_xlines = DEFAULT_GRID_NBLINES;
- x->x_ylines = DEFAULT_GRID_NBLINES;
- x->x_current = 0;
- x->y_current = 0;
+ char buf[40];
+
+ sprintf(buf, "grid%d", ++gridcount);
+ s = gensym(buf);
+
+ x->x_name = s;
+ pd_bind(&x->x_obj.ob_pd, x->x_name);
+
+ x->x_width = DEFAULT_GRID_WIDTH;
+ x->x_min = 0;
+ x->x_max = DEFAULT_GRID_WIDTH - 1;
+ x->x_height = DEFAULT_GRID_HEIGHT;
+ x->y_min = 0;
+ x->y_max = DEFAULT_GRID_HEIGHT - 1;
+ x->x_grid = 1;
+ x->x_xstep = 1.0;
+ x->x_ystep = 1.0;
+ x->x_xlines = DEFAULT_GRID_NBLINES;
+ x->x_ylines = DEFAULT_GRID_NBLINES;
+ x->x_current = 0;
+ x->y_current = 0;
}
// common fields for new and restored grids
- x->x_point = 0;
- x->x_selected = 0;
+ x->x_point = 0;
+ x->x_selected = 0;
x->x_glist = (t_glist *) canvas_getcurrent();
- x->x_xoutlet = outlet_new(&x->x_obj, &s_float );
- x->x_youtlet = outlet_new(&x->x_obj, &s_float );
+ x->x_xoutlet = outlet_new(&x->x_obj, &s_float );
+ x->x_youtlet = outlet_new(&x->x_obj, &s_float );
x->x_bgcolor = (char*)getbytes(12);
- strcpy( x->x_bgcolor, "#123589" );
+ strcpy( x->x_bgcolor, "#123589" );
// post( "grid_new name : %s width: %d height : %d", x->x_name->s_name, x->x_width, x->x_height );
@@ -676,11 +684,11 @@ void grid_setup(void)
{
verbose(0, grid_version );
grid_class = class_new(gensym("grid"), (t_newmethod)grid_new,
- (t_method)grid_free, sizeof(t_grid), 0, A_GIMME, 0);
+ (t_method)grid_free, sizeof(t_grid), 0, A_GIMME, 0);
class_addmethod(grid_class, (t_method)grid_click, gensym("click"),
- A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0);
+ A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, A_FLOAT, 0);
class_addmethod(grid_class, (t_method)grid_motion, gensym("motion"),
- A_FLOAT, A_FLOAT, 0);
+ A_FLOAT, A_FLOAT, 0);
class_addmethod(grid_class, (t_method)grid_bang, gensym("bang"), 0);
class_addmethod(grid_class, (t_method)grid_values, gensym("values"),
A_FLOAT, A_FLOAT, 0);