Changeset 449 for trunk/expgui

Timestamp:

Dec 4, 2009 5:06:21 PM (14 years ago)

Author:

toby

Message:

# on 2001/09/25 23:30:11, toby did:
Add citations, as suggested by Lachlan
Add Set Histogram flag button

File:

• trunk/expgui (modified) (7 diffs, 3 props)

trunk/expgui

@@ -524 +524 @@
 2000, Not subject to copyright\n\n\
 Revision [lindex $expgui(Revision) 1] (readexp.tcl [lindex $expmap(Revision) 1])\n\n\
-Generalized Structure Analysis System (GSAS)\n\
+Cite: B. H. Toby, EXPGUI, a graphical\n\
+user interface for GSAS, J. Appl. Cryst.\n\
+34, 210-21 (2001).
+\n\n\
+Generalized Structure Analysis System\n(GSAS)\n\
 A. C. Larson and\n R. B. Von Dreele,\n LANSCE, Los Alamos\n\n\
 " \
+        info 0 OK
+}
+proc Cite { } {
+    global expgui expmap
+    tk_dialog .about {Citations...} \
+"If you use EXPGUI, please cite\n\n\
+B.H. Toby, EXPGUI, a graphical\n\
+user interface for GSAS, J. Appl. Cryst.\n\
+34, 210-21 (2001).\n\n\
+as well as\n\n\
+A.C. Larson and R.B. Von Dreele,\n\
+\"General Structure Analysis System (GSAS)\",\n\
+Los Alamos National Laboratory Report\n\
+LAUR 86-748 (2000)." \
         info 0 OK
 }
@@ -1255 +1273 @@
     lappend expgui(HistSelectList) $frm
     grid [scrollbar $frm.x -orient horizontal \
-            -command "move2boxes \" $frm.title $frm.lbox \" " 
+            -command "move2boxesX \" $frm.title $frm.lbox \" " 
     ] -row 3 -column 0 -sticky ew
     grid [scrollbar $frm.y \
@@ -1373 +1391 @@
         }
         foreach lbox $expgui(HistSelectList) {
-            $lbox.lbox insert end [format "%2d  %s  %4d %8s  %-67s" \
+            $lbox.lbox insert end [format "%2d  %s %4d %8s  %-67s" \
                     $h \
-                    [string range $expmap(htype_$h) 1 2] \
+                    [string range $expmap(htype_$h) 1 3] \
                     [histinfo $h bank] \
                     $det \
@@ -2903 +2921 @@
     $expgui(atomlistbox) configure -selectmode extended 
     grid [scrollbar $fbig.bscr -orient horizontal \
-            -command "move2boxes \" $fbig.title $fbig.lbox \" " \
+            -command "move2boxesX \" $fbig.title $fbig.lbox \" " \
             ] -row 2 -column 0 -sticky ew
     grid [scrollbar $fbig.rscr  -command "$fbig.lbox yview" \
@@ -3011 +3029 @@
 }
 
-proc move2boxes {boxlist args} {
-    foreach lbox $boxlist { 
-        eval $lbox xview $args
-    }
-}
 #-----------------------------------------------------------------------------
 proc MakeHistPane {} {
@@ -3064 +3077 @@
     grid [frame $expgui(histFrame).bb] -column 1 -row 6
     if [file executable $expgui(exptool)] {
-        button $expgui(histFrame).bb.newh -text "Add New Histogram" -command MakeAddHistBox
-        grid $expgui(histFrame).bb.newh -column 1 -row 1
+        button $expgui(histFrame).bb.newh -text "Add New\nHistogram" \
+                -command MakeAddHistBox
+        grid $expgui(histFrame).bb.newh -column 0 -row 1
     }
     if [file exists [file join $expgui(scriptdir) excledt]] {
-        button $expgui(histFrame).bb.excl -text "Data Limits/Exclude" -command excledit
-        grid $expgui(histFrame).bb.excl -column 0 -row 1
-    }
+        button $expgui(histFrame).bb.excl \
+                -text "Set Data Limits &\nExcluded Regions" -command excledit
+        grid $expgui(histFrame).bb.excl -column 1 -row 1
+    }
+    button $expgui(histFrame).bb.use -text "Set Histogram\nUse Flags" \
+            -command SetHistUseFlags
+    grid $expgui(histFrame).bb.use -column 2 -row 1
 
     # BACKGROUND information.
@@ -3431 +3449 @@
 bind . <Key-F1> MakeWWWHelp
 $expgui(fm).help.menu add command -label "About..." -command About
+$expgui(fm).help.menu add command -label "Cite..." -command Cite
 
 #---- options menu button