Changeset 93

Timestamp:

Dec 4, 2009 5:00:17 PM (13 years ago)

Author:

toby

Message:

# on 1999/07/21 16:32:11, toby did:
add autoload mode
add support for adding phases, histograms and atoms
reset expmap when loading a new .EXP file
use putontop and afterputontop
change alpha, beta & gamma to greek letters

File:

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

trunk/expgui

@@ -17 +17 @@
 # appropriate menu.
 #
+# idea: 
+#   change cell parameters to labels and have a edit cell button
+#   that enforces metric symmetry
+#
 # to allow "global" access on phase page
 #   change buttons from radio to multiple
@@ -58 +62 @@
     if [catch {package require Tix}] {set expgui(havetix) 0}
 }
-# default is archive = on
+# default for archive mode = on
 set expgui(archive) 1
+# default for autoexec load = off
+set expgui(autoexpload) 0
 # save the name of the wish executable
 set wishshell [info nameofexecutable] 
@@ -68 +74 @@
 set liveplot(legend) 1
 set expgui(filesort) 1
-
 #=============================================================================
 # Store names of profile terms.
@@ -118 +123 @@
 # contents of GSAS menus
 source [file join $expgui(scriptdir) gsasmenu.tcl]
+# commands for adding phases, histograms & atoms
+source [file join $expgui(scriptdir) addcmds.tcl]
 #---------------------------------------------------------------------------
 # override options with locally defined values
@@ -125 +132 @@
 if [file exists [file join ~ .gsas_config]] {
     source [file join ~ .gsas_config]
+}
+if {$tcl_platform(platform) == "windows"} {
+    set expgui(exptool) [file join $expgui(gsasexe) exptool.exe]
+} else {
+    set expgui(exptool) [file join $expgui(gsasexe) exptool]
 }
 #---------------------------------------------------------------------------
@@ -170 +182 @@
         unset exparray
     }
+    # added 7/21/99 to prevent errors when switching EXP files -- needs testing
+    catch {
+        unset expmap
+    }
     expload $expfile
     set expgui(changed) 0
@@ -236 +252 @@
 }
 
-# called to reread the .EXP file -- use after another program 
-# has changed the experiment file
+# called to reread the .EXP file
 proc rereadexp {expfile} {
     global expgui
@@ -385 +400 @@
         puts $fp "set env(GSASBACKSPACE) $env(GSASBACKSPACE)"
     }
+    puts $fp "set expgui(autoexpload) $expgui(autoexpload)"
     close $fp
 }
@@ -419 +435 @@
         }
     }
-    if {[file mtime $expgui(expfile)] != $expgui(expModifiedLast)} {
+    if {[file mtime $expgui(expfile)] != $expgui(expModifiedLast) && \
+        $expgui(expModifiedLast) != 0} {
         if {$expgui(changed) == 0} {
             set ans [tk_dialog .expFileErrorMsg "Reload?" \
@@ -1939 +1956 @@
     pack [button $w.b.3 -text Quit \
             -command "QuitEditBackground $w"] -side left
+    bind $w <Return> "destroy $w"
+
     # force the window to stay on top
-    wm transient $w [winfo toplevel [winfo parent $w]]
-
-    bind $w <Return> "destroy $w"
-    wm withdraw $w
-    update idletasks
-    # center the new window in the middle of the parent
-    set x [expr [winfo x [winfo parent $w]] + [winfo width .]/2 - \
-            [winfo reqwidth $w]/2 - [winfo vrootx [winfo parent $w]]]
-    set y [expr [winfo y [winfo parent $w]] + [winfo height .]/2 - \
-            [winfo reqheight $w]/2 - [winfo vrooty [winfo parent $w]]]
-    wm geom $w +$x+$y
-    wm deiconify $w
-
-    set oldFocus [focus]
-    set oldGrab [grab current $w]
-    if {$oldGrab != ""} {
-        set grabStatus [grab status $oldGrab]
-    }
-    grab $w
+    putoptop $w
+
     focus $w.b.2
     tkwait window $w
-
-    catch {focus $oldFocus}
-    if {$oldGrab != ""} {
-        if {$grabStatus == "global"} {
-            grab -global $oldGrab
-        } else {
-            grab $oldGrab
-        }
-    }
+    afterputontop
+
     if {$expgui(temp) != ""} return
 
@@ -2099 +2094 @@
     pack [button $w.b.2 -text Set -command "destroy $w"] -side left
     pack [button $w.b.3 -text Quit -command "set expgui(temp) {}; destroy $w"] -side left
+    bind $w <Return> "destroy $w"
+
     # force the window to stay on top
-    wm transient $w [winfo toplevel [winfo parent $w]]
-
-    bind $w <Return> "destroy $w"
-    wm withdraw $w
-    update idletasks
-    # center the new window in the middle of the parent
-    set x [expr [winfo x [winfo parent $w]] + [winfo width .]/2 - \
-            [winfo reqwidth $w]/2 - [winfo vrootx [winfo parent $w]]]
-    set y [expr [winfo y [winfo parent $w]] + [winfo height .]/2 - \
-            [winfo reqheight $w]/2 - [winfo vrooty [winfo parent $w]]]
-    wm geom $w +$x+$y
-    wm deiconify $w
-
-    set oldFocus [focus]
-    set oldGrab [grab current $w]
-    if {$oldGrab != ""} {
-        set grabStatus [grab status $oldGrab]
-    }
-    grab $w
+    putontop $w
     focus $w.b.2
     tkwait window $w
+    afterputontop
+
     if {$expgui(temp) != ""} {
         foreach h $hist {
@@ -2139 +2120 @@
             }
         }
-    }
-    catch {focus $oldFocus}
-    if {$oldGrab != ""} {
-        if {$grabStatus == "global"} {
-            grab -global $oldGrab
-        } else {
-            grab $oldGrab
-        }
     }
 }
@@ -2207 +2180 @@
     pack [button $w.b.3 -text Quit \
             -command "QuitEditProfile $w [list $entrylist]"] -side left
+    bind $w <Return> "destroy $w"
+
     # force the window to stay on top
-    wm transient $w [winfo toplevel [winfo parent $w]]
-
-    bind $w <Return> "destroy $w"
-    wm withdraw $w
-    update idletasks
-    # center the new window in the middle of the parent
-    set x [expr [winfo x [winfo parent $w]] + [winfo width .]/2 - \
-            [winfo reqwidth $w]/2 - [winfo vrootx [winfo parent $w]]]
-    set y [expr [winfo y [winfo parent $w]] + [winfo height .]/2 - \
-            [winfo reqheight $w]/2 - [winfo vrooty [winfo parent $w]]]
-    wm geom $w +$x+$y
-    wm deiconify $w
-
-    set oldFocus [focus]
-    set oldGrab [grab current $w]
-    if {$oldGrab != ""} {
-        set grabStatus [grab status $oldGrab]
-    }
-    grab $w
+    putontop $w
     focus $w.b.2
     tkwait window $w
-
-    catch {focus $oldFocus}
-    if {$oldGrab != ""} {
-        if {$grabStatus == "global"} {
-            grab -global $oldGrab
-        } else {
-            grab $oldGrab
-        }
-    }
+    afterputontop
 }
 
@@ -2399 +2348 @@
 set l2 [label $frameLatt.l2 -text "b"]
 set l3 [label $frameLatt.l3 -text "c"]
-set l4 [label $frameLatt.l4 -text "alpha"]
-set l5 [label $frameLatt.l5 -text "beta"]
-set l6 [label $frameLatt.l6 -text "gamma"] 
+set l4 [label $frameLatt.l4 -text a -font symbol]
+set l5 [label $frameLatt.l5 -text b -font symbol]
+set l6 [label $frameLatt.l6 -text g -font symbol] 
 grid $e1 -column 1 -row 0 -padx 5
 grid $e2 -column 3 -row 0 -padx 5
@@ -2421 +2370 @@
 tk_optionMenu $frameLatt.om entryvar(celldamp) 0 1 2 3 4 5 6 7 8 9
 grid $frameLatt.om -column 7 -row 1 -padx 5 -sticky e
-
+if [file executable $expgui(exptool)] {
+    button $frameLatt.newp -text Add\nPhase -command MakeAddPhaseBox
+    grid $frameLatt.newp -column 0 -row 0 -rowspan 2 -sticky w
+    grid columnconfig $frameLatt  0 -weight 1
+}
 #-------------- Begin Atom Coordinates Box  ---------------------------------
 grid [listbox   $fbig.title -height 1 -relief flat] \
@@ -2434 +2387 @@
 $expgui(atomlistbox) configure -font $expgui(coordfont) -selectmode extended 
 grid [scrollbar $fbig.bscr -orient horizontal \
-        -command "move2boxes \" $fbig.title $fbig.lbox \" " 
+        -command "move2boxes \" $fbig.title $fbig.lbox \" " \
         ] -row 2 -column 0 -sticky ew
 grid [scrollbar $fbig.rscr  -command "$fbig.lbox yview" \
@@ -2455 +2408 @@
 # --------------------------- Begin Edit Box -------------------------------
 grid [set expgui(EditingAtoms) [label $frame3.top -bg beige -fg blue]] \
-        -column 0 -row 0 -padx 2 -pady 3 -columnspan 12 -sticky w
+        -column 0 -row 0 -padx 2 -pady 3 -columnspan 10 -sticky w
+if [file executable $expgui(exptool)] {
+    button $frame3.newa -text "Add New Atom" \
+            -command {MakeAddAtomsBox $expgui(curPhase)}
+    grid $frame3.newa -column 11 -row 0
+}
 
 set f3l1 [label $frame3.l1 -text "Refinement Flags " -bg beige]
@@ -2592 +2550 @@
     }
 }
+if [file executable $expgui(exptool)] {
+    button $expgui(histFrame).newh -text "Add New Histogram" -command MakeAddHistBox
+    grid $expgui(histFrame).newh -column 1 -row 6
+}
 
 # BACKGROUND information.
@@ -2946 +2908 @@
             -variable env(GSASBACKSPACE)
 }
+$expgui(fm).option.menu  add checkbutton -label "Autoload EXP" \
+            -variable expgui(autoexpload)
+
 $expgui(fm).option.menu add command -label "Save Options" -underline 1 \
         -command "SaveOptions"