Changeset 778

Timestamp:

Dec 4, 2009 5:11:52 PM (14 years ago)

Author:

toby

Message:

# on 2004/04/26 21:18:57, toby did:
Fix bug with OSX BLT (all new versions of BLT)?
Add ability to scan zoom region with arrow keys

File:

• trunk/excledt.tcl (modified) (3 diffs, 3 props)

trunk/excledt.tcl

@@ -675 +675 @@
         # are there any points between the regions
         if {$i != 0} {
-            set seppts [allxvec search \
-                    [expr -.00001+$low] [expr .00001+$prvhigh]]
+            set x1 [expr {-.00001+$low}]
+            set x2 [expr {.00001+$prvhigh}]
+            if {$x1 < $x2} {
+                set seppts [allxvec search $x1 $x2]
+            } else {
+                set seppts [allxvec search $x2 $x1]
+            }
             if {[llength $seppts] == 0} {
                 set exclist [lreplace $exclist $ip $i [list $prvlow $high]]
@@ -1265 +1270 @@
 }
 
+# move the zoom region around
+proc ScanZoom {box key frac} {
+    foreach var  {xl xh yl yh} axis {xaxis  xaxis  yaxis  yaxis} \
+            flg  {-min -max -min -max} {
+        set $var [$box $axis cget $flg]
+        if {$var == ""} return
+    }
+    catch {
+        switch -- $key {
+            Right {set a x; set l $xl; set h $xh; set d [expr {$frac*($h-$l)}]}
+            Left {set a x; set l $xl; set h $xh; set d [expr {-$frac*($h-$l)}]}
+            Up   {set a y; set l $yl; set h $yh; set d [expr {$frac*($h-$l)}]}
+            Down {set a y; set l $yl; set h $yh; set d [expr {-$frac*($h-$l)}]}
+        }
+        $box ${a}axis configure -min [expr {$l + $d}] -max [expr {$h + $d}]
+    }
+}
+
 # code to create the EXCLEDT box
 proc ShowExcl {} {
@@ -1395 +1418 @@
             -command setpostscriptout
     # phase options
+    set box $graph(plot)
+    set win [winfo toplevel $graph(plot)]
     foreach num $expmap(phaselist) {
         $graph(exclmenu).file.menu.tick add checkbutton -label "Phase $num" \
                 -variable peakinfo(flag$num)
-        bind [winfo toplevel $graph(plot)] <Key-$num> \
+        bind $win <Key-$num> \
                 "set peakinfo(flag$num) \[expr !\$peakinfo(flag$num)\]"
         $graph(exclmenu).options.menu.tick add command -label "Phase $num" \
                 -command "minioptionsbox $num"
     }
+    bind $win <Key-Up> "ScanZoom $box %K .1"
+    bind $win <Key-Left> "ScanZoom $box %K .1"
+    bind $win <Key-Right> "ScanZoom $box %K .1"
+    bind $win <Key-Down> "ScanZoom $box %K .1"
+    bind $win <Control-Key-Up> "ScanZoom $box %K 1.0"
+    bind $win <Control-Key-Left> "ScanZoom $box %K 1.0"
+    bind $win <Control-Key-Right> "ScanZoom $box %K 1.0"
+    bind $win <Control-Key-Down> "ScanZoom $box %K 1.0"
 
     set graph(bbox) [set bb $graph(exclbox).b]