Changeset 866

Timestamp:

Dec 4, 2009 5:13:23 PM (14 years ago)

Author:

toby

Message:

# on 2006/02/22 00:23:25, toby did:
Plug GSAS on window head
Make histogram selection look like a button
fix bug in global setting of phase fractions/damping
make history not like a button
remove control-C exit from Windows version

File:

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

trunk/expgui

@@ -384 +384 @@
     set expgui(last_History) [string range [string trim [lindex [exphistory last] 1]] 0 50 ]
     # set the window/icon title
-    wm title . "EXPGUI $expfile"
+    wm title . "EXPGUI interface to GSAS: $expfile"
     set expgui(titleunchanged) 1
     wm iconname . [file tail $expfile]
@@ -778 +778 @@
     if $expgui(titleunchanged) {
         if {$expgui(changed) != 0} {
-            wm title . "$expgui(expfile) (modified)"
+            wm title . "EXPGUI interface to GSAS: $expgui(expfile) (modified)"
             set expgui(titleunchanged) 0
         }
@@ -1557 +1557 @@
     global expgui
     grid [label $frm.mode -text "Select a Histogram" \
-            -bg beige -anchor center] \
+            -bg beige -anchor center -bd 2 -relief raised] \
             -row 0 -column 0 -columnspan 2 -sticky ew
     bind $frm.mode <Button-1> {
@@ -2280 +2280 @@
                     [list $phasehistlist($i)] $i" \
                     ] -column 1 -row 0
+            set entrycmd(frref$i) "hapinfo [list $histlist] $i frref"
+            set entryvar(frref$i) [hapinfo $hist $i frref]
+            set entrycmd(frdamp$i) "hapinfo [list $histlist] $i frdamp"
         } else {
             grid [label $framePF.l1  -text "Phase $i"] \
@@ -2286 +2289 @@
                     -column 1 -row 0
             set entrybox(frac$i) $framePF.ent
+            set entrycmd(frref$i) "hapinfo $hist $i frref"
+            set entryvar(frref$i) [hapinfo $hist $i frref]
+            set entrycmd(frdamp$i) "hapinfo $hist $i frdamp"
         }
         set entrycmd(frac$i) "hapinfo $hist $i frac"
@@ -2293 +2299 @@
         grid [checkbutton $framePF.cb -variable entryvar(frref$i)] \
                 -column 3 -row 0 -sticky nws 
-        set entrycmd(frref$i) "hapinfo $hist $i frref"
-        set entryvar(frref$i) [hapinfo $hist $i frref]
         grid [label $framePF.l3  -text "  Damping"] \
                 -column 4 -row 0 -sticky nws 
         tk_optionMenu $framePF.tkOptDamp entryvar(frdamp$i) \
                 0 1 2 3 4 5 6 7 8 9     
-        set entrycmd(frdamp$i) "hapinfo $hist $i frdamp"
         set entryvar(frdamp$i) [hapinfo $hist $i frdamp]
         grid $framePF.tkOptDamp -row 0 -sticky nsw -column 5
@@ -3895 +3898 @@
 set row 0
 grid [label $expgui(lsFrame).f1.his1 -pady 6 -text "Last History:"] -row $row -column 0
-grid [label $expgui(lsFrame).f1.his2 -relief raised -bd 2 -pady 6 \
+grid [label $expgui(lsFrame).f1.his2 -relief groove -bd 2 -pady 6 \
         -textvariable expgui(last_History)] \
         -row $row -column 1 -columnspan 5 -sticky w
@@ -4281 +4284 @@
 # handle indirect exits
 wm protocol . WM_DELETE_WINDOW catchQuit
-bind . <Control-c> catchQuit
+if {$tcl_platform(platform) != "windows"} {bind . <Control-c> catchQuit}
 
 set expgui(pagenow) ""