pd/src desire.tk,1.1.2.194,1.1.2.195 - Pd-cvs

29 Apr 2006


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30869
Modified Files:
      Tag: devel_0_39
    desire.tk 
Log Message:
fixd wire drawing, need to work out what to sent to the server for 
object/wire deletion..... that should be the next....
Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.194
retrieving revision 1.1.2.195
diff -C2 -d -r1.1.2.194 -r1.1.2.195
*** desire.tk	26 Apr 2006 15:32:04 -0000	1.1.2.194
--- desire.tk	29 Apr 2006 15:14:00 -0000	1.1.2.195
***************
*** 1484,1489 ****
    # look up for wire id
    foreach x $wires2 {
       set find [lsearch $@wires_pair $x]
! 	   if { $find != -1} {
    	lappend wires [lindex $@wires_pair [expr $find + 1]]
       }
--- 1484,1500 ----
    # look up for wire id
    foreach x $wires2 {
+ 	   set outobj [lindex $x 0]
+ 	   set outport [lindex $x 1]
+ 	   set inobj [lindex $x 2]
+ 	   set inport [lindex $x 3]	   
       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 exist
    	lappend wires [lindex $@wires_pair [expr $find + 1]]
       }
***************
*** 1502,1507 ****
    # todo: need to put some things here to prevent from creating the same connection twice
    
! 	lappend @wires_pair [list $whoout $outno $whoin $inno]
! 	lappend @wires_pair [eval [list wire_new $self $whoout $outno $whoin $inno]]
  }
--- 1513,1519 ----
    # todo: need to put some things here to prevent from creating the same connection twice
    
! 	#puts "self === $self"
! 	#lappend @wires_pair [list $whoout $outno $whoin $inno]
! 	#lappend @wires_pair [eval [list wire_new $self $whoout $outno $whoin $inno]]
  }
***************
*** 2154,2158 ****
    global look
    #set thick 2
! 	puts "------- from:$@obj1 outlet:$@port1 to:$@obj2 inlet:$@port2"
    set bbox1 [.$@canvas.c bbox [join [list "$@obj1" o "$@port1"] ""]]
    set bbox2 [.$@canvas.c bbox [join [list "$@obj2" i "$@port2"] ""]]
--- 2166,2170 ----
    global look
    #set thick 2
! 	#puts "------- from:$@obj1 outlet:$@port1 to:$@obj2 inlet:$@port2"
    set bbox1 [.$@canvas.c bbox [join [list "$@obj1" o "$@port1"] ""]]
    set bbox2 [.$@canvas.c bbox [join [list "$@obj2" i "$@port2"] ""]]