[PD-cvs] pd/src desire.tk,1.1.2.381,1.1.2.382

[Mathieu Bouchard]

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} [.$@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} [.$@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