Changeset 477

Timestamp:

Dec 4, 2009 5:06:49 PM (13 years ago)

Author:

toby

Message:

# on 2001/10/31 20:04:21, toby did:
add next histogram feature

File:

• trunk/liveplot (modified) (1 diff, 3 props)

trunk/liveplot

@@ -1721 +1721 @@
 
 # fill the histogram menu
-if {[llength $expmap(powderlist)] > 1} {
+if {[llength $expmap(powderlist)] > 15} {
+    set expgui(plotlist) {}
     .a.file.menu entryconfigure Histogram -state normal
     menu .a.file.menu.hist
-    if {[llength $expmap(powderlist)] > 15} {
-        set i 0
-        foreach num [lsort -integer $expmap(powderlist)] {
-            incr i
-            # for now include, but disable histograms
-            set state disabled
-            if {[string range $expmap(htype_$num) 3 3] != "*"} {
-                set state normal
-            }
-            if {$i == 1} {
-                set num1 $num
-                menu .a.file.menu.hist.$num1
-            }
-            .a.file.menu.hist.$num1 add radiobutton -label $num -value $num \
-                    -variable hst -state $state \
-                    -command {set cycle [getcycle];readdata .g}
-            if {$i >= 10} {
-                set i 0
-                .a.file.menu.hist add cascade -label "$num1-$num" \
-                        -menu .a.file.menu.hist.$num1
-            }
-        }
-        if {$i != 0} {
+    set i 0
+    foreach num [lsort -integer $expmap(powderlist)] {
+        incr i
+        # for now include, but disable histograms
+        set state disabled
+        if {[string range $expmap(htype_$num) 3 3] != "*"} {
+            set state normal
+            lappend expgui(plotlist) $num
+        }
+        if {$i == 1} {
+            set num1 $num
+            menu .a.file.menu.hist.$num1
+        }
+        .a.file.menu.hist.$num1 add radiobutton -label $num -value $num \
+                -variable hst -state $state \
+                -command {set cycle [getcycle];readdata .g}
+        if {$i >= 10} {
+            set i 0
             .a.file.menu.hist add cascade -label "$num1-$num" \
                     -menu .a.file.menu.hist.$num1
         }
-    } else {
-        foreach num [lsort -integer $expmap(powderlist)] {
-            # for now include, but disable unprocessed histograms
-            set state disabled
-            if {[string range $expmap(htype_$num) 3 3] != "*"} {
-                set state normal
-            }
-            .a.file.menu.hist add radiobutton -label $num -value $num \
-                    -variable hst -state $state \
-                    -command {set cycle [getcycle];readdata .g}
-        }
-    }
-}
-
+    }
+    if {$i != 0} {
+        .a.file.menu.hist add cascade -label "$num1-$num" \
+                -menu .a.file.menu.hist.$num1
+    }
+} elseif {[llength $expmap(powderlist)] > 1} {
+    set expgui(plotlist) {}
+    .a.file.menu entryconfigure Histogram -state normal
+    menu .a.file.menu.hist
+    foreach num [lsort -integer $expmap(powderlist)] {
+        # for now include, but disable unprocessed histograms
+        set state disabled
+        if {[string range $expmap(htype_$num) 3 3] != "*"} {
+            set state normal
+            lappend expgui(plotlist) $num
+        }
+        .a.file.menu.hist add radiobutton -label $num -value $num \
+                -variable hst -state $state \
+                -command {set cycle [getcycle];readdata .g}
+    }
+} else {
+    set expgui(plotlist) [lindex $expmap(powderlist) 0]
+}
+# N = load next histogram
+bind . <Key-n> {
+    set i [lsearch $expgui(plotlist) $hst]
+    incr i
+    if {$i >= [llength $expgui(plotlist)]} {set i 0}
+    set hst [lindex $expgui(plotlist) $i]
+    set cycle [getcycle];readdata .g
+}
+bind . <Key-N> {
+    set i [lsearch $expgui(plotlist) $hst]
+    incr i
+    if {$i >= [llength $expgui(plotlist)]} {set i 0}
+    set hst [lindex $expgui(plotlist) $i]
+    set cycle [getcycle];readdata .g
+}
 updateifnew
 donewaitmsg