[PD-cvs] pd/src desire.tk,1.1.2.600.2.37,1.1.2.600.2.38

[chunlee]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
crosshair and other small fixes


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.37
retrieving revision 1.1.2.600.2.38
diff -C2 -d -r1.1.2.600.2.37 -r1.1.2.600.2.38
*** desire.tk	7 Dec 2006 21:16:32 -0000	1.1.2.600.2.37
--- desire.tk	7 Dec 2006 21:25:08 -0000	1.1.2.600.2.38
***************
*** 206,217 ****
  		if {$i == [expr [llength $@q] - 1]} {set @q {}}
  	}
- #	foreach o $@q {
- #		#post %s "Manager: $o: $poolset($o)"
- #		unset poolset($o)
- #		# $o draw
- #		#if {[catch {$o draw}]} {puts [error_dump]}
- #		if {[catch {$o draw_maybe}]} {puts [error_dump]}
- #	}
- #	set @q {}
  	after 50 "$self call"
  }
--- 206,209 ----
***************
*** 1159,1162 ****
--- 1151,1155 ----
  
  def View item_delete {{suffix all}} {
+ 	if {$@canvas == ""} {return}
  	set c [$@canvas widget]
  	if {![winfo exists $c]} {
***************
*** 1640,1645 ****
  	$self delete_window
  	super
- 	# the following line doesn't make any sense, does it?
- 	if {$@gop} {foreach x $@children {$x changed}; $self changed}
  }
  
--- 1633,1636 ----
***************
*** 5684,5690 ****
  	set c [$@canvas widget]
  	set z [$@canvas zoom]
- 	mset {x1 y1 x2 y2} [$c cget -scrollregion]
- 	set x1 [expr $x1/$z]
- 	set y1 [expr $y1/$z]
  	mset {type id detail} $@target
  	set x $@x
--- 5675,5678 ----
***************
*** 5705,5714 ****
  	set w [expr (1 / ($r - $l)) * [winfo width $c]]
  	set h [expr (1 / ($b - $t)) * [winfo height $c]]
! 	set h1 [list $x1 $y $w $y]
! 	set v1 [list $x $y1 $x $h]	
  	$self item VHAIR1 line $v1 -fill [$@canvas look crosshair] -width 0.5 -dash {4 4 4 4}
  	$self item HHAIR1 line $h1 -fill [$@canvas look crosshair] -width 0.5 -dash {4 4 4 4}
  }
  
  #def Crosshair erase {} {$self item_delete VHAIR1; $self item_delete HHAIR1}
  
--- 5693,5706 ----
  	set w [expr (1 / ($r - $l)) * [winfo width $c]]
  	set h [expr (1 / ($b - $t)) * [winfo height $c]]
! 	set x1 [expr ($w*$l)/$z]
! 	set y1 [expr ($h*$t)/$z]
! 	set h1 [list $x1 $y [expr $x1+[winfo width $c]] $y]
!        	set v1 [list $x $y1 $x [expr [winfo height $c]+$y1]] 
! 
  	$self item VHAIR1 line $v1 -fill [$@canvas look crosshair] -width 0.5 -dash {4 4 4 4}
  	$self item HHAIR1 line $h1 -fill [$@canvas look crosshair] -width 0.5 -dash {4 4 4 4}
  }
  
+ 
  #def Crosshair erase {} {$self item_delete VHAIR1; $self item_delete HHAIR1}