[PD-cvs] pd/src desire.tk,1.1.2.600.2.44,1.1.2.600.2.45

[chunlee]

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

Modified Files:
      Tag: desiredata
	desire.tk 
Log Message:
jump-on-click for Slider class


Index: desire.tk
===================================================================
RCS file: /cvsroot/pure-data/pd/src/Attic/desire.tk,v
retrieving revision 1.1.2.600.2.44
retrieving revision 1.1.2.600.2.45
diff -C2 -d -r1.1.2.600.2.44 -r1.1.2.600.2.45
*** desire.tk	8 Dec 2006 15:10:14 -0000	1.1.2.600.2.44
--- desire.tk	8 Dec 2006 16:16:02 -0000	1.1.2.600.2.45
***************
*** 5206,5209 ****
--- 5206,5215 ----
  	set @ovalue $@value
  	set @rate [expr $f&1 ? 0.01 : 1.00]
+ 	if {!$@steady} {
+ 		mset {x1 y1 x2 y2} [$self bbox]
+ 		set @value [expr [$self calc $x $y $x1 $y2]*$@rate]
+ 		set @ovalue $@value
+ 		netsend [list .$self float $@value]
+ 	}
  }
  
***************
*** 5218,5227 ****
  	if {!$focused} {return}
  	mset {clx cly} $@click_at
  	set orient [$self orient]
  	set span [expr $@max-$@min]
  	set l [expr {$orient?$@h:$@w}]
! 	set d [expr {($orient?$cly-$y:$x-$clx)*$span/($l+0.0)}]
! 	set @value [min $@max [max $@min [expr $@ovalue+$d*$@rate]]]
! 	netsend [list .$self float $@value]
  }
  
--- 5224,5238 ----
  	if {!$focused} {return}
  	mset {clx cly} $@click_at
+ 	set d [$self calc $x $y $clx $cly]
+ 	set @value [min $@max [max $@min [expr $@ovalue+$d*$@rate]]]
+ 	netsend [list .$self float $@value]
+ }
+ 
+ def Slider calc {x y x1 y1} {
  	set orient [$self orient]
  	set span [expr $@max-$@min]
  	set l [expr {$orient?$@h:$@w}]
! 	set d [expr {($orient?$y1-$y:$x-$x1)*$span/($l+0.0)}]
! 	return $d
  }