Changeset 759

Timestamp:

Dec 4, 2009 5:11:32 PM (13 years ago)

Author:

toby

Message:

# on 2003/12/05 12:56:23, toby did:
only display peak options for phases that are present
implement keyboard shortcuts (1,2,...) for showing reflection tickmarks
fix peak options menu bug

File:

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

trunk/excledt.tcl

@@ -1330 +1330 @@
             -menu $graph(exclmenu).file.menu.tick
     menu $graph(exclmenu).file.menu.tick
-    foreach num {1 2 3 4 5 6 7 8 9} {
-        $graph(exclmenu).file.menu.tick add checkbutton -label "Phase $num" \
-                -variable peakinfo(flag$num)
-    }
+
     $graph(exclmenu).file.menu add cascade -label Histogram \
             -menu $graph(exclmenu).file.menu.hist -state disabled
@@ -1360 +1357 @@
             -value 1 -variable expgui(autotick) -command plotExclData
     $graph(exclmenu).options.menu.tick add separator
-    foreach num {1 2 3 4 5 6 7 8 9} {
-        $graph(exclmenu).options.menu.tick add command -label "Phase $num" \
-                -command "minioptionsbox $num"
-    }
+
     $graph(exclmenu).options.menu add cascade -label "Symbol Type" \
             -menu $graph(exclmenu).options.menu.sym
@@ -1400 +1394 @@
     $graph(exclmenu).options.menu add command -label "Set PS output" \
             -command setpostscriptout
+    # phase options
+    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> \
+                "set peakinfo(flag$num) \[expr !\$peakinfo(flag$num)\]"
+        $graph(exclmenu).options.menu.tick add command -label "Phase $num" \
+                -command "minioptionsbox $num"
+    }
 
     set graph(bbox) [set bb $graph(exclbox).b]
@@ -1513 +1516 @@
     bind $graph(exclbox) <Configure> scheduleFillExclRegionBox
     bind all <Control-KeyPress-c> "CheckChanges $startchanges;destroy $graph(exclbox)"
-    putontop $graph(exclbox)
+    #putontop $graph(exclbox)
     wm deiconify $graph(exclbox)
+    wm iconify .
+    update
     tkwait window $graph(exclbox)
-    afterputontop
+    #afterputontop
+    wm deiconify .
     bind all <Control-c> catchQuit
     # reset the number of cycles if they have changed