[PD-cvs] pd/src desire.tk,1.1.2.600.2.191,1.1.2.600.2.192

[Mathieu Bouchard]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
reenabled ~/.ddrc; cleanup in class Active


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.191
retrieving revision 1.1.2.600.2.192
diff -C2 -d -r1.1.2.600.2.191 -r1.1.2.600.2.192
*** desire.tk	28 Jun 2007 17:33:20 -0000	1.1.2.600.2.191
--- desire.tk	30 Jun 2007 01:53:33 -0000	1.1.2.600.2.192
***************
*** 1566,1570 ****
      set @motion_watch 0
      set @iohilite {-1 0 0 0 0}
!     set @pointer_sense 50
      set @keyprefix 0
  }
--- 1566,1570 ----
      set @motion_watch 0
      set @iohilite {-1 0 0 0 0}
!     set @pointer_sense 2
      set @keyprefix 0
  }
***************
*** 1684,1691 ****
      set butts [[ButtonBar new $self] widget]
      # turn buttonbar on/off
      if {[$self look buttonbar]} {
  	if {[catch {pack $butts -side top -fill x -expand no}]} {
! 	    global errorInfo
! 	    post "Can't show ButtonBar: %s" $errorInfo
  	}
      }
--- 1684,1691 ----
      set butts [[ButtonBar new $self] widget]
      # turn buttonbar on/off
+     puts "buttonbar: [$self look buttonbar]"
      if {[$self look buttonbar]} {
  	if {[catch {pack $butts -side top -fill x -expand no}]} {
! 	    post "Can't show ButtonBar: %s" $::errorInfo
  	}
      }
***************
*** 4619,4624 ****
  def Canvas keynav_current {} {return $@keynav_current}
  def Canvas keynav {} {return $@keynav}
- 
- 
  def Canvas keyup {x y key iso shift} {
  	if {$iso != ""} {scan $iso %c key}
--- 4619,4622 ----
***************
*** 4627,4640 ****
  
  class_new Active {View}
- 
  def Active init {canvas} {
  	super
  	set @canvas $canvas
- 	set @angles {45 90 -45 -90}
- 	set @sides {1.6 -1.6}
  	set @length 3
  	set @length2 10
  }
- 
  def Active draw {} {
  	set current [$@canvas keynav_current]
--- 4625,4634 ----
***************
*** 4645,4651 ****
  	if {[$@canvas keynav]} {
  		if {[$current class] == "Wire"} {
! 			$self hide_active_obj
  			set i 0
! 			foreach side $@sides {
  				mset {ax1 ay1 ax2 ay2} [$current bbox]
  				set t [expr atan2($ay2-$ay1, $ax2-$ax1)]
--- 4639,4645 ----
  	if {[$@canvas keynav]} {
  		if {[$current class] == "Wire"} {
! 			$self item_delete
  			set i 0
! 			foreach side {1.6 -1.6} {
  				mset {ax1 ay1 ax2 ay2} [$current bbox]
  				set t [expr atan2($ay2-$ay1, $ax2-$ax1)]
***************
*** 4656,4660 ****
  
  				for {set n 0} {$n < 2} {incr n} {
! 					set angle [lindex $@angles [expr $n+$i]]
  					mset {ax1 ay1 ax2 ay2} [$current bbox]
  					set t [expr atan2($ay2-$ay1, $ax2-$ax1)]
--- 4650,4654 ----
  
  				for {set n 0} {$n < 2} {incr n} {
! 					set angle [lindex {45 90 -45 -90} [expr $n+$i]]
  					mset {ax1 ay1 ax2 ay2} [$current bbox]
  					set t [expr atan2($ay2-$ay1, $ax2-$ax1)]
***************
*** 4669,4673 ****
  			}
  		} else {
! 			$self hide_active_wire
  			mset {x y} [lmap - [$current xy] 5]
  			set line1 [list $x $y $x [expr $y + $@length2]]
--- 4663,4667 ----
  			}
  		} else {
! 			$self item_delete
  			mset {x y} [lmap - [$current xy] 5]
  			set line1 [list $x $y $x [expr $y + $@length2]]
***************
*** 4677,4700 ****
  
  		}
! 	} else {
! 		#if {![llength [[$@canvas widget] gettags ${self}ACTIVE1]]} {return} else {$self hide}
! 		$self hide
! 	}
! }
! 
! def Active hide {} {
! 	$self hide_active_obj
! 	$self hide_active_wire
  }
! 
! def Active hide_active_wire {} {
! 	foreach angle $@angles {
! 		[$@canvas widget] delete ${self}LINE${angle}
! 	}
  }
  
- def Active hide_active_obj {} {
- 	[$@canvas widget] delete ${self}LINE1 ${self}LINE2
- }
  #-----------------------------------------------------------------------------------#
  class_new Box {View}
--- 4671,4683 ----
  
  		}
! 	} else {$self hide}
  }
! def Active hide {} {$self item_delete}
! def Active bbox {} {
! 	set current [$@canvas keynav_current]
! 	set l [$current xy]
! 	concat $l $l ;# happy now??
  }
  
  #-----------------------------------------------------------------------------------#
  class_new Box {View}