Pd-cvs October 2006

pd-cvs@lists.iem.at

13 participants
248 discussions

pd/src desire.c,1.1.2.184,1.1.2.185
by Mathieu Bouchard 14 Oct '06

14 Oct '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12613 Modified Files: Tag: devel_0_39 desire.c Log Message: fixed #X coords saving. partially fixed #V saving. partially fixed crash when loading #V when newest object not available. fixed observer when loading #V. Index: desire.c =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.c,v retrieving revision 1.1.2.184 retrieving revision 1.1.2.185 diff -C2 -d -r1.1.2.184 -r1.1.2.185 *** desire.c 22 Sep 2006 00:41:20 -0000 1.1.2.184 --- desire.c 14 Oct 2006 11:07:17 -0000 1.1.2.185 *************** *** 92,96 **** void appendix_save (t_gobj *master, t_binbuf *b) { t_hash *h = master->g_adix->visual; ! /* fprintf(stderr,"appendix_save %p size=%d\n",master,hash_size(h)); */ if (hash_size(h)) { hashkey k; --- 92,96 ---- void appendix_save (t_gobj *master, t_binbuf *b) { t_hash *h = master->g_adix->visual; ! fprintf(stderr,"appendix_save %p size=%d\n",master,hash_size(h)); if (hash_size(h)) { hashkey k; *************** *** 539,543 **** static void canvas_coords(t_canvas *x, t_symbol *s, int argc, t_atom *argv) { ! pd_scanargs(argc,argv,"ffffii;",&x->x1,&x->y1,&x->x2,&x->y2,&x->pixwidth,&x->pixheight); if (argc <= 7) canvas_setgraph(x, atom_getintarg(6, argc, argv), 1); else { --- 539,544 ---- static void canvas_coords(t_canvas *x, t_symbol *s, int argc, t_atom *argv) { ! printf("scanargs = %d\n", ! pd_scanargs(argc,argv,"ffffii*",&x->x1,&x->y1,&x->x2,&x->y2,&x->pixwidth,&x->pixheight)); if (argc <= 7) canvas_setgraph(x, atom_getintarg(6, argc, argv), 1); else { *************** *** 546,549 **** --- 547,551 ---- x->ymargin = atom_getintarg(8, argc, argv); } + gobj_changed(x,0); } *************** *** 6462,6466 **** } binbuf_addv(b, ";"); - appendix_save(z,b); } --- 6464,6467 ---- *************** *** 6809,6812 **** --- 6810,6815 ---- c->c_savefn(self,b); } + appendix_save(self,b); + binbuf_gettext(b,&s,&n); if (s[n-1]=='\n') n--; *************** *** 7819,7824 **** static void visualloader_anything(t_gobj *self, t_symbol *s, int argc, t_atom *argv) { ! //t_hash *h = self->g_adix->visual; ! t_hash *h = ((t_gobj *)newest)->g_adix->visual; int i=0,j=0; //printf("visualloader_anything start newest=%p\n",newest); --- 7822,7826 ---- static void visualloader_anything(t_gobj *self, t_symbol *s, int argc, t_atom *argv) { ! t_hash *h; int i=0,j=0; //printf("visualloader_anything start newest=%p\n",newest); *************** *** 7833,7836 **** --- 7835,7839 ---- //printf("#V reading '%s':\n",s->s_name); if (!newest) {pd_error(self,"#V: there is no newest object\n"); return;} + h = ((t_gobj *)newest)->g_adix->visual; if (hash_exists(h,s)) { //printf("'%s' exists, deleting\n",s->s_name); *************** *** 7842,7845 **** --- 7845,7849 ---- } //printf("visualloader_anything end\n"); + gobj_changed(self,0); }

1 0

pd/src desire.tk,1.1.2.503,1.1.2.504
by chunlee 14 Oct '06

14 Oct '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13447 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.503 retrieving revision 1.1.2.504 diff -C2 -d -r1.1.2.503 -r1.1.2.504 *** desire.tk 13 Oct 2006 23:40:56 -0000 1.1.2.503 --- desire.tk 14 Oct 2006 09:40:50 -0000 1.1.2.504 *************** *** 1744,1748 **** def TextBox draw {} { ! global font # "TEXT" is the text label while "text" is the the input text field tk widget. # the text should be drawn before, so that update_size works at the right time. --- 1744,1748 ---- def TextBox draw {} { ! global font leet # "TEXT" is the text label while "text" is the the input text field tk widget. # the text should be drawn before, so that update_size works at the right time. *************** *** 1753,1758 **** #$t configure -width [string length [$t get $(a)longline.0 $(a)longline.end]] } { $self item TEXT text [l+ {2 2} [list $x1 $y1]] \ ! -font [$self look font] -text $@text \ -fill [$self look fg] -anchor nw } --- 1753,1763 ---- #$t configure -width [string length [$t get $(a)longline.0 $(a)longline.end]] } { + if {$leet} { + set text [string map -nocase {a 4 e 3 t 7 s 5 i 1 o 0 g 9} $@text] + } else { + set text $@text + } $self item TEXT text [l+ {2 2} [list $x1 $y1]] \ ! -font [$self look font] -text $text \ -fill [$self look fg] -anchor nw } *************** *** 2207,2213 **** $@crosshair erase } ! if {$tooltip(visible)} { if {[expr [distance $tooltip(curpos) [list $x $y]] > 10]} { ! $tooltip(canvas) hide_tooltip } } --- 2212,2218 ---- $@crosshair erase } ! if {[$self look tooltip]} { if {[expr [distance $tooltip(curpos) [list $x $y]] > 10]} { ! $self hide_tooltip } } *************** *** 2877,2881 **** #puts " selection::: $@selection" puts " keynav::: $@keynav" ! if {!$@keynav} {return} switch $@keynav_tab_sel { object { --- 2882,2886 ---- #puts " selection::: $@selection" puts " keynav::: $@keynav" ! if {!$@keynav} {$self tab_jump} switch $@keynav_tab_sel { object { *************** *** 3401,3406 **** set iowidth [$@obj1 look iowidth] mset {ox1 oy1 ox2 oy2} [$@obj1 bbox] set x1 [expr ($iowidth / 2) + ($iowidth * $@port1) + $ox1] ! set y1 [expr $oy1 + $_($@obj1:ys)] mset {ix1 iy1 ix2 iy2} [$@obj2 bbox] set x2 [expr ($iowidth / 2) + ($iowidth * $@port2) + $ix1] --- 3406,3412 ---- set iowidth [$@obj1 look iowidth] mset {ox1 oy1 ox2 oy2} [$@obj1 bbox] + set height1 [expr $oy2 - $oy1] set x1 [expr ($iowidth / 2) + ($iowidth * $@port1) + $ox1] ! set y1 [expr $oy1 + $height1] mset {ix1 iy1 ix2 iy2} [$@obj2 bbox] set x2 [expr ($iowidth / 2) + ($iowidth * $@port2) + $ix1] *************** *** 6192,6195 **** --- 6198,6202 ---- toggle Canvas buttonbar toggle Canvas statusbar + toggle View tooltip toggle Wire wirearrow }

1 0

autobuild: pd-main macosx104-powerpc 2006-10-14 03.15.03
by pd＠macosx104-powerpc.idmi.poly.edu 14 Oct '06

14 Oct '06

cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -arch i386 -arch ppc -Wno-error -O2 -DINSTALL_PREFIX=\"/usr/local\" -c -o ../obj/../portmidi/pm_mac/pmmacosxcm.o ../portmidi/pm_mac/pmmacosxcm.c ../portmidi/pm_mac/pmmacosxcm.c: In function 'pm_macosxcm_init': ../portmidi/pm_mac/pmmacosxcm.c:657: warning: comparison between signed and unsigned ../portmidi/pm_mac/pmmacosxcm.c:673: warning: comparison between signed and unsigned ../portmidi/pm_mac/pmmacosxcm.c: In function 'pm_macosxcm_init': ../portmidi/pm_mac/pmmacosxcm.c:657: warning: comparison between signed and unsigned ../portmidi/pm_mac/pmmacosxcm.c:673: warning: comparison between signed and unsigned cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -arch i386 -arch ppc -Wno-error -O2 -DINSTALL_PREFIX=\"/usr/local\" -c -o ../obj/../portmidi/pm_common/pmutil.o ../portmidi/pm_common/pmutil.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -arch i386 -arch ppc -Wno-error -O2 -DINSTALL_PREFIX=\"/usr/local\" -c -o ../obj/../portmidi/pm_common/portmidi.o ../portmidi/pm_common/portmidi.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -arch i386 -arch ppc -Wno-error -O2 -DINSTALL_PREFIX=\"/usr/local\" -c -o ../obj/../portmidi/porttime/ptmacosx_cf.o ../portmidi/porttime/ptmacosx_cf.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -arch i386 -arch ppc -Wno-error -O2 -DINSTALL_PREFIX=\"/usr/local\" -c -o ../obj/d_fft_mayer.o d_fft_mayer.c cc -g -O2 -DPD -Wall -W -Wstrict-prototypes -Wno-unused -Wno-parentheses -Wno-switch -DDL_OPEN -DMACOSX -DUNISTD -I/usr/X11R6/include -I../portaudio/pa_common -I../portaudio/pablio -I../portmidi/pm_common -I../portmidi/pm_mac -I../portmidi/porttime -DUSEAPI_PORTAUDIO -DPA19 -DPA_USE_COREAUDIO -arch i386 -arch ppc -Wno-error -O2 -DINSTALL_PREFIX=\"/usr/local\" -c -o ../obj/d_fftroutine.o d_fftroutine.c cd ../obj; cc -Wl -framework CoreAudio -framework AudioUnit -framework AudioToolbox -framework Carbon -framework CoreMIDI -arch i386 -arch ppc -o ../bin/pd g_canvas.o g_graph.o g_text.o g_rtext.o g_array.o g_template.o g_io.o g_scalar.o g_traversal.o g_guiconnect.o g_readwrite.o g_editor.o g_all_guis.o g_bang.o g_hdial.o g_hslider.o g_mycanvas.o g_numbox.o g_toggle.o g_vdial.o g_vslider.o g_vumeter.o m_pd.o m_class.o m_obj.o m_atom.o m_memory.o m_binbuf.o m_conf.o m_glob.o m_sched.o s_main.o s_inter.o s_file.o s_print.o s_loader.o s_path.o s_entry.o s_audio.o s_midi.o d_ugen.o d_ctl.o d_arithmetic.o d_osc.o d_filter.o d_dac.o d_misc.o d_math.o d_fft.o d_array.o d_global.o d_delay.o d_resample.o x_arithmetic.o x_connective.o x_interface.o x_midi.o x_misc.o x_time.o x_acoustics.o x_net.o x_qlist.o x_gui.o x_list.o d_soundfile.o s_midi_pm.o s_audio_pa.o s_audio_pablio.o s_audio_paring.o ../portaudio/pa_common/pa_allocation.o ../portaudio/pa_com mon/pa_converters.o ../portaudio/pa_common/pa_cpuload.o ../portaudio/pa_common/pa_dither.o ../portaudio/pa_common/pa_front.o ../portaudio/pa_common/pa_process.o ../portaudio/pa_common/pa_skeleton.o ../portaudio/pa_common/pa_stream.o ../portaudio/pa_common/pa_trace.o ../portaudio/pa_unix/pa_unix_util.o ../portaudio/pa_mac_core/pa_mac_core.o ../portaudio/pa_mac/pa_mac_hostapis.o ../portmidi/pm_mac/pmmac.o ../portmidi/pm_mac/pmmacosxcm.o ../portmidi/pm_common/pmutil.o ../portmidi/pm_common/portmidi.o ../portmidi/porttime/ptmacosx_cf.o d_fft_mayer.o d_fftroutine.o \ -ldl -lm -lpthread /usr/bin/ld: for architecture i386 /usr/bin/ld: warning /System/Library/Frameworks/CoreAudio.framework/CoreAudio cputype (18, architecture ppc) does not match cputype (7) for specified -arch flag: i386 (file not loaded) /usr/bin/ld: warning /System/Library/Frameworks/AudioUnit.framework/AudioUnit cputype (18, architecture ppc) does not match cputype (7) for specified -arch flag: i386 (file not loaded) /usr/bin/ld: warning /System/Library/Frameworks/AudioToolbox.framework/AudioToolbox cputype (18, architecture ppc) does not match cputype (7) for specified -arch flag: i386 (file not loaded) /usr/bin/ld: warning /System/Library/Frameworks/Carbon.framework/Carbon cputype (18, architecture ppc) does not match cputype (7) for specified -arch flag: i386 (file not loaded) /usr/bin/ld: warning /System/Library/Frameworks/CoreMIDI.framework/CoreMIDI cputype (18, architecture ppc) does not match cputype (7) for specified -arch flag: i386 (file not loaded) /usr/bin/ld: warning fat file: /usr/lib/gcc/i686-apple-darwin8/4.0.1/../../../libdl.dylib does not contain an architecture that matches the specified -arch flag: i386 (file ignored) /usr/bin/ld: warning fat file: /usr/lib/gcc/i686-apple-darwin8/4.0.1/../../../libm.dylib does not contain an architecture that matches the specified -arch flag: i386 (file ignored) /usr/bin/ld: warning fat file: /usr/lib/gcc/i686-apple-darwin8/4.0.1/../../../libpthread.dylib does not contain an architecture that matches the specified -arch flag: i386 (file ignored) /usr/bin/ld: warning fat file: /usr/lib/gcc/i686-apple-darwin8/4.0.1/../../../libSystem.dylib does not contain an architecture that matches the specified -arch flag: i386 (file ignored) /usr/bin/ld: Undefined symbols: ___keymgr_dwarf2_register_sections __cthread_init_routine _atexit _errno _exit _mach_init_routine _atoi _memset _sprintf _sscanf _strcat _strchr _strncat _strncpy _atof _floor __DefaultRuneLocale ___maskrune _cos _fclose _fdopen _fopen _fprintf _fscanf _memmove _sin _strcpy _strcmp _exp _log _pow _close _calloc _free _memcpy _realloc ___sF _atol _fwrite _lseek _open _perror _read _pthread_mutex_lock _pthread_mutex_trylock _pthread_mutex_unlock _fputs _malloc _stat _strrchr _strtol ___error __exit _accept _bind _connect _execl _fork _getcwd _getenv _gethostbyname _gettimeofday _getuid _listen _pthread_self _pthread_setschedparam _recv _select _send _seteuid _setitimer _setsockopt _sigaction _signal _socket _strerror _vsnprintf _write _fread _pclose _popen _snprintf _system _dlerror _dlopen _dlsym _fstat _cosf _atan2 _atanf _expf _sinf _times _pthread_cond_destroy _pthread_cond_init _pthread_cond_signal _pthread_cond_wait _pthread_create _pthread_join _pthread_mutex_destroy _pthread_mutex_init _fputc _fflush _vfprintf _pthread_cancel _usleep _AudioConverterDispose _AudioConverterFillBuffer _AudioConverterNew _AudioConverterReset _AudioConverterSetProperty _AudioDeviceAddPropertyListener _AudioDeviceGetCurrentTime _AudioDeviceGetProperty _AudioDeviceGetPropertyInfo _AudioDeviceRemovePropertyListener _AudioDeviceSetProperty _AudioHardwareGetProperty _AudioHardwareGetPropertyInfo _AudioOutputUnitStart _AudioOutputUnitStop _AudioUnitGetProperty _AudioUnitInitialize _AudioUnitRender _AudioUnitReset _AudioUnitSetProperty _AudioUnitUninitialize _CloseComponent _FindNextComponent _OpenAComponent _printf _puts _AudioConvertHostTimeToNanos _AudioConvertNanosToHostTime _AudioGetCurrentHostTime _CFRelease _CFStringCreateWithFormat _CFStringGetCString _CFStringGetLength _CFStringGetSystemEncoding _MIDIClientCreate _MIDIClientDispose _MIDIEndpointGetEntity _MIDIEntityGetDevice _MIDIGetDestination _MIDIGetNumberOfDestinations _MIDIGetNumberOfDevices _MIDIGetNumberOfSources _MIDIGetSource _MIDIInputPortCreate _MIDIObjectGetStringProperty _MIDIOutputPortCreate _MIDIPacketListAdd _MIDIPacketListInit _MIDIPortConnectSource _MIDIPortDisconnectSource _MIDIPortDispose _MIDISend ___CFConstantStringClassReference _kMIDIPropertyName _CFAbsoluteTimeGetCurrent _CFRunLoopAddTimer _CFRunLoopGetCurrent _CFRunLoopRemoveTimer _CFRunLoopRunInMode _CFRunLoopStop _CFRunLoopTimerCreate _mach_error _mach_thread_self _thread_policy_set _log10 _abort collect2: ld returned 1 exit status lipo: can't open input file: /var/tmp//ccUEnQ1w.out (No such file or directory) make: *** [../bin/pd] Error 1

1 0

pd/src m_imp.h,1.3.4.1.2.6,1.3.4.1.2.7
by Mathieu Bouchard 14 Oct '06

14 Oct '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20545 Modified Files: Tag: devel_0_39 m_imp.h Log Message: desire.h contains its own copy of m_imp.h anyway. Index: m_imp.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/m_imp.h,v retrieving revision 1.3.4.1.2.6 retrieving revision 1.3.4.1.2.7 diff -C2 -d -r1.3.4.1.2.6 -r1.3.4.1.2.7 *** m_imp.h 19 Sep 2006 16:08:47 -0000 1.3.4.1.2.6 --- m_imp.h 13 Oct 2006 23:41:48 -0000 1.3.4.1.2.7 *************** *** 47,58 **** t_listmethod c_listmethod; t_anymethod c_anymethod; - #ifndef DESIRE struct _widgetbehavior *c_wb; /* "gobjs" only */ - #endif struct _parentwidgetbehavior *c_pwb;/* widget behavior in parent */ t_savefn c_savefn; /* function to call when saving */ - #ifndef DESIRE t_propertiesfn c_propertiesfn; /* function to start prop dialog */ - #endif int c_floatsignalin; /* onset to float for signal input */ char c_gobj; /* true if is a gobj */ --- 47,54 ---- *************** *** 61,69 **** char c_drawcommand; /* a drawing command for a template */ t_symbol *c_firsttip; - #ifdef DESIRE - t_symbol **c_fields; /* names of fields aka attributes, and I don't mean the #V attributes. */ - int c_nfields; /* ... and how many of them */ - t_notice c_notice; /* observer method */ - #endif }; --- 57,60 ----

1 0

pd/src desire.tk,1.1.2.502,1.1.2.503
by Mathieu Bouchard 14 Oct '06

14 Oct '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20173 Modified Files: Tag: devel_0_39 desire.tk Log Message: getting rid of xfld (part 2) Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.502 retrieving revision 1.1.2.503 diff -C2 -d -r1.1.2.502 -r1.1.2.503 *** desire.tk 13 Oct 2006 22:30:05 -0000 1.1.2.502 --- desire.tk 13 Oct 2006 23:40:56 -0000 1.1.2.503 *************** *** 1029,1036 **** set find [lsearch $args "-font"] if {$find >= 0} { ! #set new_size [format %.0f [expr $font(size)*$zoom]] ! set new_size [format %.0f [expr [$self look fontsize]*$zoom]] ! #set s [format $font(str2) $new_size] ! set s [format [$self look fontstring2] $new_size] set args [lreplace $args [expr $find + 1] [expr $find + 1] $s] } --- 1029,1034 ---- set find [lsearch $args "-font"] if {$find >= 0} { ! set new_size [format %.0f [expr [lindex [$self look font] 1]*$zoom]] ! set s [format [$self look font] $new_size] set args [lreplace $args [expr $find + 1] [expr $find + 1] $s] } *************** *** 1756,1760 **** } { $self item TEXT text [l+ {2 2} [list $x1 $y1]] \ ! -font [$self look fontstring] -text $@text \ -fill [$self look fg] -anchor nw } --- 1754,1758 ---- } { $self item TEXT text [l+ {2 2} [list $x1 $y1]] \ ! -font [$self look font] -text $@text \ -fill [$self look fg] -anchor nw } *************** *** 1780,1785 **** $c delete ${self}TEXT $self update_size ! set new_size [format %.0f [expr [$self look fontsize]*$_($@canvas:zoom)]] ! set font_str [format [$self look fontstring2] $new_size] #puts " text to edit::: $@text" set l {};set nl 1;set newline {-1};set i 0;set width 0 --- 1778,1784 ---- $c delete ${self}TEXT $self update_size ! set font_str [$self look font] ! set new_size [format %.0f [expr $font_str*$_($@canvas:zoom)]] ! set font_str [lreplace $font_str 1 1 $new_size] #puts " text to edit::: $@text" set l {};set nl 1;set newline {-1};set i 0;set width 0 *************** *** 1855,1867 **** set t $c.${self}text set padx [$self look fontpadx];set pady [$self look fontpady] ! set width [font measure [$self look fontstring] W] #set width [$self look fontwidth];set height [$self look fontheight] if {[winfo exists $c.${self}text]} { set height [expr [lindex [$t configure -height] 4] * \ ! [font metrics [$self look fontstring] -linespace]] } else { ! set height [expr [font metrics [$self look fontstring] -linespace] * $nl] } ! #set height [expr [font metrics [$self look fontstring] -linespace] * $nl] set textwidth [expr $padx+$width*($n+$@edit)] if {[llength [$c gettags ${self}TEXT]]} { --- 1854,1866 ---- set t $c.${self}text set padx [$self look fontpadx];set pady [$self look fontpady] ! set width [font measure [$self look font] W] #set width [$self look fontwidth];set height [$self look fontheight] if {[winfo exists $c.${self}text]} { set height [expr [lindex [$t configure -height] 4] * \ ! [font metrics [$self look font] -linespace]] } else { ! set height [expr [font metrics [$self look font] -linespace] * $nl] } ! #set height [expr [font metrics [$self look font] -linespace] * $nl] set textwidth [expr $padx+$width*($n+$@edit)] if {[llength [$c gettags ${self}TEXT]]} { *************** *** 3676,3680 **** # -text $string -fill [$self look fg] -font $font(str) -anchor nw $self item TEXT text [l+ {2 2} [list $x1 $y1]] \ ! -text $string -fill [$self look fg] -font [$self look fontstring] -anchor nw } --- 3675,3679 ---- # -text $string -fill [$self look fg] -font $font(str) -anchor nw $self item TEXT text [l+ {2 2} [list $x1 $y1]] \ ! -text $string -fill [$self look fg] -font [$self look font] -anchor nw } *************** *** 4077,4082 **** if {!$@w} {set @w 5} set padx [$self look fontpadx];set pady [$self look fontpady] ! set width [font measure [$self look fontstring] W] ! set height [font metrics [$self look fontstring] -linespace] #set width [$self look fontwidth];set height [$self look fontheight] set textwidth [expr $padx+$width*$@w] --- 4076,4081 ---- if {!$@w} {set @w 5} set padx [$self look fontpadx];set pady [$self look fontpady] ! set width [font measure [$self look font] W] ! set height [font metrics [$self look font] -linespace] #set width [$self look fontwidth];set height [$self look fontheight] set textwidth [expr $padx+$width*$@w] *************** *** 4140,4145 **** global font set padx [$self look fontpadx];set pady [$self look fontpady] ! set width [font measure [$self look fontstring] W] ! set height [font metrics [$self look fontstring] -linespace] #set width [$self look fontwidth];set height [$self look fontheight] set textwidth [expr $padx+$width*[string length $@buf]] --- 4139,4144 ---- global font set padx [$self look fontpadx];set pady [$self look fontpady] ! set width [font measure [$self look font] W] ! set height [font metrics [$self look font] -linespace] #set width [$self look fontwidth];set height [$self look fontheight] set textwidth [expr $padx+$width*[string length $@buf]] *************** *** 4171,4175 **** $self item BASE4 polygon $points2 -fill $color4 -outline [$self look frame3] $self item NUMBER text [list $xt $yt] -anchor w -text $@text \ ! -font [$self look fontstring] -fill [parse_color $@fcol] $c delete ${self}CURS if {[string length $@buf]>0} { --- 4170,4174 ---- $self item BASE4 polygon $points2 -fill $color4 -outline [$self look frame3] $self item NUMBER text [list $xt $yt] -anchor w -text $@text \ ! -font [$self look font] -fill [parse_color $@fcol] $c delete ${self}CURS if {[string length $@buf]>0} { *************** *** 4772,4776 **** if {$cmdline(console) != 0} { frame .log ! text .log.1 -width 60 -height 30 -yscrollcommand ".log.2 set" -font $look(View:fontstring) scrollbar .log.2 -command ".log.1 yview" global tcl_version tk_version pd_myversion tcl_platform OS --- 4771,4775 ---- if {$cmdline(console) != 0} { frame .log ! text .log.1 -width 60 -height 30 -yscrollcommand ".log.2 set" -font $look(View:font) scrollbar .log.2 -command ".log.1 yview" global tcl_version tk_version pd_myversion tcl_platform OS *************** *** 4838,4843 **** pack [frame $serf.1.1] -side bottom pack [button $serf.1.1.expander -image icon_plus -command "$self toggle_expand"] -side left ! pack [label $serf.1.1.label -text "$name: " -font $look(View:fontstring)] -side left ! pack [entry $serf.entry -width 40 -font $look(View:fontstring)] -side left -fill x -expand yes pack $serf -fill x -expand no bind $serf.entry <Up> "$self up" --- 4837,4842 ---- pack [frame $serf.1.1] -side bottom pack [button $serf.1.1.expander -image icon_plus -command "$self toggle_expand"] -side left ! pack [label $serf.1.1.label -text "$name: " -font $look(View:font)] -side left ! pack [entry $serf.entry -width 40 -font $look(View:font)] -side left -fill x -expand yes pack $serf -fill x -expand no bind $serf.entry <Up> "$self up" *************** *** 5224,5228 **** -bg [$canvas look compbg] -selectbackground [$canvas look compselectbg] \ -activestyle dotbox -selectforeground [$canvas look compselectfg] -fg [$canvas look compfg] \ ! -font $look(View:fontstring) $self fill_box [$@textbox get 1.0 1.end] $f configure -width $@width --- 5223,5227 ---- -bg [$canvas look compbg] -selectbackground [$canvas look compselectbg] \ -activestyle dotbox -selectforeground [$canvas look compselectfg] -fg [$canvas look compfg] \ ! -font $look(View:font) $self fill_box [$@textbox get 1.0 1.end] $f configure -width $@width *************** *** 5632,5636 **** set @bold [expr [lsearch $font bold ]>=0] set @italic [expr [lsearch $font italic]>=0] - # set @fstr $look(View:fontstring) logvar @family @size @bold @italic frame $f.font --- 5631,5634 ---- *************** *** 6265,6268 **** --- 6263,6267 ---- } font { + $self font_update set look(View:font) $@str }

1 0

pd/src TODO,1.1.2.19,1.1.2.20
by Mathieu Bouchard 14 Oct '06

14 Oct '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19825 Modified Files: Tag: devel_0_39 TODO Log Message: . Index: TODO =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/TODO,v retrieving revision 1.1.2.19 retrieving revision 1.1.2.20 diff -C2 -d -r1.1.2.19 -r1.1.2.20 *** TODO 7 Oct 2006 19:05:37 -0000 1.1.2.19 --- TODO 13 Oct 2006 23:40:12 -0000 1.1.2.20 *************** *** 9,12 **** --- 9,21 ---- `---------------------------' + for piksel: + [ ] canvas uploads too early. + [ ] font in Labeled. + [ ] keynav quadrant: get rid of initial tab. + [x] draw_wires too slow. + [x] def Wire draw updates too early. + [ ] redo the saving of font in .ddrc. + [ ] selection scaling. + ---------------------------------------------------------------- 0.39.A SHOWSTOPPERS: *************** *** 57,60 **** --- 66,81 ---- at least we can reduce the difference between strings and symbols to a minimum.) + [ ] make a statistical profiler for Tcl, if possible + [ ] try to use profiler.tcl (tcllib) in a sensible way + [ ] try C-oriented tools: + [ ] oprofile (with GUI) + [ ] memprof + [ ] sysprof + [ ] kprof + [ ] gprof + [ ] prospect + + [ ] redesign and reimplement "fontbomb" + server: *************** *** 116,119 **** --- 137,144 ---- [ ] do we move the trac to artengine or not? [ ] remember that it's possible to use break in a bind-handler, to completely override system's behaviour. + [ ] try: itcl itk iwidgets (itk implements megawidgets) + [ ] try tkgate, a hardware sim program + [ ] try libentity + [ ] try vtk-tcl [ ] I would like to know how much it is feasible to compress the t_atom

1 0

pd/src desire.h,1.1.2.39,1.1.2.40
by Mathieu Bouchard 14 Oct '06

14 Oct '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19705 Modified Files: Tag: devel_0_39 desire.h Log Message: . Index: desire.h =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.h,v retrieving revision 1.1.2.39 retrieving revision 1.1.2.40 diff -C2 -d -r1.1.2.39 -r1.1.2.40 *** desire.h 19 Sep 2006 16:08:47 -0000 1.1.2.39 --- desire.h 13 Oct 2006 23:39:55 -0000 1.1.2.40 *************** *** 50,54 **** /* ----------------------- m_imp.h ---------------------------------------------------*/ - /* the structure for a method handler ala Max */ typedef struct _methodentry { t_symbol *me_name; --- 50,53 ---- *************** *** 59,68 **** EXTERN_STRUCT _widgetbehavior; ! typedef void (*t_bangmethod)(t_pd *x); typedef void (*t_pointermethod)(t_pd *x, t_gpointer *gp); ! typedef void (*t_floatmethod)(t_pd *x, t_float f); ! typedef void (*t_symbolmethod)(t_pd *x, t_symbol *s); ! typedef void (*t_listmethod)(t_pd *x, t_symbol *s, int argc, t_atom *argv); ! typedef void (*t_anymethod)(t_pd *x, t_symbol *s, int argc, t_atom *argv); struct _class --- 58,67 ---- EXTERN_STRUCT _widgetbehavior; ! typedef void (*t_bangmethod) (t_pd *x); typedef void (*t_pointermethod)(t_pd *x, t_gpointer *gp); ! typedef void (*t_floatmethod) (t_pd *x, t_float f); ! typedef void (*t_symbolmethod) (t_pd *x, t_symbol *s); ! typedef void (*t_listmethod) (t_pd *x, t_symbol *s, int argc, t_atom *argv); ! typedef void (*t_anymethod) (t_pd *x, t_symbol *s, int argc, t_atom *argv); struct _class *************** *** 74,92 **** t_methodentry *c_methods; /* methods other than bang, etc below */ int c_nmethod; /* number of methods */ ! t_method c_freemethod; /* function to call before freeing */ ! t_bangmethod c_bangmethod; /* common methods */ t_pointermethod c_pointermethod; ! t_floatmethod c_floatmethod; ! t_symbolmethod c_symbolmethod; ! t_listmethod c_listmethod; ! t_anymethod c_anymethod; ! #ifndef DESIRE ! struct _widgetbehavior *c_wb; /* "gobjs" only */ ! #endif struct _parentwidgetbehavior *c_pwb;/* widget behavior in parent */ t_savefn c_savefn; /* function to call when saving */ - #ifndef DESIRE - t_propertiesfn c_propertiesfn; /* function to start prop dialog */ - #endif int c_floatsignalin; /* onset to float for signal input */ char c_gobj; /* true if is a gobj */ --- 73,85 ---- t_methodentry *c_methods; /* methods other than bang, etc below */ int c_nmethod; /* number of methods */ ! t_method c_freemethod; /* function to call before freeing */ ! t_bangmethod c_bangmethod; /* common methods */ t_pointermethod c_pointermethod; ! t_floatmethod c_floatmethod; ! t_symbolmethod c_symbolmethod; ! t_listmethod c_listmethod; ! t_anymethod c_anymethod; struct _parentwidgetbehavior *c_pwb;/* widget behavior in parent */ t_savefn c_savefn; /* function to call when saving */ int c_floatsignalin; /* onset to float for signal input */ char c_gobj; /* true if is a gobj */ *************** *** 95,103 **** char c_drawcommand; /* a drawing command for a template */ t_symbol *c_firsttip; - #ifdef DESIRE t_symbol **c_fields; /* names of fields aka attributes, and I don't mean the #V attributes. */ int c_nfields; /* ... and how many of them */ t_notice c_notice; /* observer method */ - #endif }; --- 88,94 ---- *************** *** 105,116 **** EXTERN int obj_noutlets(t_object *x); EXTERN int obj_ninlets(t_object *x); ! EXTERN t_outconnect *obj_starttraverseoutlet(t_object *x, t_outlet **op, ! int nout); ! EXTERN t_outconnect *obj_nexttraverseoutlet(t_outconnect *lastconnect, ! t_object **destp, t_inlet **inletp, int *whichp); ! EXTERN t_outconnect *obj_connect(t_object *source, int outno, ! t_object *sink, int inno); ! EXTERN void obj_disconnect(t_object *source, int outno, t_object *sink, ! int inno); EXTERN void outlet_setstacklim(void); EXTERN int obj_issignalinlet(t_object *x, int m); --- 96,103 ---- EXTERN int obj_noutlets(t_object *x); EXTERN int obj_ninlets(t_object *x); ! EXTERN t_outconnect *obj_starttraverseoutlet(t_object *x, t_outlet **op, int nout); ! EXTERN t_outconnect *obj_nexttraverseoutlet(t_outconnect *lastconnect, t_object **destp, t_inlet **inletp, int *whichp); ! EXTERN t_outconnect *obj_connect(t_object *source, int outno, t_object *sink, int inno); ! EXTERN void obj_disconnect(t_object *source, int outno, t_object *sink, int inno); EXTERN void outlet_setstacklim(void); EXTERN int obj_issignalinlet(t_object *x, int m);

1 0

pd/src desire.tk,1.1.2.501,1.1.2.502
by Mathieu Bouchard 14 Oct '06

14 Oct '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26358 Modified Files: Tag: devel_0_39 desire.tk Log Message: stop using xfld (part 1) Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.501 retrieving revision 1.1.2.502 diff -C2 -d -r1.1.2.501 -r1.1.2.502 *** desire.tk 13 Oct 2006 22:22:48 -0000 1.1.2.501 --- desire.tk 13 Oct 2006 22:30:05 -0000 1.1.2.502 *************** *** 918,942 **** #-----------------------------------------------------------------------------------# - proc set_fontstring {} { - global look - set fstring "" - set name $look(View:fontfamily); set style $look(View:fontstyle) - set italic $look(View:fontitalic); set size $look(View:fontsize) - if {$style == "bold"} { - set fstring "*-$name-bold" - } else { - set fstring "*-$name-medium" - } - if {$italic} { - if {$name == "Helvetica" || $name == "Courier"} {set ital o} else {set ital i} - } else { - set ital r - } - set look(View:fontstring) "$fstring-$ital-normal--$size-*" - set look(View:fontstring2) "$fstring-$ital-normal--%d-*" - #set look(View:fontwidth) [font measure $look(View:fontstring) W] - #set look(View:fontheight) [font metrics $look(View:fontstring) -linespace] - } - #-----------------------------------------------------------------------------------# proc* read_ddrc {{filename ""}} { global cmdline look key accels --- 918,921 ---- *************** *** 962,966 **** } } - set_fontstring } --- 941,944 ---- *************** *** 5654,5658 **** set @bold [expr [lsearch $font bold ]>=0] set @italic [expr [lsearch $font italic]>=0] ! set @fstr $look(View:fontstring) logvar @family @size @bold @italic frame $f.font --- 5632,5636 ---- set @bold [expr [lsearch $font bold ]>=0] set @italic [expr [lsearch $font italic]>=0] ! # set @fstr $look(View:fontstring) logvar @family @size @bold @italic frame $f.font *************** *** 5662,5667 **** pack [scrollbar $f.font.list.scroll -relief sunken -command "$f.font.list.box yview"] -side right -fill y bind $f.font.list.box <<ListboxSelect>> "$self font_update $f" ! foreach name [font families] { $f.font.list.box insert end $name} ! set fontlist [$f.font.list.box get 0 end] set find [lsearch $fontlist $@family] --- 5640,5645 ---- pack [scrollbar $f.font.list.scroll -relief sunken -command "$f.font.list.box yview"] -side right -fill y bind $f.font.list.box <<ListboxSelect>> "$self font_update $f" ! foreach name [lsort [font families]] {$f.font.list.box insert end $name} ! set fontlist [$f.font.list.box get 0 end] set find [lsearch $fontlist $@family] *************** *** 5682,5687 **** frame $f.font.style pack [label $f.font.style.label -text [say font_style]] -side left -fill y ! pack [checkbutton $f.font.style.bold -text [say font_bold] -variable bold -command "$self font_style $f bold"] -side top ! pack [checkbutton $f.font.style.italic -text [say font_italic] -variable @italic -command "$self font_style $f italic"] -side top frame $f.font2 --- 5660,5665 ---- frame $f.font.style pack [label $f.font.style.label -text [say font_style]] -side left -fill y ! pack [checkbutton $f.font.style.bold -text [say font_bold] -variable @bold -command "$self font_update $f"] -side top ! pack [checkbutton $f.font.style.italic -text [say font_italic] -variable @italic -command "$self font_update $f"] -side top frame $f.font2 *************** *** 5689,5693 **** pack [label $f.font2.preview.label -text [say font_preview]] -side left -fill y pack [canvas $f.font2.preview.canvas -width 200 -height 50 -relief sunken -borderwidth 1] -side left -fill x ! $f.font2.preview.canvas create text 10 25 -tags ${self}TEXT -anchor w -text [say font_preview_2] -font $@fstr set parent [string range $f 1 [expr [string first "." $f 1]-1]] --- 5667,5671 ---- pack [label $f.font2.preview.label -text [say font_preview]] -side left -fill y pack [canvas $f.font2.preview.canvas -width 200 -height 50 -relief sunken -borderwidth 1] -side left -fill x ! $f.font2.preview.canvas create text 10 25 -tags ${self}TEXT -anchor w -text [say font_preview_2] -font $look(View:font) set parent [string range $f 1 [expr [string first "." $f 1]-1]] *************** *** 5710,5739 **** } ! def Dialog font_get_xlfd {f name style size} { ! set fstring "" ! set list_pos [$f.font.list.box curselection] ! if {$list_pos != ""} {set @family [$f.font.list.box get [$f.font.list.box curselection]]} ! if {$style == "bold"} { ! set fstring "*-$@family-bold" ! } else { ! set fstring "*-$@family-medium" ! } ! if {$@italic} { ! if {$@family == "Helvetica" || $@family == "Courier"} { ! set @str "$fstring-o-normal--$size-*" ! set @str2 "$fstring-o-normal--%d-*" ! } else { ! set @str "$fstring-i-normal--$size-*" ! set @str2 "$fstring-i-normal--%d-*" ! } ! } else { ! set @str "$fstring-r-normal--$size-*" ! set @str2 "$fstring-r-normal--%d-*" ! } ! } ! def Dialog font_update {f} { global font ! $self font_get_xlfd $f $@family $@bold $@size $f.font2.preview.canvas itemconfigure ${self}TEXT -font $@str } --- 5688,5700 ---- } ! tracedef Dialog font_update def Dialog font_update {f} { global font ! set lb $f.font.list.box ! set @family [$lb get [$lb curselection]] ! set @str [list $@family $@size] ! if {$@bold } {lappend @str bold } ! if {$@italic} {lappend @str italic} ! logvar @str $f.font2.preview.canvas itemconfigure ${self}TEXT -font $@str } *************** *** 6227,6234 **** key Canvas about section Client font ! font View fontsize ! font View fontfamily ! font View fontstyle ! font View fontitalic section Client others toggle Canvas hairstate --- 6188,6192 ---- key Canvas about section Client font ! font View font section Client others toggle Canvas hairstate *************** *** 6267,6271 **** } close $fd - set_fontstring } --- 6225,6228 ---- *************** *** 6308,6321 **** } font { ! set str [string tolower $class$name] ! set str2 ${str}path ! $self font_get_xlfd $@$str2 $@family $@bold $@size ! #puts " fontstring::: $@str " ! set look(View:fontsize) $@size ! set look(View:fontfamily) $@family ! set look(View:fontstyle) $@bold ! set look(View:fontitalic) $@italic ! #set look($class:$name) $look($class:$name) ! #puts " $class:$name ::: $look($class:$name)" } } --- 6265,6269 ---- } font { ! set look(View:font) $@str } }

1 0

pd/src defaults.ddrc,1.1.2.5,1.1.2.6
by Mathieu Bouchard 14 Oct '06

14 Oct '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25607 Modified Files: Tag: devel_0_39 defaults.ddrc Log Message: . Index: defaults.ddrc =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/defaults.ddrc,v retrieving revision 1.1.2.5 retrieving revision 1.1.2.6 diff -C2 -d -r1.1.2.5 -r1.1.2.6 *** defaults.ddrc 4 Sep 2006 16:39:11 -0000 1.1.2.5 --- defaults.ddrc 13 Oct 2006 22:27:48 -0000 1.1.2.6 *************** *** 36,39 **** --- 36,40 ---- bg #ffffff fg #000000 + font {courier -12} fontfamily courier fontitalic 0

1 0

pd/src desire.tk,1.1.2.500,1.1.2.501
by chunlee 14 Oct '06

14 Oct '06

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23788 Modified Files: Tag: devel_0_39 desire.tk Log Message: fix on canvas scale and added scaling on selection only Index: desire.tk =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v retrieving revision 1.1.2.500 retrieving revision 1.1.2.501 diff -C2 -d -r1.1.2.500 -r1.1.2.501 *** desire.tk 13 Oct 2006 21:27:36 -0000 1.1.2.500 --- desire.tk 13 Oct 2006 22:22:48 -0000 1.1.2.501 *************** *** 3050,3066 **** def Canvas incr_scale {} {$self scale "out"} def Canvas decr_scale {} {$self scale "in"} def Canvas scale {mode} { global scale ! foreach children $@children { ! puts " [$children xy]" ! mset {x y} [$children xy] ! switch $mode { ! out { ! pd .$self object_moveto !$children [expr $x * (1+$scale(amount))] [expr $y * (1+$scale(amount))] ! } ! in { ! pd .$self object_moveto !$children [expr $x * (1-$scale(amount))] [expr $y * (1-$scale(amount))] } } } } --- 3050,3100 ---- def Canvas incr_scale {} {$self scale "out"} def Canvas decr_scale {} {$self scale "in"} + def Canvas scale {mode} { global scale ! if {[llength $@selection]} { ! foreach children $@selection { ! mset {x y} [$children xy] ! switch $mode { ! out { ! set x1 [expr $x*(1+$scale(amount))] ! set y1 [expr $y*(1+$scale(amount))] ! $children position= [list $x1 $y1] ! $children changed ! pd .$self object_moveto !$children $x1 $y1 ! } ! in { ! set x1 [expr $x*(1-$scale(amount))] ! set y1 [expr $y*(1-$scale(amount))] ! $children position= [list $x1 $y1] ! $children changed ! pd .$self object_moveto !$children $x1 $y1 ! } ! } } + + foreach children $@selection { $self changed_wires} + + } else { + foreach children $@children { + mset {x y} [$children xy] + switch $mode { + out { + set x1 [expr $x*(1+$scale(amount))] + set y1 [expr $y*(1+$scale(amount))] + $children position= [list $x1 $y1] + $children changed + pd .$self object_moveto !$children $x1 $y1 + } + in { + set x1 [expr $x*(1-$scale(amount))] + set y1 [expr $y*(1-$scale(amount))] + $children position= [list $x1 $y1] + $children changed + pd .$self object_moveto !$children $x1 $y1 + } + } } + foreach children $@children { $self changed_wires} } } *************** *** 3221,3229 **** def Box connect_in {} {} ! def Box draw {} { ! #set text "[$@canvas index $self]: " ! #$self item ID text [$self xy] -fill [$self look fg] -anchor ne -text $text ! $self draw_box ! } def Box draw_box {} {} def Box edit {} {} --- 3255,3259 ---- def Box connect_in {} {} ! def Box draw {} {$self draw_box} def Box draw_box {} {} def Box edit {} {} *************** *** 3386,3395 **** set zoom [$@canvas zoom] set c [$@canvas widget] set bbox1 [lmap / [$c bbox [join [list $@obj1 o $@port1] ""]] $zoom] ! set bbox2 [lmap / [$c bbox [join [list $@obj2 i $@port2] ""]] $zoom] 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]]] set xys [list $x1 $y1 $x2 $y2] set length [expr sqrt(pow($x2-$x1,2)+pow($y2-$y1,2))] --- 3416,3434 ---- set zoom [$@canvas zoom] set c [$@canvas widget] + #set bbox1 [list ] set bbox1 [lmap / [$c bbox [join [list $@obj1 o $@port1] ""]] $zoom] ! set bbox2 [lmap / [$c bbox [join [list $@obj2 i $@port2] ""]] $zoom] ! set bbox1 [$@obj1 bbox] 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} ! set iowidth [$@obj1 look iowidth] ! mset {ox1 oy1 ox2 oy2} [$@obj1 bbox] ! set x1 [expr ($iowidth / 2) + ($iowidth * $@port1) + $ox1] ! set y1 [expr $oy1 + $_($@obj1:ys)] ! mset {ix1 iy1 ix2 iy2} [$@obj2 bbox] ! set x2 [expr ($iowidth / 2) + ($iowidth * $@port2) + $ix1] ! set y2 $iy1 ! #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]]] set xys [list $x1 $y1 $x2 $y2] set length [expr sqrt(pow($x2-$x1,2)+pow($y2-$y1,2))]

1 0

← Newer
1
...
15
16
17
18
19
20
21
...
25
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 October 2006