Pd-cvs August 2005

pd-cvs@lists.iem.at

8 participants
108 discussions

externals/grh/GApop/pd GA_example1.pd, NONE, 1.1 help-GApop.pd, 1.1, 1.2
by Georg Holzmann 01 Aug '05

01 Aug '05

Update of /cvsroot/pure-data/externals/grh/GApop/pd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31158 Modified Files: help-GApop.pd Added Files: GA_example1.pd Log Message: some updates, new example --- NEW FILE: GA_example1.pd --- #N canvas 49 0 889 648 10; #X msg 529 540 getattributes; #X msg 336 532 cross; #X msg 155 546 getfitbuf; #X msg 52 547 getpopbuf; #X msg 529 514 help; #X msg 396 533 update; #X obj 154 572 s GAmessages; #X obj 29 22 cnv 15 308 68 empty empty empty 7 30 0 16 -1 -262144 0 ; #X obj 33 26 cnv 15 300 60 empty empty GA_example1: 40 30 0 16 -217163 -262144 0; #X obj 52 572 s GAmessages; #X msg 52 522 set pop1; #N canvas 268 199 934 315 init 0; #X obj 46 27 loadbang; #X msg 46 57 \; pop1 ylabel 9.5 0 0.5 1 \; pop1 yticks 0 0.1 2 \; pop1 xticks 0 1 2 \; fit1 ylabel 105 0 0.5 1 \; fit1 yticks 0 0.1 2 \; fit1 xticks 0 10 2 \;; #X msg 364 123 cross; #X msg 364 179 update; #X obj 364 153 t b; #X obj 363 97 metro 1000; #X obj 324 219 s GAmessages; #X obj 314 50 r GAIO; #X connect 0 0 1 0; #X connect 2 0 4 0; #X connect 2 0 6 0; #X connect 3 0 6 0; #X connect 4 0 3 0; #X connect 5 0 2 0; #X connect 7 0 5 0; #X restore 267 46 pd init; #X msg 155 522 fitbuf fit1; #X obj 403 111 s GAmessages; #X obj 336 565 s GAmessages; #X obj 529 567 s GAmessages; #X text 548 487 Help:; #X obj 767 52 tgl 50 0 GAIO empty lets_propagate -15 -6 0 10 -1109 -262144 -1 0 1; #X obj 77 210 cnv 15 300 200 empty empty empty 20 12 0 14 -225271 -66577 0; #N canvas 0 0 450 300 graph1 0; #X array pop1 10 float 1; #A 0 1 0.9471 0.9845 0.7524 0.9467 1 0.9475 0.983 0.7045 1; #X coords 0 1 9 0 300 200 1; #X restore 77 209 graph; #X text 73 413 1; #X text 206 412 5; #X text 368 412 10; #X obj 492 214 cnv 15 300 200 empty empty empty 20 12 0 14 -261681 -66577 0; #N canvas 0 0 450 300 graph1 0; #X array fit1 101 float 1; #A 0 0.0473031 0.052303 0.0673027 0.0723026 0.0823024 0.0923022 0.102302 0.107302 0.117302 0.127301 0.132301 0.137301 0.137301 0.142301 0.157301 0.167301 0.1723 0.1873 0.1923 0.2073 0.2173 0.237299 0.247299 0.257299 0.267298 0.272298 0.282298 0.297298 0.307298 0.322297 0.324797 0.337297 0.342297 0.342297 0.347297 0.352297 0.362297 0.362297 0.372296 0.377296 0.382296 0.387296 0.387296 0.402296 0.407296 0.407296 0.412296 0.422295 0.432295 0.432295 0.442295 0.442295 0.447295 0.457295 0.462295 0.467295 0.477294 0.482294 0.492294 0.492294 0.497294 0.507294 0.512294 0.517294 0.527293 0.527293 0.547293 0.552293 0.552293 0.567292 0.577292 0.592292 0.594792 0.597292 0.612291 0.622291 0.632291 0.652291 0.66229 0.66729 0.68229 0.68729 0.69229 0.697289 0.717289 0.732289 0.742289 0.752288 0.762288 0.767288 0.782288 0.792288 0.812287 0.822287 0.842286 0.852286 0.882286 0.887285 0.897285 0.902285 0.992283; #X coords 0 1 100 0 300 200 1; #X restore 492 213 graph; #X text 488 415 0; #X text 630 416 0.5; #X text 787 417 1; #X text 49 463 set population \, fitfunction:; #X obj 155 494 loadbang; #X msg 403 80 pairs \$1; #X msg 504 79 mutrange \$1; #X msg 639 79 mutprop \$1; #X obj 403 50 nbx 5 20 -1e+37 1e+37 0 0 empty empty pairs 0 -13 0 10 -233017 -1 -258699 0 256; #X obj 504 50 nbx 5 20 -1e+37 1e+37 0 0 empty empty mut-range 0 -13 0 10 -233017 -1 -258699 0 256; #X obj 639 51 nbx 5 20 -1e+37 1e+37 0 0 empty empty mut-prop 0 -13 0 10 -233017 -1 -258699 0 256; #X text 322 502 crossover \, mutation:; #X obj 689 509 cnv 15 100 60 empty empty empty 20 12 0 14 -1 -66577 0; #X obj 691 511 cnv 15 96 56 empty empty empty 20 12 0 14 -260818 -66577 0; #X obj 698 527 GApop pop1; #X floatatom 697 461 5 0 0 0 - - -; #X obj 698 484 r GAmessages; #X obj 773 575 print; #X floatatom 698 575 5 0 0 0 - - -; #X text 72 174 population (with 10 individuums):; #X text 489 180 fitness function:; #X text 581 614 (c) 2004 \, Georg Holzmann <grh(a)mur.at>; #X connect 0 0 15 0; #X connect 1 0 14 0; #X connect 2 0 6 0; #X connect 3 0 9 0; #X connect 4 0 15 0; #X connect 5 0 14 0; #X connect 10 0 9 0; #X connect 12 0 6 0; #X connect 29 0 12 0; #X connect 30 0 13 0; #X connect 31 0 13 0; #X connect 32 0 13 0; #X connect 33 0 30 0; #X connect 34 0 31 0; #X connect 35 0 32 0; #X connect 39 0 43 0; #X connect 39 1 42 0; #X connect 40 0 39 0; #X connect 41 0 39 0; Index: help-GApop.pd =================================================================== RCS file: /cvsroot/pure-data/externals/grh/GApop/pd/help-GApop.pd,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** help-GApop.pd 12 Jul 2005 14:20:39 -0000 1.1 --- help-GApop.pd 1 Aug 2005 15:11:23 -0000 1.2 *************** *** 40,44 **** #X msg 89 671 getpairs; #X obj 883 727 GApop pop1; ! #X msg 598 631 cross; #X floatatom 883 769 5 0 0 0 - - -; #X floatatom 883 665 5 0 0 0 - - -; --- 40,44 ---- #X msg 89 671 getpairs; #X obj 883 727 GApop pop1; ! #X msg 598 647 cross; #X floatatom 883 769 5 0 0 0 - - -; #X floatatom 883 665 5 0 0 0 - - -; *************** *** 46,55 **** #X msg 61 380 getpopbuf; #X msg 600 746 help; ! #X msg 658 632 update; #X obj 898 699 r GAmessages; #X obj 679 311 s GAmessages; #X obj 18 13 cnv 15 130 30 empty empty GApop: 7 15 0 16 -217163 -262144 0; - #X text 152 15 Georg Holzmann <grh(a)gmx.at>; #X obj 61 405 s GAmessages; #X obj 22 103 cnv 15 30 30 empty empty 1 10 14 0 14 -233017 -1 0; --- 46,54 ---- #X msg 61 380 getpopbuf; #X msg 600 746 help; ! #X msg 658 648 update; #X obj 898 699 r GAmessages; #X obj 679 311 s GAmessages; #X obj 18 13 cnv 15 130 30 empty empty GApop: 7 15 0 16 -217163 -262144 0; #X obj 61 405 s GAmessages; #X obj 22 103 cnv 15 30 30 empty empty 1 10 14 0 14 -233017 -1 0; *************** *** 93,98 **** if you give in 0 \, GApop puts out the value of the fittest parameters \, if you give in 1 \, the value of the next fit parameter \, ...; ! #X obj 598 664 s GAmessages; ! #X text 746 662 give in numbers:; #X obj 600 799 s GAmessages; #X text 619 719 Help:; --- 92,97 ---- if you give in 0 \, GApop puts out the value of the fittest parameters \, if you give in 1 \, the value of the next fit parameter \, ...; ! #X obj 598 680 s GAmessages; ! #X text 758 665 give in numbers:; #X obj 600 799 s GAmessages; #X text 619 719 Help:; *************** *** 150,173 **** #X obj 526 450 cnv 15 30 30 empty empty 4 10 14 0 14 -233017 -1 0; #X text 566 457 get the data:; ! #X text 595 591 - update: updates the pop1 array (only to see the changes) ! ; ! #X connect 2 0 49 0; ! #X connect 4 0 42 0; ! #X connect 5 0 42 0; ! #X connect 6 0 42 0; ! #X connect 7 0 42 0; ! #X connect 8 0 42 0; #X connect 9 0 11 0; #X connect 9 1 3 0; ! #X connect 10 0 47 0; #X connect 12 0 9 0; #X connect 13 0 18 0; ! #X connect 14 0 21 0; ! #X connect 15 0 49 0; ! #X connect 16 0 47 0; #X connect 17 0 9 0; ! #X connect 26 0 21 0; ! #X connect 27 0 21 0; ! #X connect 36 0 18 0; ! #X connect 43 0 42 0; ! #X connect 53 0 52 0; --- 149,173 ---- #X obj 526 450 cnv 15 30 30 empty empty 4 10 14 0 14 -233017 -1 0; #X text 566 457 get the data:; ! #X text 152 15 Georg Holzmann <grh(a)mur.at>; ! #X text 595 591 - update: updates the graphic of the pop1 array (only ! to see the changes); ! #X connect 2 0 48 0; ! #X connect 4 0 41 0; ! #X connect 5 0 41 0; ! #X connect 6 0 41 0; ! #X connect 7 0 41 0; ! #X connect 8 0 41 0; #X connect 9 0 11 0; #X connect 9 1 3 0; ! #X connect 10 0 46 0; #X connect 12 0 9 0; #X connect 13 0 18 0; ! #X connect 14 0 20 0; ! #X connect 15 0 48 0; ! #X connect 16 0 46 0; #X connect 17 0 9 0; ! #X connect 25 0 20 0; ! #X connect 26 0 20 0; ! #X connect 35 0 18 0; ! #X connect 42 0 41 0; ! #X connect 52 0 51 0;

1 0

externals/grh/GApop/src GApop.cpp,1.1,1.2
by Georg Holzmann 01 Aug '05

01 Aug '05

Update of /cvsroot/pure-data/externals/grh/GApop/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30129 Modified Files: GApop.cpp Log Message: some bug fixes ... Index: GApop.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grh/GApop/src/GApop.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** GApop.cpp 12 Jul 2005 14:20:39 -0000 1.1 --- GApop.cpp 1 Aug 2005 15:07:37 -0000 1.2 *************** *** 5,9 **** // how to use it // ! // Copyright (c) 2004 Georg Holzmann <grh(a)gmx.at> // For information on usage and redistribution, and for a DISCLAIMER OF ALL // WARRANTIES, see the file, "license.txt," in this distribution. --- 5,9 ---- // how to use it // ! // Copyright (c) 2004 Georg Holzmann <grh(a)mur.at> // For information on usage and redistribution, and for a DISCLAIMER OF ALL // WARRANTIES, see the file, "license.txt," in this distribution. *************** *** 41,44 **** --- 41,47 ---- // constructor with a variable argument list GApop(int argc,const t_atom *argv); + + //destructor + ~GApop(); protected: *************** *** 53,56 **** --- 56,60 ---- // the fitness order int *tempfit; + float *tempfit1; // the other parameters: *************** *** 178,182 **** post("1 - set all parameters:"); post("popbuf contains the population (array with numbers"); ! post(" between 0 and 1, max size is 200)"); post("fitbuf contains the fitness function (numbers between"); post(" 0 and 1, size should be 101: 0 = fitness(0),"); --- 182,186 ---- post("1 - set all parameters:"); post("popbuf contains the population (array with numbers"); ! post(" between 0 and 1)"); post("fitbuf contains the fitness function (numbers between"); post(" 0 and 1, size should be 101: 0 = fitness(0),"); *************** *** 187,193 **** post("2 - get the data:"); post("cross makes fitscaling, crossover and mutation"); ! post("numbers in inlet 0 get the values: 0 means the value"); post(" of the fittest, 1 the value of the next..."); ! post("have fun - Georg Holzmann <grh(a)gmx.at>\n"); } --- 191,197 ---- post("2 - get the data:"); post("cross makes fitscaling, crossover and mutation"); ! post("numbers in inlet 0 get the values: 0 means the value"); post(" of the fittest, 1 the value of the next..."); ! post("have fun - Georg Holzmann <grh(a)mur.at>\n"); } *************** *** 203,206 **** --- 207,211 ---- popbuf=NULL; popname=NULL; tempfit=NULL; + tempfit1=NULL; buffsize=0; pairs = 0; *************** *** 217,222 **** // set buffer according to creation arguments if(argc == 1 && IsSymbol(argv[0])) ! { m_set(argc,argv); } ! } --- 222,236 ---- // set buffer according to creation arguments if(argc == 1 && IsSymbol(argv[0])) ! m_set(argc,argv); ! } ! ! GApop::~GApop() ! { ! if(popbuf) delete popbuf; ! if(fitbuf) delete fitbuf; ! if(tempfit) delete[] tempfit; ! if(tempfit1) delete[] tempfit1; ! ! } *************** *** 317,321 **** // clear existing buffer if(popbuf) delete popbuf; ! if(tempfit) delete tempfit; // save buffer name --- 331,336 ---- // clear existing buffer if(popbuf) delete popbuf; ! if(tempfit) delete[] tempfit; ! if(tempfit1) delete[] tempfit1; // save buffer name *************** *** 325,330 **** buffsize = popbuf->Frames(); ! // make new tempfit buffer tempfit = new int[buffsize]; if(!popbuf->Ok()) { --- 340,346 ---- buffsize = popbuf->Frames(); ! // make new tempfit buffers tempfit = new int[buffsize]; + tempfit1 = new float[buffsize]; if(!popbuf->Ok()) { *************** *** 391,411 **** void GApop::m_cross() { ! if(Checkpopbuf() && Checkfitbuf() && pairs<(buffsize/2-1)) ! { ! // 1. step: // every parameter get's a fitness from the // given fitness function // this fitness is saved into the temporary array tempfit1[] - // make temporary array - float *tempfit1 = new float[200]; - // write the fitness for(int i=0; i < buffsize; i++) - { tempfit1[i] = cutse(fitbuf->Data()[int(popbuf->Data()[i]*100+0.5)]); - } --- 407,429 ---- void GApop::m_cross() { ! if(!Checkpopbuf() || !Checkfitbuf()) ! return; ! ! if(pairs>=(buffsize/2)) ! { ! post("GApop - pairs must be smaller then (buffsize/2)-1!"); ! post(" currently %d pairs with a buffsize of %d!", pairs, buffsize); ! return; ! } ! // 1. step: // every parameter get's a fitness from the // given fitness function // this fitness is saved into the temporary array tempfit1[] // write the fitness for(int i=0; i < buffsize; i++) tempfit1[i] = cutse(fitbuf->Data()[int(popbuf->Data()[i]*100+0.5)]); *************** *** 464,478 **** } } - - // delete the temporary array - delete []tempfit1; - } - - - else - { - // invalid buffers - post("GApop - entered buffers are invalid!"); - } } --- 482,485 ---- *************** *** 480,484 **** // takes the incomig ints and gives out the specific individuum: // 0 ... fittest individuum ! // 1 ... next individuum // ... void GApop::m_trigger(int i) --- 487,491 ---- // takes the incomig ints and gives out the specific individuum: // 0 ... fittest individuum ! // 1 ... next fit individuum // ... void GApop::m_trigger(int i) *************** *** 488,493 **** // make the boundaries for i: ! if(i<0) {i=0;} ! if(i>200) {i=200;} // correct syntax, output value --- 495,500 ---- // make the boundaries for i: ! if(i<0) i=0; ! if(i>buffsize) i=buffsize; // correct syntax, output value

1 0

externals/grill/py readme.txt,1.40,1.41
by Thomas Grill 01 Aug '05

01 Aug '05

Update of /cvsroot/pure-data/externals/grill/py In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11003 Modified Files: readme.txt Log Message: path setting based on new flext functionality open editor for module file on "edit" message (or click) open editor for script under OS X Index: readme.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/readme.txt,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** readme.txt 19 Jul 2005 13:18:33 -0000 1.40 --- readme.txt 1 Aug 2005 11:58:01 -0000 1.41 *************** *** 100,103 **** --- 100,104 ---- - FIX: better definition of output values for atoms, lists and anythings - FIX: much better detached method handling (one thread for all object instances!) + - ADD: open module file in editor on "edit" message (or alt-click (PD) or double click (Max)) 0.2.0:

1 0

externals/grill/py/source py.cpp, 1.32, 1.33 pyargs.cpp, 1.21, 1.22 pybase.cpp, 1.6, 1.7 pybase.h, 1.6, 1.7 pyext.cpp, 1.40, 1.41 pyext.h, 1.27, 1.28 pymeth.cpp, 1.4, 1.5 pyprefix.h, 1.4, 1.5
by Thomas Grill 01 Aug '05

01 Aug '05

Update of /cvsroot/pure-data/externals/grill/py/source In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11003/source Modified Files: py.cpp pyargs.cpp pybase.cpp pybase.h pyext.cpp pyext.h pymeth.cpp pyprefix.h Log Message: path setting based on new flext functionality open editor for module file on "edit" message (or click) open editor for script under OS X Index: pyargs.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyargs.cpp,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** pyargs.cpp 30 Jul 2005 12:22:11 -0000 1.21 --- pyargs.cpp 1 Aug 2005 11:58:01 -0000 1.22 *************** *** 176,180 **** // analyze return value or tuple - int rargc = 0; const t_symbol *sym = NULL; --- 176,179 ---- Index: pyprefix.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyprefix.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pyprefix.h 30 Jul 2005 12:22:11 -0000 1.4 --- pyprefix.h 1 Aug 2005 11:58:01 -0000 1.5 *************** *** 15,18 **** --- 15,22 ---- #include <flext.h> + // hack: must include math.h before Python.h (at least on OSX) + // otherwise some functions don't get defined + #include <math.h> + #if FLEXT_OS == FLEXT_OS_MAC #include <Python/Python.h> Index: pymeth.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pymeth.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** pymeth.cpp 20 Jul 2005 08:11:18 -0000 1.4 --- pymeth.cpp 1 Aug 2005 11:58:01 -0000 1.5 *************** *** 103,107 **** virtual bool CbMethodResort(int n,const t_symbol *s,int argc,const t_atom *argv); - virtual void CbClick(); void m_help(); --- 103,106 ---- *************** *** 424,429 **** } - void pymeth::CbClick() { pybase::OpenEditor(); } - void pymeth::DumpOut(const t_symbol *sym,int argc,const t_atom *argv) { --- 423,426 ---- Index: pyext.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyext.h,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** pyext.h 20 Jul 2005 08:11:18 -0000 1.27 --- pyext.h 1 Aug 2005 11:58:01 -0000 1.28 *************** *** 146,149 **** --- 146,151 ---- FLEXT_CALLBACK(m_doc) + FLEXT_CALLBACK(CbClick) + #ifdef FLEXT_THREADS FLEXT_CALLBACK_T(tick) Index: pybase.h =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pybase.h,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pybase.h 30 Jul 2005 12:22:11 -0000 1.6 --- pybase.h 1 Aug 2005 11:58:01 -0000 1.7 *************** *** 125,130 **** bool respond; #ifdef FLEXT_THREADS - bool shouldexit; int thrcount; int stoptick; Timer stoptmr; --- 125,130 ---- bool respond; #ifdef FLEXT_THREADS int thrcount; + bool shouldexit; int stoptick; Timer stoptmr; Index: pybase.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pybase.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pybase.cpp 30 Jul 2005 12:22:11 -0000 1.6 --- pybase.cpp 1 Aug 2005 11:58:01 -0000 1.7 *************** *** 12,15 **** --- 12,21 ---- #include <map> + #if FLEXT_OS == FLEXT_OS_WIN + #include <windows.h> + #elif FLEXT_OS == FLEXT_OS_MAC + #include <ApplicationServices/ApplicationServices.h> + #endif + static PyMethodDef StdOut_Methods[] = { *************** *** 296,300 **** void pybase::OpenEditor() { ! // this should once open the editor.... } --- 302,361 ---- void pybase::OpenEditor() { ! if(!module) return; ! const char *mname = PyModule_GetFilename(module); ! if(!mname) { ! PyErr_Clear(); ! return; ! } ! ! char fname[1024]; ! strcpy(fname,mname); ! ! // replacing .pyc or .pyo for source file name ! char *dt = strrchr(fname,'.'); ! if(dt && !strncmp(dt,".py",2)) strcpy(dt,".py"); ! ! // this should open the editor.... ! #if FLEXT_OS == FLEXT_OS_WIN ! int err = (int)ShellExecute(NULL,"edit",fname,NULL,NULL,SW_SHOW); ! if(err == SE_ERR_NOASSOC) { ! // no association found - try notepad ! err = (int)ShellExecute(NULL,NULL,"notepad.exe",fname,NULL,SW_SHOW); ! } ! else if(err == ERROR_FILE_NOT_FOUND || err == SE_ERR_FNF) ! post("py/pyext - File not %s found",fname); ! else if(err <= 32) ! post("py/pyext - Unknown error opening %s",fname); ! ! #elif FLEXT_OS == FLEXT_OS_MAC ! FSRef ref; ! OSStatus err = FSPathMakeRef(fname,&ref,NULL); ! if(err) ! post("py/pyext - Error interpreting path %s",fname); ! else { ! FSRef editor; ! err = LSGetApplicationForItem(&ref,kLSRolesEditor,&editor,NULL); ! if(err) { ! // Can't find associated application... try Textedit ! err = FSPathMakeRef("/Applications/TextEdit.app",&editor,NULL); ! if(err) ! post("py/pyext - Can't find Textedit application"); ! } ! ! if(!err) { ! LSLaunchFSRefSpec lspec; ! lspec.appRef = &editor; ! lspec.numDocs = 1; ! lspec.itemRefs = &ref; ! lspec.passThruParams = NULL; ! lspec.launchFlags = kLSLaunchDefaults; ! lspec.asyncRefCon = NULL; ! err = LSOpenFromRefSpec(&lspec,NULL); ! if(err) ! post("py/pyext - Couldn't launch editor"); ! } ! } ! #elif FLEXT_OS == FLEXT_OS_LINUX ! #endif } Index: pyext.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/pyext.cpp,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** pyext.cpp 30 Jul 2005 12:22:11 -0000 1.40 --- pyext.cpp 1 Aug 2005 11:58:01 -0000 1.41 *************** *** 42,45 **** --- 42,47 ---- FLEXT_CADDMETHOD_(c,0,"set",m_set); + FLEXT_CADDMETHOD_(c,0,"edit",CbClick); + FLEXT_CADDATTR_VAR1(c,"py",pymsg); FLEXT_CADDATTR_VAR1(c,"respond",respond); *************** *** 100,104 **** // remember the this pointer PyObject *th = PyLong_FromVoidPtr(this); ! /*int ret =*/ PyObject_SetAttrString(pyobj,"_this",th); // ref is taken } --- 102,106 ---- // remember the this pointer PyObject *th = PyLong_FromVoidPtr(this); ! PyObject_SetAttrString(pyobj,"_this",th); // ref is taken } Index: py.cpp =================================================================== RCS file: /cvsroot/pure-data/externals/grill/py/source/py.cpp,v retrieving revision 1.32 retrieving revision 1.33 diff -C2 -d -r1.32 -r1.33 *** py.cpp 30 Jul 2005 12:22:11 -0000 1.32 --- py.cpp 1 Aug 2005 11:58:01 -0000 1.33 *************** *** 75,78 **** --- 75,80 ---- FLEXT_CALLBACK(m_doc) + FLEXT_CALLBACK(CbClick) + #ifdef FLEXT_THREADS FLEXT_CALLBACK_T(tick) *************** *** 100,103 **** --- 102,107 ---- FLEXT_CADDMETHOD_(c,0,"set",m_set); + FLEXT_CADDMETHOD_(c,0,"edit",CbClick); + FLEXT_CADDATTR_VAR1(c,"py",pymsg); FLEXT_CADDATTR_VAR1(c,"respond",respond);

1 0

externals/grill/flext/buildsys/win/max gnumake-mingw.inc, 1.4, 1.5
by Thomas Grill 01 Aug '05

01 Aug '05

Update of /cvsroot/pure-data/externals/grill/flext/buildsys/win/max In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9397/buildsys/win/max Modified Files: gnumake-mingw.inc Log Message: Index: gnumake-mingw.inc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/win/max/gnumake-mingw.inc,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gnumake-mingw.inc 19 Jul 2005 23:08:32 -0000 1.4 --- gnumake-mingw.inc 1 Aug 2005 11:51:30 -0000 1.5 *************** *** 3,6 **** --- 3,8 ---- # fpack-struct should align to 2 bytes... can't specify that... CFLAGS += -DWINVER=0x0501 -D_WIN32_WINNT=0x501 + # suppress multiple symbol errors + LDFLAGS += -Wl,--allow-multiple-definition INCPATH += -I$(MAXSDKPATH)/max-includes -I$(MAXSDKPATH)/msp-includes *************** *** 8,10 **** # these are both in MAXSDKPATH ! LIBS += -lMaxAPI -lMaxAudio --- 10,12 ---- # these are both in MAXSDKPATH ! SYSLIBS += -lMaxAPI -lMaxAudio

1 0

externals/grill/flext/buildsys/win gnumake-mingw-ext.inc, 1.3, 1.4 gnumake-mingw.inc, 1.7, 1.8
by Thomas Grill 01 Aug '05

01 Aug '05

Update of /cvsroot/pure-data/externals/grill/flext/buildsys/win In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9397/buildsys/win Modified Files: gnumake-mingw-ext.inc gnumake-mingw.inc Log Message: Index: gnumake-mingw.inc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/win/gnumake-mingw.inc,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** gnumake-mingw.inc 19 Jul 2005 23:08:32 -0000 1.7 --- gnumake-mingw.inc 1 Aug 2005 11:51:30 -0000 1.8 *************** *** 8,12 **** CFLAGS += -mms-bitfields -mno-cygwin ! LDFLAGS += -shared -mno-cygwin ############################################## --- 8,12 ---- CFLAGS += -mms-bitfields -mno-cygwin ! LDFLAGS += -shared -mno-cygwin ############################################## Index: gnumake-mingw-ext.inc =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/buildsys/win/gnumake-mingw-ext.inc,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** gnumake-mingw-ext.inc 13 Jan 2005 04:59:10 -0000 1.3 --- gnumake-mingw-ext.inc 1 Aug 2005 11:51:29 -0000 1.4 *************** *** 33,37 **** $(TARGET) :: $(COBJS) $(CPPOBJS) ! $(CXX) $(LDFLAGS) $(subst \,/,$(LIBPATH)) -o $(subst /,\,$@) $(subst /,\,$(COBJS) $(CPPOBJS) $(LIBS)) -strip --strip-unneeded $@ --- 33,37 ---- $(TARGET) :: $(COBJS) $(CPPOBJS) ! $(CXX) $(LDFLAGS) $(subst \,/,$(LIBPATH)) -o $(subst /,\,$@) $(subst /,\,$(COBJS) $(CPPOBJS) $(LIBS) $(SYSLIBS)) -strip --strip-unneeded $@

1 0

externals/grill/flext build.txt,1.8,1.9
by Thomas Grill 01 Aug '05

01 Aug '05

Update of /cvsroot/pure-data/externals/grill/flext In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9397 Modified Files: build.txt Log Message: Index: build.txt =================================================================== RCS file: /cvsroot/pure-data/externals/grill/flext/build.txt,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** build.txt 19 Jul 2005 23:08:32 -0000 1.8 --- build.txt 1 Aug 2005 11:51:29 -0000 1.9 *************** *** 48,51 **** --- 48,53 ---- pd mingw, using gnumake (from the CMD prompt, not msys!) max msvc, using nmake + max cygwin, using gnumake + max mingw, using gnumake (from the CMD prompt, not msys!) pd bcc, using bmake *************** *** 164,169 **** win-pd-cygwin, single/multi/shared win-max-msvc, single/multi/shared ! win-max-mingw, --- NOT WORKING (linker problems) ---- ! win-max-cygwin, --- NOT WORKING (linker problems) ---- --- 166,171 ---- win-pd-cygwin, single/multi/shared win-max-msvc, single/multi/shared ! win-max-cygwin, single/multi/shared ! win-max-mingw, single/multi/shared

1 0

pd/src desire.tk,1.1.2.3,1.1.2.4
by chunlee 01 Aug '05

01 Aug '05

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28717 Modified Files: Tag: devel_0_39 desire.tk Log Message: started to look into wire_draw stuff. Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -C2 -d -r1.1.2.3 -r1.1.2.4 *** desire.tk 30 Jul 2005 16:12:16 -0000 1.1.2.3 --- desire.tk 1 Aug 2005 08:18:20 -0000 1.1.2.4 *************** *** 1597,1602 **** puts "wire reachs inlet, draw proper wire!!" ! pd "$self add-wire x$wire_from x$wire_to ;" } --- 1597,1621 ---- puts "wire reachs inlet, draw proper wire!!" ! set d $wire_from ! foreach item $wire_to {lappend d $item} ! #add a last 0 for wire_update, not sure what's for.... ! lappend d 0 ! ! puts "d = $d" ! ! #tmp only ! wire_update 18136070 $d ! wire_draw2 18136070 $name; + #trace: + #wire_update:: l8146070 813ea70 0 813f160 0 0 + #what's the last argument of wire_update? + #wire_draw2:: l8146070 .x813e670.c + #wire_draw:: l8146070 .x813e670.c 1 43 57 156 138 + + #pd "$self add-wire x$wire_from x$wire_to ;" + + puts "::::connect from $wire_from to $wire_to" + #::::connect from 81168af 2 to 81168ae 0 } *************** *** 1862,1865 **** --- 1881,1952 ---- #-----------------------------------------------------------------------------------# + + # modes: + # 0: creation + # 1: resize (or move) + proc wire_draw {self canvas thick x1 y1 x2 y2} { + puts "wire_draw:: $self $canvas $thick $x1 $y1 $x2 $y2" + + global look + set xys [list $x1 $y1 $x2 $y2] + set length [expr sqrt(pow($x2-$x1,2)+pow($y2-$y1,2))] + # set step [expr 1/floor(1+$length/4)] + # for {set i 0} {$i<=1.001} {set i [expr $i+$step]} { + # set r [expr (rand()-0.5)*$i*(1-$i)*150] + # set r [expr sin($i/$step)*$i*(1-$i)*100] + # set q [expr sin(1+$i/$step)*$i*(1-$i)*100] + # #lappend xys [expr $x1+($x2-$x1)*$i+$r*[expr ($y1-$y2)/$length]] + # #lappend xys [expr $y1+($y2-$y1)*$i+$q*[expr ($x2-$x1)/$length]] + # lappend xys [expr $x1+($x2-$x1)*$i+(rand()-0.5)*150*$i*(1-$i)] + # lappend xys [expr $y1+($y2-$y1)*$i+(rand()-0.5)*150*$i*(1-$i)] + # } + + set arrowsize [expr $length<100 ? $length/10 : 10] + if {$arrowsize < 5} {set arrow none} {set arrow last} + set arrowshape [list $arrowsize [expr $arrowsize*4/5] [expr $arrowsize/3]] + + if {[llength [$canvas gettags $self]] != 0} { + $canvas coords $self $xys + $canvas itemconfigure -arrow $arrow -arrowshape $arrowshape + } { + $canvas create line $xys -tags $self -width $thick \ + -arrow $arrow -arrowshape $arrowshape -fill $look(wirefg) + # -smooth yes + } + } + + #-----------------------------------------------------------------------------------# + proc wire_draw2 {self canvas} { + puts "wire_draw2:: $self $canvas" + + global _ + set bbox1 [$canvas bbox $_($self:obj1)o$_($self:port1)] + set bbox2 [$canvas bbox $_($self:obj2)i$_($self:port2)] + if {[llength $bbox1] < 4} {puts stderr "wire_draw2: crap ($_($self:obj1) outlet)"; return} + if {[llength $bbox2] < 4} {puts stderr "wire_draw2: crap ($_($self:obj2) inlet)"; return} + foreach {x1 y1} [l/2 [l+ [lrange $bbox1 0 1] [lrange $bbox1 2 3]]] {} + foreach {x2 y2} [l/2 [l+ [lrange $bbox2 0 1] [lrange $bbox2 2 3]]] {} + wire_draw $self $canvas 1 $x1 $y1 $x2 $y2 + } #-----------------------------------------------------------------------------------# + proc wire_select {self canvas flag} { + puts "wire_select:: $self $canvas $flag" + + global _ look + if {$flag} {set colour #ff8000} {set colour $look(wirefg)} + $canvas itemconfigure $self -fill $colour + } + #-----------------------------------------------------------------------------------# + proc wire_erase {self canvas} { + puts "wire_erase:: $self $canvas" + + $canvas delete $self + } #-----------------------------------------------------------------------------------# + proc wire_update {self d} { + puts "wire_update:: $self $d" + + global _ + foreach [list _($self:obj1) _($self:port1) _($self:obj2) _($self:port2)] \ + [lrange $d 0 3] {} + }

1 0

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 2005