[PD-cvs] pd/src desire.tk,1.1.2.73,1.1.2.74

[Mathieu Bouchard]

Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10051

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.73
retrieving revision 1.1.2.74
diff -C2 -d -r1.1.2.73 -r1.1.2.74
*** desire.tk	20 Sep 2005 23:13:49 -0000	1.1.2.73
--- desire.tk	22 Sep 2005 07:50:46 -0000	1.1.2.74
***************
*** 131,141 ****
  }
  
! proc l+   {al    bl} {set r {}; foreach a $al b $bl {lappend r [expr $a +   $b]}; return $r}
! proc l-   {al    bl} {set r {}; foreach a $al b $bl {lappend r [expr $a -   $b]}; return $r}
! proc lzip {al op bl} {set r {}; foreach a $al b $bl {lappend r [expr $a $op $b]}; return $r}
! proc lmap {al op   } {set r {}; foreach a $al b $bl {lappend r [expr $a $op   ]}; return $r}
! proc l/2  {al      } {set r {}; foreach a $al       {lappend r [expr $a /    2]}; return $r}
! proc lsum  {al} {set r 0; foreach a $al {set r [expr r+$a]}; return $r}
! proc lprod {al} {set r 1; foreach a $al {set r [expr r*$a]}; return $r}
  
  proc lreverse {list} {
--- 131,141 ----
  }
  
! proc l+   {   al bl} {set r {}; foreach a $al b $bl {lappend r [expr $a +   $b]}; return $r}
! proc l-   {   al bl} {set r {}; foreach a $al b $bl {lappend r [expr $a -   $b]}; return $r}
! proc lzip {op al bl} {set r {}; foreach a $al b $bl {lappend r [expr $a $op $b]}; return $r}
! proc lmap {op al   } {set r {}; foreach a $al b $bl {lappend r [expr $a $op   ]}; return $r}
! proc l/2  {   al   } {set r {}; foreach a $al       {lappend r [expr $a /    2]}; return $r}
! proc lsum  {al} {set r 0; foreach a $al {set r [expr $r+$a]}; return $r}
! proc lprod {al} {set r 1; foreach a $al {set r [expr $r*$a]}; return $r}
  
  proc lreverse {list} {
***************
*** 1256,1260 ****
  proc distance {point1 point2} {
  	set off [l- $point1 $point2]
! 	set dist2 [lsum [lzip $off $off]]
  	return [expr sqrt($dist2)]
  }
--- 1256,1260 ----
  proc distance {point1 point2} {
  	set off [l- $point1 $point2]
! 	set dist2 [lsum [lzip * $off $off]]
  	return [expr sqrt($dist2)]
  }
***************
*** 1313,1317 ****
      set y [$c canvasy $y]
      if {$tooltip(visible)} {
! 	if {[expr [distance [list $tooltip(mx) $tooltip(my)] [list $x,$y]] > 10]} {
  	    $tooltip(canvas) hide_tooltip
  	}
--- 1313,1317 ----
      set y [$c canvasy $y]
      if {$tooltip(visible)} {
! 	if {[expr [distance [list $tooltip(mx) $tooltip(my)] [list $x $y]] > 10]} {
  	    $tooltip(canvas) hide_tooltip
  	}
***************
*** 1324,1327 ****
--- 1324,1328 ----
      if {[llength [$c gettags lnew]]} {
  	mset {ox1 oy1 ox2 oy2} [lrange [$c coords lnew] end-3 end]
+ 	puts "ox1=$ox1 oy1=$oy1 x=$x y=$y"
  	set l [$c coords lnew]
  	if {[llength $l]<4 || [distance [list $ox1 $oy1] [list $x $y]] < 30} {
***************
*** 1473,1477 ****
  			set out [expr int(($x-$x1)*$outs/($x2-$x1))]
  			mset {ox1 oy1 ox2 oy2} [$c bbox ${id}o${out}]
! 			$c create line lnew $x $y $x $y -dash {4 4 4 4}
  			set @wire_from [list $id $out]
  			return
--- 1474,1478 ----
  			set out [expr int(($x-$x1)*$outs/($x2-$x1))]
  			mset {ox1 oy1 ox2 oy2} [$c bbox ${id}o${out}]
! 			$c create line $x $y $x $y -dash {4 4 4 4} -tags lnew
  			set @wire_from [list $id $out]
  			return