Changeset 993 for trunk/liveplot

Timestamp:

Aug 10, 2010 5:27:26 PM (11 years ago)

Author:

toby

Message:

make label phase name/number a saved option

File:

• trunk/liveplot (modified) (6 diffs)

trunk/liveplot

@@ -80 +80 @@
 set expgui(hklbox) 1
 set expgui(autotick) 0
+set expgui(phaselabel) 0
 set expgui(pixelregion) 5
 # location for web pages, if not found locally
@@ -134 +135 @@
     color1 magenta 
     color2 cyan 
-    color3 yellow 
+    color3 black 
     color4 sienna 
     color5 orange 
@@ -572 +573 @@
     global lasthst graph expgui box
 
+    foreach p $::expmap(phaselist) {
+        if {$expgui(phaselabel)} {
+            # 20 characters, max
+            set graph(label$p) [string range [phaseinfo $p name] 0 19]
+            
+        } else {
+            set graph(label$p) Phase$p
+        }
+    }
     # is there a new histogram to load?
     if {$hst != $lasthst} {
@@ -636 +646 @@
                     $box marker config peaks${i}_$j \
                             $graph(MarkerColorOpt) [list $peakinfo(color$i)]
-                    if $peakinfo(dashes$i) {
+                    if {$peakinfo(dashes$i) && ! $expgui(autotick)} {
                         $box marker config peaks${i}_$j -dashes "5 5"
                     }
@@ -998 +1008 @@
         puts $fp "set graph(color_$v) [list $graph(color_$v)]"
     }
-    foreach v {font lblfontsize fadetime hklbox pixelregion autotick} {
+    foreach v {font lblfontsize fadetime hklbox pixelregion autotick phaselabel} {
         puts $fp "set expgui($v) [list $expgui($v)]"
     }
@@ -2073 +2083 @@
         -value 1 -variable expgui(autotick) -command plotdata
 .a.options.menu.tick add separator
-.a.options.menu.tick add command -label "Label by name" \
-        -command {
-    foreach p $expmap(phaselist) {
-        # 20 characters, max
-        set graph(label$p) [string range [phaseinfo $p name] 0 19]
-        plotdata
-    }
-}
+.a.options.menu.tick add radiobutton -label "Label by phase number" \
+        -value 0 -variable expgui(phaselabel) -command plotdata
+.a.options.menu.tick add radiobutton -label "Label by phase name" \
+        -value 1 -variable expgui(phaselabel) -command plotdata
 .a.options.menu.tick add separator