Pd-cvs August 2006

pd-cvs@lists.iem.at

15 participants
462 discussions

pd/src desire.c,1.1.2.108,1.1.2.109
by Mathieu Bouchard 20 Aug '06

20 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15845 Modified Files: Tag: devel_0_39 desire.c Log Message: . Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.108 retrieving revision 1.1.2.109 diff -C2 -d -r1.1.2.108 -r1.1.2.109 *** desire.c 20 Aug 2006 05:21:36 -0000 1.1.2.108 --- desire.c 20 Aug 2006 06:04:52 -0000 1.1.2.109 *************** *** 589,594 **** glist_init(x); x->gl_obj.te_type = T_OBJECT; ! if (!*sym->s_name) ! { char buf[40]; sprintf(buf, "graph%d", ++gcount); --- 589,593 ---- glist_init(x); x->gl_obj.te_type = T_OBJECT; ! if (!*sym->s_name) { char buf[40]; sprintf(buf, "graph%d", ++gcount); *************** *** 607,626 **** zz = py2; py2 = py1; py1 = zz; } ! if (x1 == x2 || y1 == y2) ! x1 = 0, x2 = 100, y1 = 1, y2 = -1; ! if (px1 >= px2 || py1 >= py2) ! px1 = 100, py1 = 20, px2 = 100 + GLIST_DEFGRAPHWIDTH, ! py2 = 20 + GLIST_DEFGRAPHHEIGHT; x->gl_name = sym; ! x->gl_x1 = x1; ! x->gl_x2 = x2; ! x->gl_y1 = y1; ! x->gl_y2 = y2; ! x->gl_obj.te_xpix = px1; ! x->gl_obj.te_ypix = py1; ! x->gl_pixwidth = px2 - px1; ! x->gl_pixheight = py2 - py1; ! x->gl_font = (canvas_getcurrent() ? ! canvas_getcurrent()->gl_font : sys_defaultfont); x->gl_screenx1 = x->gl_screeny1 = 0; x->gl_screenx2 = 450; --- 606,617 ---- zz = py2; py2 = py1; py1 = zz; } ! if (x1 == x2 || y1 == y2) {x1=0; x2=100; y1=1; y2=-1;} ! if (px1 >= px2 || py1 >= py2) { ! px1=100; py1=20; px2=100+GLIST_DEFGRAPHWIDTH; py2=20+GLIST_DEFGRAPHHEIGHT; ! } x->gl_name = sym; ! x->gl_x1 = x1; x->gl_y1 = y1; x->gl_obj.te_xpix = px1; x->gl_pixwidth = px2-px1; ! x->gl_x2 = x2; x->gl_y2 = y2; x->gl_obj.te_ypix = py1; x->gl_pixheight = py2-py1; ! x->gl_font = (canvas_getcurrent() ? canvas_getcurrent()->gl_font : sys_defaultfont); x->gl_screenx1 = x->gl_screeny1 = 0; x->gl_screenx2 = 450; *************** *** 633,641 **** x->gl_obj.te_binbuf = binbuf_new(); binbuf_addv(x->gl_obj.te_binbuf, "s", gensym("graph")); ! if (!menu) ! pd_pushsym(&x->gl_pd); glist_add(g, &x->gl_gobj); ! if (glist_isvisible(g)) ! canvas_create_editor(x, 1); return (x); } --- 624,630 ---- x->gl_obj.te_binbuf = binbuf_new(); binbuf_addv(x->gl_obj.te_binbuf, "s", gensym("graph")); ! if (!menu) pd_pushsym(&x->gl_pd); glist_add(g, &x->gl_gobj); ! if (glist_isvisible(g)) canvas_create_editor(x, 1); return (x); } *************** *** 644,648 **** void glist_glist(t_glist *g, t_symbol *s, int argc, t_atom *argv) { ! t_symbol *sym; float x1,y1,x2,y2,px1,py1,px2,py2; pd_scanargs(argc,argv,"sffffffff",&sym,&x1,&y1,&x2,&y2,&px1,&py1,&px2,&py2); --- 633,637 ---- void glist_glist(t_glist *g, t_symbol *s, int argc, t_atom *argv) { ! t_symbol *sym; float x1,y1,x2,y2,px1,py1,px2,py2; pd_scanargs(argc,argv,"sffffffff",&sym,&x1,&y1,&x2,&y2,&px1,&py1,&px2,&py2); *************** *** 662,666 **** { int heightwas = y2 - y1; ! int heightchange = y2 - y1 - (x->gl_screeny2 - x->gl_screeny1); if (x->gl_screenx1 == x1 && x->gl_screeny1 == y1 && x->gl_screenx2 == x2 && x->gl_screeny2 == y2) --- 651,655 ---- { int heightwas = y2 - y1; ! int heightchange = y2 - y1 - (x->gl_screeny2 - x->gl_screeny1); if (x->gl_screenx1 == x1 && x->gl_screeny1 == y1 && x->gl_screenx2 == x2 && x->gl_screeny2 == y2) *************** *** 3267,3272 **** while (inno >= obj_ninlets(objsink)) inlet_new(objsink, &objsink->ob_pd, &s_, &s_); ! post ("%d %d %d %d", whoout2, outno, whoin2, inno); ! post("canvas_connect: objsrc=%d outno=%d objsink=%d inno=%d",objsrc,outno,objsink,inno); // shouldn't use sys_mgui because it interferes with the queue // sys_mgui((t_canvas *)x,"wires_new","iiii", whoout2, outno, whoin2, inno); --- 3256,3261 ---- while (inno >= obj_ninlets(objsink)) inlet_new(objsink, &objsink->ob_pd, &s_, &s_); ! /*post ("%d %d %d %d", whoout2, outno, whoin2, inno); ! post("canvas_connect: objsrc=%d outno=%d objsink=%d inno=%d",objsrc,outno,objsink,inno);*/ // shouldn't use sys_mgui because it interferes with the queue // sys_mgui((t_canvas *)x,"wires_new","iiii", whoout2, outno, whoin2, inno); *************** *** 4946,4962 **** void glist_add(t_glist *x, t_gobj *y) { ! char *buf; int bufn; if (!y->g_pd->c_patchable) { printf("glist_add %p %p class=%s (non-t_text)\n",x,y,y->g_pd->c_name->s_name); } else { t_binbuf *bb = ((t_text *)y)->te_binbuf; if (bb->b_vec) { binbuf_gettext(bb,&buf,&bufn); printf("glist_add %p %p [%.*s]\n",x,y,bufn,buf); } else { printf("glist_add %p %p class=%s (binbuf without b_vec !)\n",x,y,y->g_pd->c_name->s_name); } } ! free(buf); gobj_subscribe(y,(t_gobj *)x); --- 4935,4953 ---- void glist_add(t_glist *x, t_gobj *y) { ! /* if (!y->g_pd->c_patchable) { printf("glist_add %p %p class=%s (non-t_text)\n",x,y,y->g_pd->c_name->s_name); } else { + char *buf; int bufn; t_binbuf *bb = ((t_text *)y)->te_binbuf; if (bb->b_vec) { binbuf_gettext(bb,&buf,&bufn); printf("glist_add %p %p [%.*s]\n",x,y,bufn,buf); + free(buf); } else { printf("glist_add %p %p class=%s (binbuf without b_vec !)\n",x,y,y->g_pd->c_name->s_name); } } ! */ gobj_subscribe(y,(t_gobj *)x); *************** *** 4964,4975 **** /* gobj_changed(y,0); */ /* don't delay first uploading of object (DesireData >= 2006.08.19) */ ! pd_upload(y); y->g_next = 0; ! if (!x->gl_list) x->gl_list = y; ! else ! { t_gobj *y2; ! for (y2 = x->gl_list; y2->g_next; y2 = y2->g_next); y2->g_next = y; } --- 4955,4966 ---- /* gobj_changed(y,0); */ /* don't delay first uploading of object (DesireData >= 2006.08.19) */ ! /* pd_upload(y); */ ! /* if (glist_isvisible(x)) gobj_vis(y,x,1); */ ! if (glist_isvisible(x)) pd_upload(y); y->g_next = 0; ! if (!x->gl_list) x->gl_list = y; else { t_gobj *y2; ! for (y2 = x->gl_list; y2->g_next; y2 = y2->g_next) {} y2->g_next = y; } *************** *** 4977,4988 **** /* voodoo */ /* if (x->gl_editor && (ob = pd_checkobject(&y->g_pd))) rtext_new(x, ob); */ ! if (x->gl_editor && x->gl_isgraph && !x->gl_goprect ! && pd_checkobject(&y->g_pd)) ! { x->gl_goprect = 1; canvas_drawredrect(x, 1); } ! if (glist_isvisible(x)) gobj_vis(y,x,1); ! if (class_isdrawcommand(y->g_pd)) canvas_redrawallfortemplate(template_findbyname(canvas_makebindsym( glist_getcanvas(x)->gl_name)), 0); --- 4968,4976 ---- /* voodoo */ /* if (x->gl_editor && (ob = pd_checkobject(&y->g_pd))) rtext_new(x, ob); */ ! if (x->gl_editor && x->gl_isgraph && !x->gl_goprect && pd_checkobject(&y->g_pd)) { x->gl_goprect = 1; canvas_drawredrect(x, 1); } ! if (class_isdrawcommand(y->g_pd)) canvas_redrawallfortemplate(template_findbyname(canvas_makebindsym( glist_getcanvas(x)->gl_name)), 0); *************** *** 5041,5046 **** glist_getcanvas(x)->gl_name)), 2); gobj_delete(y, x); ! if (glist_isvisible(canvas)) ! gobj_vis(y, x, 0); if (x->gl_editor && (ob = pd_checkobject(&y->g_pd))) rtext_new(x, ob); --- 5029,5038 ---- glist_getcanvas(x)->gl_name)), 2); gobj_delete(y, x); ! /*if (glist_isvisible(canvas)) gobj_vis(y,x,0);*/ ! if (glist_isvisible(canvas)) { ! /*!@#$ race condition because the queue might still contain something */ ! sys_mgui(y,"_delete"); ! } ! if (x->gl_editor && (ob = pd_checkobject(&y->g_pd))) rtext_new(x, ob); *************** *** 6524,6529 **** t_outconnect *oc; canvas_savecontainerto(x,b); ! for (y = x->gl_list; y; y = y->g_next) ! gobj_save(y, b); linetraverser_start(&t, x); --- 6516,6520 ---- t_outconnect *oc; canvas_savecontainerto(x,b); ! glist_each(y,x) gobj_save(y, b); linetraverser_start(&t, x); *************** *** 6663,6669 **** { t_canvas *x2 = canvas_getrootfor(x); ! post("canvas_save_as: old name: %s\n",x2->gl_name->s_name); x2->gl_name = name; ! post("canvas_save_as: new name: %s\n",x2->gl_name->s_name); canvas_savetofile(x2, x2->gl_name, canvas_getdir(x2)); } --- 6654,6660 ---- { t_canvas *x2 = canvas_getrootfor(x); ! /* post("canvas_save_as: old name: %s\n",x2->gl_name->s_name); */ x2->gl_name = name; ! /* post("canvas_save_as: new name: %s\n",x2->gl_name->s_name); */ canvas_savetofile(x2, x2->gl_name, canvas_getdir(x2)); }

1 0

pd/src desire.c,1.1.2.107,1.1.2.108
by Mathieu Bouchard 20 Aug '06

20 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv417 Modified Files: Tag: devel_0_39 desire.c Log Message: wire_update is dead Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.107 retrieving revision 1.1.2.108 diff -C2 -d -r1.1.2.107 -r1.1.2.108 *** desire.c 20 Aug 2006 01:00:44 -0000 1.1.2.107 --- desire.c 20 Aug 2006 05:21:36 -0000 1.1.2.108 *************** *** 963,970 **** t_outconnect *oc; linetraverser_start(&t, x); ! while ((oc = linetraverser_next(&t))) ! sys_vgui("wire_update %lx %lx %lx %d %lx %d %d\n", (long)oc, ! (long)glist_getcanvas(x), (long)t.tr_ob, t.tr_outno, (long)t.tr_ob2, t.tr_inno, ! (outlet_getsymbol(t.tr_outlet) == &s_signal)); } --- 963,967 ---- t_outconnect *oc; linetraverser_start(&t, x); ! while ((oc = linetraverser_next(&t))) gobj_changed(oc,0); } *************** *** 4477,4487 **** binbuf_addv(b, "sssisi;", gensym("#X"), gensym("array"), x->x_name, array->a_n, &s_float, x->x_saveit + 2 * filestyle); ! if (x->x_saveit) ! { int n = array->a_n, n2 = 0; ! if (n > 200000) ! post("warning: I'm saving an array with %d points!\n", n); ! while (n2 < n) ! { int chunk = n - n2, i; if (chunk > ARRAYWRITECHUNKSIZE) --- 4474,4480 ---- binbuf_addv(b, "sssisi;", gensym("#X"), gensym("array"), x->x_name, array->a_n, &s_float, x->x_saveit + 2 * filestyle); ! if (x->x_saveit) { int n = array->a_n, n2 = 0; ! while (n2 < n) { int chunk = n - n2, i; if (chunk > ARRAYWRITECHUNKSIZE)

1 0

pd/src desire.tk,1.1.2.381,1.1.2.382
by Mathieu Bouchard 20 Aug '06

20 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29646 Modified Files: Tag: devel_0_39 desire.tk Log Message: . Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.381 retrieving revision 1.1.2.382 diff -C2 -d -r1.1.2.381 -r1.1.2.382 *** desire.tk 20 Aug 2006 02:59:55 -0000 1.1.2.381 --- desire.tk 20 Aug 2006 05:13:03 -0000 1.1.2.382 *************** *** 1255,1259 **** super {#X obj 666 666 pd} ;# bogus $self reinit $mess ! set @scale 1.5 ;# must be a float, not int set @action none set @selection {} --- 1255,1259 ---- super {#X obj 666 666 pd} ;# bogus $self reinit $mess ! set @scale 1.0 ;# must be a float, not int set @action none set @selection {} *************** *** 2566,2581 **** def Canvas victim {} { ! if {[llength $@selection]} { ! return $@selection ! } elseif {[string compare $@keynav_current 0]} { ! return {} ! } else { ! return $@keynav_current ! } ! ! } - def Canvas find_neighbor_obj {object direction} { set group "" --- 2566,2578 ---- def Canvas victim {} { ! if {[llength $@selection]} { ! return $@selection ! } elseif {[string compare $@keynav_current 0]} { ! return {} ! } else { ! return $@keynav_current ! } } def Canvas find_neighbor_obj {object direction} { set group "" *************** *** 2622,2626 **** return [lindex $@selection end end] } - } --- 2619,2622 ---- *************** *** 2663,2667 **** } ! def* Canvas dehilite_io {} { if {![llength $@keynav_iosel]} {return} foreach io $@keynav_iosel { --- 2659,2663 ---- } ! def Canvas dehilite_io {} { if {![llength $@keynav_iosel]} {return} foreach io $@keynav_iosel { *************** *** 2674,2678 **** } set @keynav_iosel {} ! set @keynav_port 0 set @keynav_iocount 0 } --- 2670,2674 ---- } set @keynav_iosel {} ! set @keynav_port 0 set @keynav_iocount 0 } *************** *** 2694,2698 **** set @scale [expr $per/100.0] ;# @scale must be float, not int $self redraw - } --- 2690,2693 ---- *************** *** 2933,2937 **** mset {x3 y3 x4 y4} [.$(a)canvas.c bbox ${obj2}i${port2}] #list [expr ($x2+$x1)/2] [expr ($y2+$y1)/2] [expr ($x4+$x3)/2] [expr ($y4+$y3)/2] ! list [expr (($x1+$x2)/2)/$_($@canvas:scale)] [expr (($y1+$y2)/2)/$_($@canvas:scale)] [expr (($x3+$x4)/2)/$_($@canvas:scale)] [expr (($y3+$y4)/2)/$_($@canvas:scale)] } --- 2928,2934 ---- mset {x3 y3 x4 y4} [.$(a)canvas.c bbox ${obj2}i${port2}] #list [expr ($x2+$x1)/2] [expr ($y2+$y1)/2] [expr ($x4+$x3)/2] [expr ($y4+$y3)/2] ! set scale [$@canvas scale] ! list [expr (($x1+$x2)/2)/$scale] [expr (($y1+$y2)/2)/$scale] \ ! [expr (($x3+$x4)/2)/$scale] [expr (($y3+$y4)/2)/$scale] } *************** *** 2941,2947 **** } ! def Wire report {} { ! list $@obj1 $@port1 $@obj2 $@port2 ! } def Wire draw {} { --- 2938,2942 ---- } ! def Wire report {} {list $@obj1 $@port1 $@obj2 $@port2} def Wire draw {} { *************** *** 4135,4147 **** def Cnv draw {} { mset {x1 y1} [$self xy] ! set xs $@w ! set ys $@h ! $self item BASE rectangle [list $x1 $y1 [expr $x1+$xs] [expr $y1+$ys]] \ -fill [parse_color $@bcol] super } class_new Array {Box} def Array draw {} { global font --- 4130,4149 ---- def Cnv draw {} { mset {x1 y1} [$self xy] ! $self item BASE rectangle [list $x1 $y1 [expr $x1+$@w] [expr $y1+$@h]] \ -fill [parse_color $@bcol] super } + def Cnv bbox {} { + mset {x1 y1} [$self xy] + return [list $x1 $y1 [expr $x1+$@w] [expr $y1+$@h]] + } + class_new Array {Box} + def Array bbox {} { + return {0 0 1 1} ;# huh? + } + def Array draw {} { global font

1 0

pd/src/tests all_guis_and_gop.pd.gif, NONE, 1.1.2.1 all_guis_and_gop.pd, 1.1.2.1, 1.1.2.2
by Mathieu Bouchard 20 Aug '06

20 Aug '06

Update of /cvsroot/pure-data/pd/src/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21625 Modified Files: Tag: devel_0_39 all_guis_and_gop.pd Added Files: Tag: devel_0_39 all_guis_and_gop.pd.gif Log Message: slightly updated test case Index: all_guis_and_gop.pd =================================================================== RCS file: /cvsroot/pure-data/pd/src/tests/Attic/all_guis_and_gop.pd,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** all_guis_and_gop.pd 19 Aug 2006 23:43:46 -0000 1.1.2.1 --- all_guis_and_gop.pd 20 Aug 2006 04:50:44 -0000 1.1.2.2 *************** *** 1,3 **** ! #N canvas 487 81 590 622 10; #X obj 98 29 +; #X floatatom 99 83 5 0 0 0 - - -; --- 1,3 ---- ! #N canvas 339 27 590 690 10; #X obj 98 29 +; #X floatatom 99 83 5 0 0 0 - - -; *************** *** 5,52 **** #X obj 158 27 bng 42 250 50 0 empty empty button-label 50 8 0 8 -258699 -1 -1; ! #X obj 158 87 tgl 15 0 empty empty hello? 20 8 0 8 -24198 -1 -1 0 1 ; #X obj 227 140 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 10 -262144 -1 -1 0 256; #X obj 5 13 vsl 25 150 0 127 0 0 empty empty vslider-hello -2 -6 0 ! 8 -241291 -1 -1 0 0; ! #X obj 44 226 hsl 100 10 0 127 0 0 empty empty hello-hslider 10 6 0 ! 8 -262144 -1 -258699 0 0; ! #X obj 69 184 hradio 15 1 0 8 empty empty hello-hradio 0 -6 0 8 -261681 -1 -1 0; ! #X obj 69 24 vradio 15 1 0 8 empty empty hello-vradio 0 -6 0 8 -262144 -1 -1 0; ! #X obj 350 166 vu 15 120 empty vumeter-label -1 -8 0 8 -166441 -1 1 0; ! #X obj 450 192 cnv 15 100 60 empty empty empty 20 12 0 14 -233017 -66577 0; ! #N canvas 365 389 415 216 graph1 0; ! #X obj 96 25 +; ! #X msg 96 53; ! #X floatatom 99 83 5 0 0 0 - - -; ! #X symbolatom 99 108 10 0 0 0 - - -; ! #X obj 158 27 bng 42 250 50 0 empty empty button-label 50 8 0 8 -258699 -1 -1; ! #X obj 158 87 tgl 15 0 empty empty hello? 20 8 0 8 -24198 -1 -1 0 1 ! ; ! #X obj 227 140 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 10 -262144 -1 -1 0 256; ! #X obj 5 13 vsl 25 150 0 127 0 0 empty empty vslider-hello -2 -6 0 ! 8 -241291 -1 -1 0 0; ! #X obj 44 226 hsl 100 10 0 127 0 0 empty empty hello-hslider 10 6 0 ! 8 -262144 -1 -258699 0 0; ! #X obj 69 184 hradio 15 1 0 8 empty empty hello-hradio 0 -6 0 8 -261681 -1 -1 0; ! #X obj 69 24 vradio 15 1 0 8 empty empty hello-vradio 0 -6 0 8 -262144 -1 -1 0; ! #X obj 225 74 nbx 5 14 -1e+37 1e+37 0 0 empty empty numbox2-label 60 ! 8 0 8 -260818 -62784 -1 0 256; ! #X floatatom 227 44 5 0 0 0 - - -; ! #X text 86 152 (Comment Hello World!); ! #X obj 350 166 vu 15 120 empty vumeter-label -1 -8 0 8 -166441 -1 1 0; ! #X floatatom 347 115 5 0 0 0 - - -; ! #X floatatom 394 116 5 -99 42 2 floatatom-label - -; ! #X obj 450 192 cnv 15 100 60 empty empty empty 20 12 0 14 -233017 -66577 0; #N canvas 0 0 450 300 graph2 0; --- 5,70 ---- #X obj 158 27 bng 42 250 50 0 empty empty button-label 50 8 0 8 -258699 -1 -1; ! #X obj 158 87 tgl 15 0 empty empty hello? 20 8 0 9 -24198 -1 -1 0 1 ; #X obj 227 140 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 10 -262144 -1 -1 0 256; #X obj 5 13 vsl 25 150 0 127 0 0 empty empty vslider-hello -2 -6 0 ! 9 -241291 -1 -1 0 0; ! #X obj 43 201 hsl 100 10 0 127 0 0 empty empty hello-hslider 10 6 0 ! 9 -262144 -1 -258699 0 0; ! #X obj 67 159 hradio 15 1 0 8 empty empty hello-hradio 0 -6 0 9 -261681 -1 -1 0; ! #X obj 68 24 vradio 15 1 0 8 empty empty hello-vradio 0 -6 0 9 -262144 -1 -1 0; ! #X obj 435 73 vu 15 120 empty vumeter-label -1 -8 0 8 -166441 -1 1 0; ! #X obj 306 9 cnv 15 100 60 empty empty empty 20 12 0 14 -233017 -66577 0; ! #N canvas 0 0 450 300 graph2 0; ! #X array array1 100 float 1; ! #A 0 -0.0571427 -0.0428571 -0.0857141 -0.171428 -0.185714 -0.199999 ! -0.206428 -0.212856 -0.219285 -0.225714 -0.232142 -0.238571 -0.244999 ! -0.251428 -0.257856 -0.264285 -0.270713 -0.277142 -0.28357 -0.289999 ! -0.296427 -0.302856 -0.309285 -0.315713 -0.322142 -0.32857 -0.331427 ! -0.334285 -0.337142 -0.339999 -0.342856 -0.345713 -0.34857 -0.351427 ! -0.354284 -0.357141 -0.359999 -0.362856 -0.365713 -0.35857 -0.351427 ! -0.329999 -0.30857 -0.279999 -0.25619 -0.23238 -0.208571 -0.18 0.162856 ! 0.305712 0.419998 0.448569 0.491426 0.57714 0.591425 0.605711 0.305712 ! 0.14857 0.105713 -0.00857189 -0.122857 -0.237142 -0.322856 -0.40857 ! -0.479998 -0.50857 -0.565712 -0.594283 -0.608569 -0.608569 -0.608569 ! -0.594283 -0.565712 -0.546664 -0.527617 -0.494284 -0.460951 0.0342851 ! -0.0514288 -0.165714 -0.201428 -0.251428 -0.265714 -0.294285 -0.337142 ! -0.337142 -0.365713 -0.365713 -0.40857 -0.437141 -0.451427 -0.451427 ! -0.451427 -0.479998 -0.494284 -0.477141 -0.482855 -0.48857 -0.494284 ! -0.499998; ! #X coords 0 1 99 -1 200 140 1; ! #X restore 199 178 graph; ! #X floatatom 432 22 5 0 0 0 - - -; ! #X floatatom 479 23 5 -99 42 2 floatatom-label - -; ! #X obj 225 74 nbx 5 14 -1e+37 1e+37 0 0 empty empty numbox2-label 60 ! 8 0 9 -260818 -62784 -1 0 256; ! #X floatatom 237 48 5 0 0 0 - - -; ! #X msg 98 57; ! #N canvas 0 0 450 300 foo 0; ! #X obj 148 99 +; ! #X floatatom 149 153 5 0 0 0 - - -; ! #X symbolatom 149 178 10 0 0 0 - - -; ! #X obj 208 97 bng 42 250 50 0 empty empty button-label 50 8 0 8 -258699 -1 -1; ! #X obj 208 157 tgl 15 0 empty empty hello? 20 8 0 9 -24198 -1 -1 0 ! 1; ! #X obj 277 210 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 10 -262144 -1 -1 0 256; ! #X obj 55 83 vsl 25 150 0 127 0 0 empty empty vslider-hello -2 -6 0 ! 9 -241291 -1 -1 0 0; ! #X obj 93 271 hsl 100 10 0 127 0 0 empty empty hello-hslider 10 6 0 ! 9 -262144 -1 -258699 0 0; ! #X obj 117 229 hradio 15 1 0 8 empty empty hello-hradio 0 -6 0 9 -261681 -1 -1 0; ! #X obj 118 94 vradio 15 1 0 8 empty empty hello-vradio 0 -6 0 9 -262144 -1 -1 0; ! #X obj 485 143 vu 15 120 empty vumeter-label -1 -8 0 8 -166441 -1 1 0; ! #X obj 356 79 cnv 15 100 60 empty empty empty 20 12 0 14 -233017 -66577 0; #N canvas 0 0 450 300 graph2 0; *************** *** 54,86 **** #A 0 -0.0571427 -0.0428571 -0.0857141 -0.171428 -0.185714 -0.199999 -0.206428 -0.212856 -0.219285 -0.225714 -0.232142 -0.238571 -0.244999 - -0.251428 -0.229284 -0.229284 -0.186426 -0.172139 -0.154282 -0.136424 - -0.118567 -0.100709 -0.0721368 -0.0364215 -0.000706278 0.0278659 0.499307 - 0.585024 0.59931 0.59931 0.563594 0.499307 0.327874 0.2493 0.170727 - 0.127869 0.042152 -0.0435646 -0.0721368 -0.114995 -0.153091 -0.191188 - -0.229284 -0.257856 -0.300714 -0.329287 -0.343573 -0.365002 -0.386431 - -0.386431 -0.393574 -0.400717 -0.400717 -0.386431 -0.372145 -0.357859 - -0.329287 -0.315 -0.300714 -0.286428 -0.272142 -0.257856 -0.24357 -0.214998 - -0.186426 -0.157853 -0.129281 -0.105471 -0.0816609 -0.0578507 -0.0435646 - -0.0435646 -0.114995 -0.186426 -0.315 -0.386431 -0.415003 -0.472148 - -0.50072 -0.529292 -0.529292 -0.540006 -0.550721 -0.561436 -0.586436 - -0.586436 -0.600722 -0.600722 -0.597151 -0.593579 -0.590008 -0.586436 - -0.579293 -0.557864 -0.543578 -0.515006 -0.50072 -0.457861 -0.429289 - -0.257856; - #X coords 0 1 99 -1 200 140 1; - #X restore 123 271 graph; - #X connect 4 0 5 0; - #X connect 5 0 6 0; - #X connect 7 0 8 0; - #X connect 10 0 9 0; - #X connect 11 0 6 0; - #X connect 12 0 11 0; - #X connect 15 0 14 0; - #X connect 16 0 14 1; - #X coords 0 1 100 -1 300 140 1; - #X restore 23 414 graph; - #N canvas 0 0 450 300 graph2 0; - #X array array1 100 float 1; - #A 0 -0.0571427 -0.0428571 -0.0857141 -0.171428 -0.185714 -0.199999 - -0.206428 -0.212856 -0.219285 -0.225714 -0.232142 -0.238571 -0.244999 -0.251428 -0.257856 -0.264285 -0.270713 -0.277142 -0.28357 -0.289999 -0.296427 -0.302856 -0.309285 -0.315713 -0.322142 -0.32857 -0.331427 --- 72,75 ---- *************** *** 97,107 **** -0.499998; #X coords 0 1 99 -1 200 140 1; ! #X restore 123 271 graph; ! #X floatatom 347 115 5 0 0 0 - - -; ! #X floatatom 394 116 5 -99 42 2 floatatom-label - -; ! #X obj 225 74 nbx 5 14 -1e+37 1e+37 0 0 empty empty numbox2-label 60 ! 8 0 8 -260818 -62784 -1 0 256; ! #X floatatom 227 44 5 0 0 0 - - -; ! #X msg 98 57; #X connect 3 0 4 0; #X connect 4 0 5 0; --- 86,98 ---- -0.499998; #X coords 0 1 99 -1 200 140 1; ! #X restore 249 248 graph; ! #X floatatom 482 92 5 0 0 0 - - -; ! #X floatatom 529 93 5 -99 42 2 floatatom-label - -; ! #X obj 275 144 nbx 5 14 -1e+37 1e+37 0 0 empty empty numbox2-label ! 60 8 0 9 -260818 -62784 -1 0 256; ! #X floatatom 287 118 5 0 0 0 - - -; ! #X msg 148 127; ! #X obj 15 17 bng 15 250 50 0 empty empty i_shouldn't_be_visible_in_parent ! 0 -6 0 9 -262144 -1 -1; #X connect 3 0 4 0; #X connect 4 0 5 0; *************** *** 109,114 **** #X connect 8 0 7 0; #X connect 9 0 8 0; ! #X connect 14 0 10 0; ! #X connect 15 0 10 1; ! #X connect 16 0 5 0; ! #X connect 17 0 16 0; --- 100,116 ---- #X connect 8 0 7 0; #X connect 9 0 8 0; ! #X connect 13 0 10 0; ! #X connect 14 0 10 1; ! #X connect 15 0 5 0; ! #X connect 16 0 15 0; ! #X coords 0 -1 1 1 400 300 1 50 50; ! #X restore 99 336 pd foo; ! #X connect 3 0 4 0; ! #X connect 4 0 5 0; ! #X connect 6 0 7 0; ! #X connect 8 0 7 0; ! #X connect 9 0 8 0; ! #X connect 13 0 10 0; ! #X connect 14 0 10 1; ! #X connect 15 0 5 0; ! #X connect 16 0 15 0; --- NEW FILE: all_guis_and_gop.pd.gif --- (This appears to be a binary file; contents omitted.)

1 0

pd/src desire.tk,1.1.2.380,1.1.2.381
by Mathieu Bouchard 20 Aug '06

20 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13944 Modified Files: Tag: devel_0_39 desire.tk Log Message: cleanup Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.380 retrieving revision 1.1.2.381 diff -C2 -d -r1.1.2.380 -r1.1.2.381 *** desire.tk 20 Aug 2006 02:39:34 -0000 1.1.2.380 --- desire.tk 20 Aug 2006 02:59:55 -0000 1.1.2.381 *************** *** 681,685 **** } if {[fblocked $sock]} {break} ! if {[string first pdtk_post $cmd]!=0} {puts "-> $cmd"} append sock_lobby "\n$cmd" if {[catch {eval $sock_lobby}]} { --- 681,685 ---- } if {[fblocked $sock]} {break} ! #if {[string first pdtk_post $cmd]!=0} {puts "-> $cmd"} append sock_lobby "\n$cmd" if {[catch {eval $sock_lobby}]} { *************** *** 1250,1255 **** #X restore 123 271 graph; ! #!@#$ this method is too long. ! def* Canvas init {mess} { global pd_opendir pd_tearoff OS cmdline canvas history manager window_list lappend window_list $self --- 1250,1254 ---- #X restore 123 271 graph; ! def Canvas init {mess} { global pd_opendir pd_tearoff OS cmdline canvas history manager window_list lappend window_list $self *************** *** 1293,1297 **** } ! def* Canvas reinit {mess} { switch -- [lindex $mess 0] { "#N" { --- 1292,1296 ---- } ! def Canvas reinit {mess} { switch -- [lindex $mess 0] { "#N" { *************** *** 1425,1430 **** } ! def* Canvas map {} {} ! def* Canvas unmap {} {} def Canvas scroll {axis diff} { --- 1424,1429 ---- } ! def Canvas map {} {} ! def Canvas unmap {} {} def Canvas scroll {axis diff} { *************** *** 2770,2784 **** #-----------------------------------------------------------------------------------# ! def* Canvas keyup {x y key iso shift} { set canvas .$self.c if {$iso != ""} {scan $iso %c key} - # if {[string length $@focus] > 0} { - # if {$@editmode} {set action keyreleaseedit} {set action keyrelease} - # $@focus $event $key $shift - # } $self draw_active } ! def* Canvas draw_active {} { #if {![string compare $@keynav_current 0]} {return} if {$@keynav} { --- 2769,2779 ---- #-----------------------------------------------------------------------------------# ! def Canvas keyup {x y key iso shift} { set canvas .$self.c if {$iso != ""} {scan $iso %c key} $self draw_active } ! def Canvas draw_active {} { #if {![string compare $@keynav_current 0]} {return} if {$@keynav} { *************** *** 2954,2959 **** set bbox1 [lmap / [.$(a)canvas.c bbox [join [list "$@obj1" o "$@port1"] ""]] $scale] set bbox2 [lmap / [.$(a)canvas.c bbox [join [list "$@obj2" i "$@port2"] ""]] $scale] ! if {[llength $bbox1] < 4} {puts stderr "wire_draw: crap ($@obj1 outlet)"; return} ! if {[llength $bbox2] < 4} {puts stderr "wire_draw: crap ($@obj2 inlet)"; return} mset {x1 y1} [l/2 [l+ [lrange $bbox1 0 1] [lrange $bbox1 2 3]]] mset {x2 y2} [l/2 [l+ [lrange $bbox2 0 1] [lrange $bbox2 2 3]]] --- 2949,2954 ---- set bbox1 [lmap / [.$(a)canvas.c bbox [join [list "$@obj1" o "$@port1"] ""]] $scale] set bbox2 [lmap / [.$(a)canvas.c bbox [join [list "$@obj2" i "$@port2"] ""]] $scale] ! if {[llength $bbox1] < 4} {puts stderr "wire_draw: crap outlet $@obj1 [$@obj1 deconstruct]"; return} ! if {[llength $bbox2] < 4} {puts stderr "wire_draw: crap inlet $@obj2 [$@obj2 deconstruct]"; return} mset {x1 y1} [l/2 [l+ [lrange $bbox1 0 1] [lrange $bbox1 2 3]]] mset {x2 y2} [l/2 [l+ [lrange $bbox2 0 1] [lrange $bbox2 2 3]]] *************** *** 3083,3087 **** #A 0 0; proc update_object {self e ninlets noutlets} { ! global _ fields classinfo canvas set isnew [expr ![info exists _($self:_class)]] foreach mess [split $e ";"] { --- 3078,3082 ---- #A 0 0; proc update_object {self e ninlets noutlets} { ! global _ classinfo canvas set isnew [expr ![info exists _($self:_class)]] foreach mess [split $e ";"] { *************** *** 3107,3121 **** } #if {$isnew} {$_class new_as $self} - #puts "CLASS IS $class" if {$isnew} {$_class new_as $self $mess} else {$self reinit $mess} - #switch -- $class { - # obj {$self text= [join [lrange $mess 4 end]]} - # msg {$self text= [join [lrange $mess 4 end]]} - # text {$self text= [join [lrange $mess 4 end]]} - # restore {$self text= [join [lrange $mess 4 end]]} - # array {puts "\033\[0;1;32mGOT ARRAY!"} - # default { - # set i 0; foreach f $fields($class) {set _($self:$f) [lindex $mess $i]; incr i}} - #} switch -- $class { array {} --- 3102,3106 ---- *************** *** 3484,3488 **** class_new SymbolAtom {AtomBox} ! def* AtomBox init {mess} { global font super $mess --- 3469,3473 ---- class_new SymbolAtom {AtomBox} ! def AtomBox init {mess} { global font super $mess *************** *** 3494,3503 **** } ! def* FloatAtom init {mess} {super $mess; set @text 0} def SymbolAtom init {mess} {super $mess; set @text "symbol"} ! def* AtomBox canonize {x} {return x} ! def* FloatAtom canonize {x} {return [expr $x]} ! def* AtomBox key {key shift} { set @clicking 0 switch $key { --- 3479,3488 ---- } ! def FloatAtom init {mess} {super $mess; set @text 0} def SymbolAtom init {mess} {super $mess; set @text "symbol"} ! def AtomBox canonize {x} {return x} ! def FloatAtom canonize {x} {return [expr $x]} ! def AtomBox key {key shift} { set @clicking 0 switch $key { *************** *** 4202,4208 **** proc post_to_gui {x} { global cmdline console_lines ! # if {[catch { ! set oldpos [lindex [.log.2 get] 1] ! .log.1 insert end $x regsub -all "\n" $x "" y set n [expr [string length $x]-[string length $y]] --- 4187,4193 ---- proc post_to_gui {x} { global cmdline console_lines ! if {!$cmdline(console)} {puts -nonewline stderr $x; return} ! set oldpos [lindex [.log.2 get] 1] ! .log.1 insert end $x regsub -all "\n" $x "" y set n [expr [string length $x]-[string length $y]] *************** *** 4213,4219 **** } if {$oldpos > 0.9999} {.log.1 see end} - # }]} { - # puts -nonewline stderr $x - # } } --- 4198,4201 ----

1 0

pd/src desire.tk,1.1.2.379,1.1.2.380
by Mathieu Bouchard 20 Aug '06

20 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6762 Modified Files: Tag: devel_0_39 desire.tk Log Message: yet another rewrite of update_object Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.379 retrieving revision 1.1.2.380 diff -C2 -d -r1.1.2.379 -r1.1.2.380 *** desire.tk 20 Aug 2006 01:38:53 -0000 1.1.2.379 --- desire.tk 20 Aug 2006 02:39:34 -0000 1.1.2.380 *************** *** 1251,1268 **** #!@#$ this method is too long. ! def Canvas init {x1 y1 xs ys args} { global pd_opendir pd_tearoff OS cmdline canvas history manager window_list lappend window_list $self ! super ! # those four are not to be confused with other @variables of the same name. ! set @canvasx1 $x1 ! set @canvasy1 $y1 ! set @canvasxs $xs ! set @canvasys $ys ! switch [llength $args] { ! 1 {set @subpatch 0; mset {@fontsize} $args; set @name ""; set @mapped 1} ! 2 {set @subpatch 1; mset {@name @mapped} $args; set @fontsize "what?"} ! default {error "wrong number of arguments (expecting 5 or 6)"} ! } set @scale 1.5 ;# must be a float, not int set @action none --- 1251,1259 ---- #!@#$ this method is too long. ! def* Canvas init {mess} { global pd_opendir pd_tearoff OS cmdline canvas history manager window_list lappend window_list $self ! super {#X obj 666 666 pd} ;# bogus ! $self reinit $mess set @scale 1.5 ;# must be a float, not int set @action none *************** *** 1286,1290 **** if {[info exists canvas(file)]} {set @file $canvas(file);set canvas(file) ""} else {set @file ""} if {[info exists canvas(directory)]} {set @directory $canvas(directory); set canvas(directory) ""} else {set @directory ""} - post %s "canvas init: subscribing to $manager" $self subscribe $manager $self changed --- 1277,1280 ---- *************** *** 1294,1312 **** set @coords 0 set @jump 0 ! # the io select count ! set @keynav_iocount 0 ! # which in/outlet is select ! set @keynav_port 0 ! # the list of objects that has io selected ! set @keynav 0 set @keynav_iosel {} set @keynav_current 0 set @keynav_last 0 - #set @shift_wires {} set @keynav_tab_sel "wire" } ! def Canvas reinit {x1 y1 xs ys args} { ! #ignore for now } --- 1284,1317 ---- set @coords 0 set @jump 0 ! set @keynav_iocount 0 ;# the io select count ! set @keynav_port 0 ;# which in/outlet is select ! set @keynav 0 ;# the list of objects that has io selected set @keynav_iosel {} set @keynav_current 0 set @keynav_last 0 set @keynav_tab_sel "wire" } ! def* Canvas reinit {mess} { ! switch -- [lindex $mess 0] { ! "#N" { ! # those four are not to be confused with other @variables of the same name. ! set @canvasx1 [lindex $mess 2] ! set @canvasy1 [lindex $mess 3] ! set @canvasxs [lindex $mess 4] ! set @canvasys [lindex $mess 5] ! set args [lrange $mess 6 end] ! switch [llength $args] { ! 1 {set @subpatch 0; mset {@fontsize} $args; set @name ""; set @mapped 1} ! 2 {set @subpatch 1; mset {@name @mapped} $args; set @fontsize "what?"} ! default {error "wrong number of arguments (expecting 5 or 6, got [expr 4+[llength $args]])"} ! } ! } ! "#X" { # this is restore ! set @x1 [lindex $mess 2] ! set @y1 [lindex $mess 3] ! $self text= [lrange $mess 4 end] ! } ! } } *************** *** 1592,1598 **** class_new TextBox {Box} ! def TextBox init {} { super set @edit 0 } --- 1597,1606 ---- class_new TextBox {Box} ! def TextBox init {mess} { super set @edit 0 + set @x1 [lindex $mess 2] + set @y1 [lindex $mess 3] + set @text [lrange $mess 5 end] } *************** *** 1679,1684 **** class_new ObjectBox {TextBox} ! def ObjectBox init {args} { ! super set @valid 0 ;# only ObjectBox needs a @valid. (removed all others) set @ninlets 0 --- 1687,1692 ---- class_new ObjectBox {TextBox} ! def ObjectBox init {mess} { ! super $mess set @valid 0 ;# only ObjectBox needs a @valid. (removed all others) set @ninlets 0 *************** *** 2793,2804 **** class_new Box {View} ! def Box init {args} { super set @wires {} } def Box update_size {} {} ! # will be so that @wires are updated correctly without break encapsulation def* Box connect_out {} {} def* Box connect_in {} {} --- 2801,2821 ---- class_new Box {View} ! def Box init {{mess {}}} { ! global classinfo fields super set @wires {} + set pdclass [lindex $mess 1] + if {[llength $mess]} { + if {$pdclass == "obj"} {set pdclass [lindex $mess 4]} + if {[info exists fields($pdclass)]} { + set i 0 + foreach f $fields($pdclass) {set _($self:$f) [lindex $mess $i]; incr i} + } + } } def Box update_size {} {} ! # will be so that @wires are updated correctly without breaking encapsulation def* Box connect_out {} {} def* Box connect_in {} {} *************** *** 3072,3080 **** "#N" { set class canvas ! if {$isnew} { ! eval [concat [list Canvas new_as $self] [lrange $mess 2 end]] ! } else { ! eval [concat [list $self reinit] [lrange $mess 2 end]] ! } set canvas(current) $self set isnew 0 --- 3089,3093 ---- "#N" { set class canvas ! if {$isnew} {Canvas new_as $self $mess} else {$self reinit $mess} set canvas(current) $self set isnew 0 *************** *** 3093,3097 **** set _($self:isnew) [expr [llength $mess] == 4] } ! if {$isnew} {$_class new_as $self} switch -- $class { array {} --- 3106,3121 ---- set _($self:isnew) [expr [llength $mess] == 4] } ! #if {$isnew} {$_class new_as $self} ! #puts "CLASS IS $class" ! if {$isnew} {$_class new_as $self $mess} else {$self reinit $mess} ! #switch -- $class { ! # obj {$self text= [join [lrange $mess 4 end]]} ! # msg {$self text= [join [lrange $mess 4 end]]} ! # text {$self text= [join [lrange $mess 4 end]]} ! # restore {$self text= [join [lrange $mess 4 end]]} ! # array {puts "\033\[0;1;32mGOT ARRAY!"} ! # default { ! # set i 0; foreach f $fields($class) {set _($self:$f) [lindex $mess $i]; incr i}} ! #} switch -- $class { array {} *************** *** 3102,3116 **** $self ninlets= $ninlets ;# bogus in case of array $self noutlets= $noutlets - #puts "CLASS IS $class" - switch -- $class { - obj {$self text= [join [lrange $mess 4 end]]} - msg {$self text= [join [lrange $mess 4 end]]} - text {$self text= [join [lrange $mess 4 end]]} - restore {$self text= [join [lrange $mess 4 end]]} - array {puts "\033\[0;1;32mGOT ARRAY!"} - default { - set i 0; foreach f $fields($class) { - set _($self:$f) [lindex $mess $i]; incr i}} - } #!@#$ goes with the request tracking feature to be impl in the server if {[info exists canvas(msg_isnew)]} { --- 3126,3129 ---- *************** *** 3136,3145 **** class_new MessageBox {TextBox} ! def MessageBox init {args} { ! super ! set @w 15 set @xs $@w set @ys $@w ;# this is a bug - set @text "" } --- 3149,3157 ---- class_new MessageBox {TextBox} ! def MessageBox init {mess} { ! super $mess ! set @w 15 ;# this is useless? set @xs $@w set @ys $@w ;# this is a bug } *************** *** 3472,3478 **** class_new SymbolAtom {AtomBox} ! def* AtomBox init {args} { global font ! super set @clicking 0 ;#!@#$ get rid of this set @val 0 --- 3484,3490 ---- class_new SymbolAtom {AtomBox} ! def* AtomBox init {mess} { global font ! super $mess set @clicking 0 ;#!@#$ get rid of this set @val 0 *************** *** 3482,3487 **** } ! def* FloatAtom init {args} {eval [concat [list super] $args]; set @text 0} ! def SymbolAtom init {args} {eval [concat [list super] $args]; set @text "symbol"} def* AtomBox canonize {x} {return x} def* FloatAtom canonize {x} {return [expr $x]} --- 3494,3499 ---- } ! def* FloatAtom init {mess} {super $mess; set @text 0} ! def SymbolAtom init {mess} {super $mess; set @text "symbol"} def* AtomBox canonize {x} {return x} def* FloatAtom canonize {x} {return [expr $x]} *************** *** 3603,3609 **** class_new NumBox {Labeled Box} ! def NumBox init {args} { ! super ! eval [concat [list super] $args] set @clicking 0 set @old_val 0 --- 3615,3620 ---- class_new NumBox {Labeled Box} ! def NumBox init {mess} { ! super $mess set @clicking 0 set @old_val 0 *************** *** 3821,3826 **** } ! def Slider init {args} { ! super set @clicking 0 set @value 0 --- 3832,3837 ---- } ! def Slider init {mess} { ! super $mess set @clicking 0 set @value 0 *************** *** 3934,3939 **** #-----------------------------------------------------------------------------------# class_new Bang {BlueBox} ! def Bang init {args} { ! super set @w 15 set @flash 0 --- 3945,3950 ---- #-----------------------------------------------------------------------------------# class_new Bang {BlueBox} ! def Bang init {mess} { ! super $mess set @w 15 set @flash 0 *************** *** 3977,3982 **** class_new Toggle {BlueBox} ! def Toggle init {args} { ! super set @on 0 set @w 15 --- 3988,3993 ---- class_new Toggle {BlueBox} ! def Toggle init {mess} { ! super $mess set @on 0 set @w 15 *************** *** 4135,4139 **** def Dropper erase {} {destroy $(a)canvas.${self}DROP; super} ! class_new Cnv {Labeled View} def Cnv draw {} { mset {x1 y1} [$self xy] --- 4146,4151 ---- def Dropper erase {} {destroy $(a)canvas.${self}DROP; super} ! class_new Cnv {Labeled Box} ! def Cnv draw {} { mset {x1 y1} [$self xy] *************** *** 4147,4157 **** class_new Array {Box} - def Array init {} { - - } - def Array draw {} { global font mset {x1 y1} {0 0} $self item TEXT text [list $x1 $y1] \ -font $font(str) -text "an array named '$@name' should appear in this patch" \ --- 4159,4166 ---- class_new Array {Box} def Array draw {} { global font mset {x1 y1} {0 0} + set @name (unknown) $self item TEXT text [list $x1 $y1] \ -font $font(str) -text "an array named '$@name' should appear in this patch" \ *************** *** 5501,5513 **** foreach {type names} $ddrc_options { ! set label "" ! if {[llength $names] > 1} { ! foreach name $names { ! append label " [say $name]" ! } ! } else { set label [say $names] ! } ! if {[string length $label] > $@max_label} {set @max_label [expr [string length $label] + 20]} } --- 5510,5520 ---- foreach {type names} $ddrc_options { ! set label "" ! if {[llength $names] > 1} { ! foreach name $names {append label " [say $name]"} ! } else { set label [say $names] ! } ! if {[string length $label] > $@max_label} {set @max_label [expr [string length $label]+20]} } *************** *** 5517,5521 **** switch $type { section { ! $self add_section [incr section] [say $name] set which_section $f.main.$section set which_self $self --- 5524,5528 ---- switch $type { section { ! $self add_section [incr section] [say $name] set which_section $f.main.$section set which_self $self *************** *** 5545,5550 **** set @$var $which_section.[string tolower [lindex $name 0]].[string tolower $item] } ! puts " name::: $name" ! $self add $which_section [list $name $type] } crosshair { --- 5552,5556 ---- set @$var $which_section.[string tolower [lindex $name 0]].[string tolower $item] } ! $self add $which_section [list $name $type] } crosshair {

1 0

pd/src desire.tk,1.1.2.378,1.1.2.379
by Mathieu Bouchard 20 Aug '06

20 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17310 Modified Files: Tag: devel_0_39 desire.tk Log Message: some code for Array Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.378 retrieving revision 1.1.2.379 diff -C2 -d -r1.1.2.378 -r1.1.2.379 *** desire.tk 20 Aug 2006 01:00:44 -0000 1.1.2.378 --- desire.tk 20 Aug 2006 01:38:53 -0000 1.1.2.379 *************** *** 3021,3024 **** --- 3021,3025 ---- set fields(floatatom) {foo bar x1 y1 w min max pos lab snd rcv} set fields(symbolatom) {foo bar x1 y1 w min max pos lab snd rcv} + set fields(array) {name n elemtype flags} proc classinfo {pdclass _class} { *************** *** 3028,3031 **** --- 3029,3033 ---- } + # basic patchables classinfo obj ObjectBox classinfo msg MessageBox *************** *** 3034,3037 **** --- 3036,3043 ---- classinfo text Comment + # non-patchables (scalars, arrays, ...) + classinfo array Array + + # GUI patchables classinfo bng Bang classinfo tgl Toggle *************** *** 3055,3058 **** --- 3061,3068 ---- # remember, _($foo:$bar) notation should die # because objects ought to be autonomous. + + # in array objects, number of inlets is bogus? + #X array array1 1 float 3; + #A 0 0; proc update_object {self e ninlets noutlets} { global _ fields classinfo canvas *************** *** 3084,3092 **** } if {$isnew} {$_class new_as $self} ! $self position= [lrange $mess 2 3] $self canvas= $canvas(current) $self pdclass= $class ! $self ninlets= $ninlets $self noutlets= $noutlets switch -- $class { obj {$self text= [join [lrange $mess 4 end]]} --- 3094,3106 ---- } if {$isnew} {$_class new_as $self} ! switch -- $class { ! array {} ! default {$self position= [lrange $mess 2 3]} ! } $self canvas= $canvas(current) $self pdclass= $class ! $self ninlets= $ninlets ;# bogus in case of array $self noutlets= $noutlets + #puts "CLASS IS $class" switch -- $class { obj {$self text= [join [lrange $mess 4 end]]} *************** *** 3094,3097 **** --- 3108,3112 ---- text {$self text= [join [lrange $mess 4 end]]} restore {$self text= [join [lrange $mess 4 end]]} + array {puts "\033\[0;1;32mGOT ARRAY!"} default { set i 0; foreach f $fields($class) { *************** *** 4130,4133 **** --- 4145,4162 ---- } + class_new Array {Box} + + def Array init {} { + + } + + def Array draw {} { + global font + mset {x1 y1} {0 0} + $self item TEXT text [list $x1 $y1] \ + -font $font(str) -text "an array named '$@name' should appear in this patch" \ + -fill [look objectfg] -anchor nw + } + ##################################################################################### # console

1 0

[PD-cvs] pd/src desire.c, 1.1.2.106, 1.1.2.107 desire.tk, 1.1.2.377, 1.1.2.378
by Mathieu Bouchard 20 Aug '06

20 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3668 Modified Files: Tag: devel_0_39 desire.c desire.tk Log Message: abortion prevention... Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.377 retrieving revision 1.1.2.378 diff -C2 -d -r1.1.2.377 -r1.1.2.378 *** desire.tk 19 Aug 2006 18:42:27 -0000 1.1.2.377 --- desire.tk 20 Aug 2006 01:00:44 -0000 1.1.2.378 *************** *** 412,416 **** #temporary ! set leet 1 proc say {k args} { --- 412,416 ---- #temporary ! set leet 0 proc say {k args} { *************** *** 421,428 **** if {[info exist text($k)]} { if {$leet} { ! set l33t [string map -nocase {a 4 e 3 t 7 s 5 i 1 o 0 g 9} $text($k)] ! return $l33t} else {return $text($k)} ! #return $text($k) ! } else {return "{{$k}}"} } } --- 421,429 ---- if {[info exist text($k)]} { if {$leet} { ! return [string map -nocase {a 4 e 3 t 7 s 5 i 1 o 0 g 9} $text($k)] ! } else { ! return $text($k) ! } ! } else {return "{{$k}}"} } } *************** *** 1246,1249 **** --- 1247,1253 ---- def Canvas redo {} {$@history redo} + #N canvas 0 0 450 300 graph2 0; + #X restore 123 271 graph; + #!@#$ this method is too long. def Canvas init {x1 y1 xs ys args} { *************** *** 1270,1274 **** set @bbox {0 0 100 100} set @children {} - set @unborn {} set @obj_in_edit {} set @dehighlight {} --- 1274,1277 ---- *************** *** 1777,1799 **** # think of the children!!! # should be only called from the server def Canvas children= {children} { set new [lwithout $children $@children] set dead [lwithout $@children $children] ! foreach x [lreverse $dead] { ! $x unsubscribe $self ! #$@history can't ;# need a way to instantiate objects with a specific index. ! # THIS IS NOT WHERE HISTORY ADD IS SUPPOSED TO BE! ! # it's supposed to be on the user end! ! #$@history add [list $self ins [lsearch $@children $x] [$x deconstruct]] ! $x erase ! } ! foreach x $new { ! ###$@history add [list $self del [lsearch $children $x]] ! if {[info exists _($x:_class)]} { ! $x subscribe $self; $x changed; $x canvas= $self ! } else { ! lappend @unborn $x ! } ! } set @children $children $self changed --- 1780,1790 ---- # think of the children!!! # should be only called from the server + # THIS IS NOT WHERE HISTORY ADD IS SUPPOSED TO BE! + # it's supposed to be on the user end! def Canvas children= {children} { set new [lwithout $children $@children] set dead [lwithout $@children $children] ! foreach x [lreverse $dead] {$x unsubscribe $self; $x erase} ;# should use _delete instead? ! foreach x $new {$x subscribe $self; $x changed; $x canvas= $self} set @children $children $self changed *************** *** 1814,1826 **** set find [lsearch $@wires_pair $x] if {$find == -1} {# new wire!!! ! if {[info exists _($obj1:_class)] && [info exists _($obj2:_class)]} { ! lappend @wires_pair [list $outobj $outport $inobj $inport] ! set new_wire [eval [list Wire_new $self $outobj $outport $inobj $inport]] ! lappend @wires_pair $new_wire ! lappend wires $new_wire ! } else { ! puts "$obj1 or $obj2 not born yet" ! set @unborn_wire [lappend @unborn_wire $x] ! } } else {# wire already exists lappend wires [lindex $@wires_pair [expr $find + 1]] --- 1805,1812 ---- set find [lsearch $@wires_pair $x] if {$find == -1} {# new wire!!! ! lappend @wires_pair [list $outobj $outport $inobj $inport] ! set new_wire [eval [list Wire_new $self $outobj $outport $inobj $inport]] ! lappend @wires_pair $new_wire ! lappend wires $new_wire } else {# wire already exists lappend wires [lindex $@wires_pair [expr $find + 1]] *************** *** 3119,3122 **** --- 3105,3111 ---- } } + "#A" { + post "#A: $mess" + } "#V" { post "#V: $mess" *************** *** 3125,3152 **** } } - update_object_3 $self $mess $self changed } - # proc for treating race conditions - # shouldn't be needed (please replace this by something more solid) - proc update_object_3 {self e} { - global canvas _ - set c $canvas(current) - set unborn_children [lsearch $_($c:unborn) $self] - if {$unborn_children<0} {return} - $self canvas= $c - $self subscribe $c - $self changed - if {$unborn_children == [expr [llength $_($c:unborn)] - 1]} { - # when it reaches the last unborn child, its time to draw the wires - set _($c:unborn) "" - if {[info exists _($c:unborn_wire)]} { - $c wires= $_($c:unborn_wire) - unset _($c:unborn_wire) - } - } - } - ############ rendering --- 3114,3120 ---- Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.106 retrieving revision 1.1.2.107 diff -C2 -d -r1.1.2.106 -r1.1.2.107 *** desire.c 20 Aug 2006 00:30:23 -0000 1.1.2.106 --- desire.c 20 Aug 2006 01:00:44 -0000 1.1.2.107 *************** *** 4967,4971 **** free(buf); gobj_subscribe(y,(t_gobj *)x); ! gobj_changed(y,0); y->g_next = 0; if (!x->gl_list) x->gl_list = y; --- 4967,4976 ---- free(buf); gobj_subscribe(y,(t_gobj *)x); ! ! /* delay first uploading of object (DesireData <= 2006.08.19) */ ! /* gobj_changed(y,0); */ ! /* don't delay first uploading of object (DesireData >= 2006.08.19) */ ! pd_upload(y); ! y->g_next = 0; if (!x->gl_list) x->gl_list = y;

1 0

pd/src desire.c,1.1.2.105,1.1.2.106
by Mathieu Bouchard 20 Aug '06

20 Aug '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24895 Modified Files: Tag: devel_0_39 desire.c Log Message: fixed glist_add trace prints, so that it doesn't crash when binbuf is invalid. Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.105 retrieving revision 1.1.2.106 diff -C2 -d -r1.1.2.105 -r1.1.2.106 *** desire.c 17 Aug 2006 23:14:37 -0000 1.1.2.105 --- desire.c 20 Aug 2006 00:30:23 -0000 1.1.2.106 *************** *** 4945,4953 **** void canvas_drawredrect(t_canvas *x, int doit); void glist_add(t_glist *x, t_gobj *y) { char *buf; int bufn; ! binbuf_gettext(((t_text *)y)->te_binbuf,&buf,&bufn); ! printf("glist_add %p %p [%.*s]\n",x,y,bufn,buf); free(buf); gobj_subscribe(y,(t_gobj *)x); --- 4945,4968 ---- void canvas_drawredrect(t_canvas *x, int doit); + struct _binbuf + { + int b_n; + t_atom *b_vec; + }; + void glist_add(t_glist *x, t_gobj *y) { char *buf; int bufn; ! if (!y->g_pd->c_patchable) { ! printf("glist_add %p %p class=%s (non-t_text)\n",x,y,y->g_pd->c_name->s_name); ! } else { ! t_binbuf *bb = ((t_text *)y)->te_binbuf; ! if (bb->b_vec) { ! binbuf_gettext(bb,&buf,&bufn); ! printf("glist_add %p %p [%.*s]\n",x,y,bufn,buf); ! } else { ! printf("glist_add %p %p class=%s (binbuf without b_vec !)\n",x,y,y->g_pd->c_name->s_name); ! } ! } free(buf); gobj_subscribe(y,(t_gobj *)x); *************** *** 11819,11826 **** } ! static void *bng_new(t_symbol *s, int argc, t_atom *argv) ! { t_bng *x = (t_bng *)iemgui_new(bng_class); - post("@@@@@@@ bng_new @@@@@@"); x->ftbreak = 250; x->fthold = 50; --- 11834,11839 ---- } ! static void *bng_new(t_symbol *s, int argc, t_atom *argv) { t_bng *x = (t_bng *)iemgui_new(bng_class); x->ftbreak = 250; x->fthold = 50;

1 0

pd/src/tests all_guis_and_gop.pd,NONE,1.1.2.1
by Mathieu Bouchard 20 Aug '06

20 Aug '06

Update of /cvsroot/pure-data/pd/src/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8061 Added Files: Tag: devel_0_39 all_guis_and_gop.pd Log Message: the patch i was using to test ImpureData --- NEW FILE: all_guis_and_gop.pd --- #N canvas 487 81 590 622 10; #X obj 98 29 +; #X floatatom 99 83 5 0 0 0 - - -; #X symbolatom 99 108 10 0 0 0 - - -; #X obj 158 27 bng 42 250 50 0 empty empty button-label 50 8 0 8 -258699 -1 -1; #X obj 158 87 tgl 15 0 empty empty hello? 20 8 0 8 -24198 -1 -1 0 1 ; #X obj 227 140 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 10 -262144 -1 -1 0 256; #X obj 5 13 vsl 25 150 0 127 0 0 empty empty vslider-hello -2 -6 0 8 -241291 -1 -1 0 0; #X obj 44 226 hsl 100 10 0 127 0 0 empty empty hello-hslider 10 6 0 8 -262144 -1 -258699 0 0; #X obj 69 184 hradio 15 1 0 8 empty empty hello-hradio 0 -6 0 8 -261681 -1 -1 0; #X obj 69 24 vradio 15 1 0 8 empty empty hello-vradio 0 -6 0 8 -262144 -1 -1 0; #X obj 350 166 vu 15 120 empty vumeter-label -1 -8 0 8 -166441 -1 1 0; #X obj 450 192 cnv 15 100 60 empty empty empty 20 12 0 14 -233017 -66577 0; #N canvas 365 389 415 216 graph1 0; #X obj 96 25 +; #X msg 96 53; #X floatatom 99 83 5 0 0 0 - - -; #X symbolatom 99 108 10 0 0 0 - - -; #X obj 158 27 bng 42 250 50 0 empty empty button-label 50 8 0 8 -258699 -1 -1; #X obj 158 87 tgl 15 0 empty empty hello? 20 8 0 8 -24198 -1 -1 0 1 ; #X obj 227 140 nbx 5 14 -1e+37 1e+37 0 0 empty empty empty 0 -6 0 10 -262144 -1 -1 0 256; #X obj 5 13 vsl 25 150 0 127 0 0 empty empty vslider-hello -2 -6 0 8 -241291 -1 -1 0 0; #X obj 44 226 hsl 100 10 0 127 0 0 empty empty hello-hslider 10 6 0 8 -262144 -1 -258699 0 0; #X obj 69 184 hradio 15 1 0 8 empty empty hello-hradio 0 -6 0 8 -261681 -1 -1 0; #X obj 69 24 vradio 15 1 0 8 empty empty hello-vradio 0 -6 0 8 -262144 -1 -1 0; #X obj 225 74 nbx 5 14 -1e+37 1e+37 0 0 empty empty numbox2-label 60 8 0 8 -260818 -62784 -1 0 256; #X floatatom 227 44 5 0 0 0 - - -; #X text 86 152 (Comment Hello World!); #X obj 350 166 vu 15 120 empty vumeter-label -1 -8 0 8 -166441 -1 1 0; #X floatatom 347 115 5 0 0 0 - - -; #X floatatom 394 116 5 -99 42 2 floatatom-label - -; #X obj 450 192 cnv 15 100 60 empty empty empty 20 12 0 14 -233017 -66577 0; #N canvas 0 0 450 300 graph2 0; #X array array1 100 float 1; #A 0 -0.0571427 -0.0428571 -0.0857141 -0.171428 -0.185714 -0.199999 -0.206428 -0.212856 -0.219285 -0.225714 -0.232142 -0.238571 -0.244999 -0.251428 -0.229284 -0.229284 -0.186426 -0.172139 -0.154282 -0.136424 -0.118567 -0.100709 -0.0721368 -0.0364215 -0.000706278 0.0278659 0.499307 0.585024 0.59931 0.59931 0.563594 0.499307 0.327874 0.2493 0.170727 0.127869 0.042152 -0.0435646 -0.0721368 -0.114995 -0.153091 -0.191188 -0.229284 -0.257856 -0.300714 -0.329287 -0.343573 -0.365002 -0.386431 -0.386431 -0.393574 -0.400717 -0.400717 -0.386431 -0.372145 -0.357859 -0.329287 -0.315 -0.300714 -0.286428 -0.272142 -0.257856 -0.24357 -0.214998 -0.186426 -0.157853 -0.129281 -0.105471 -0.0816609 -0.0578507 -0.0435646 -0.0435646 -0.114995 -0.186426 -0.315 -0.386431 -0.415003 -0.472148 -0.50072 -0.529292 -0.529292 -0.540006 -0.550721 -0.561436 -0.586436 -0.586436 -0.600722 -0.600722 -0.597151 -0.593579 -0.590008 -0.586436 -0.579293 -0.557864 -0.543578 -0.515006 -0.50072 -0.457861 -0.429289 -0.257856; #X coords 0 1 99 -1 200 140 1; #X restore 123 271 graph; #X connect 4 0 5 0; #X connect 5 0 6 0; #X connect 7 0 8 0; #X connect 10 0 9 0; #X connect 11 0 6 0; #X connect 12 0 11 0; #X connect 15 0 14 0; #X connect 16 0 14 1; #X coords 0 1 100 -1 300 140 1; #X restore 23 414 graph; #N canvas 0 0 450 300 graph2 0; #X array array1 100 float 1; #A 0 -0.0571427 -0.0428571 -0.0857141 -0.171428 -0.185714 -0.199999 -0.206428 -0.212856 -0.219285 -0.225714 -0.232142 -0.238571 -0.244999 -0.251428 -0.257856 -0.264285 -0.270713 -0.277142 -0.28357 -0.289999 -0.296427 -0.302856 -0.309285 -0.315713 -0.322142 -0.32857 -0.331427 -0.334285 -0.337142 -0.339999 -0.342856 -0.345713 -0.34857 -0.351427 -0.354284 -0.357141 -0.359999 -0.362856 -0.365713 -0.35857 -0.351427 -0.329999 -0.30857 -0.279999 -0.25619 -0.23238 -0.208571 -0.18 0.162856 0.305712 0.419998 0.448569 0.491426 0.57714 0.591425 0.605711 0.305712 0.14857 0.105713 -0.00857189 -0.122857 -0.237142 -0.322856 -0.40857 -0.479998 -0.50857 -0.565712 -0.594283 -0.608569 -0.608569 -0.608569 -0.594283 -0.565712 -0.546664 -0.527617 -0.494284 -0.460951 0.0342851 -0.0514288 -0.165714 -0.201428 -0.251428 -0.265714 -0.294285 -0.337142 -0.337142 -0.365713 -0.365713 -0.40857 -0.437141 -0.451427 -0.451427 -0.451427 -0.479998 -0.494284 -0.477141 -0.482855 -0.48857 -0.494284 -0.499998; #X coords 0 1 99 -1 200 140 1; #X restore 123 271 graph; #X floatatom 347 115 5 0 0 0 - - -; #X floatatom 394 116 5 -99 42 2 floatatom-label - -; #X obj 225 74 nbx 5 14 -1e+37 1e+37 0 0 empty empty numbox2-label 60 8 0 8 -260818 -62784 -1 0 256; #X floatatom 227 44 5 0 0 0 - - -; #X msg 98 57; #X connect 3 0 4 0; #X connect 4 0 5 0; #X connect 6 0 7 0; #X connect 8 0 7 0; #X connect 9 0 8 0; #X connect 14 0 10 0; #X connect 15 0 10 1; #X connect 16 0 5 0; #X connect 17 0 16 0;

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

Pd-cvs August 2006