Changeset 306 for trunk/expgui

Timestamp:

Dec 4, 2009 5:03:51 PM (13 years ago)

Author:

toby

Message:

# on 2000/10/04 20:35:17, toby did:
variable expgui(bkgcolor1) provides the background color for editing
coordinates on the phase panel

A no-shell mode is now defined using env(EXPGUI_NOSHELL) or /noshell

File:

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

trunk/expgui

@@ -35 +35 @@
 }
 
+# the shell variable tells expgui to act as a shell for GSAS
+# as well as edit the EXP file. In no-shell mode, it can 
+# only be used to edit the .EXP file as a callable program
+set expgui(shell) 1
+catch {if $env(EXPGUI_NOSHELL) {set expgui(shell) 0}}
+
 if {$argv != ""} {
-    set expgui(expfile) $argv
+    if {[string match *noshell* [string tolower $argv]]} {
+        puts noshell
+        set expgui(shell) 0
+        set expgui(expfile) [lindex $argv 1]
+    } else {
+        set expgui(expfile) [lindex $argv 0]
+    }
     if {[string toupper [file extension $expgui(expfile)]] != ".EXP"} {
         append expgui(expfile) ".EXP"
@@ -46 +58 @@
 set expgui(curhist) {}
 set expmap(powderlist) {}
+set expgui(bkgcolor1) #fdf
 
 set expgui(debug) 0
@@ -1009 +1022 @@
     } elseif { $iOrA == "I" || $iOrA == "disable"} {
         foreach item $expgui(anisolabels) {
-#           $item config -fg grey
-            $item config -fg beige
+            $item config -fg $expgui(bkgcolor1)
         }
         foreach item [lrange $expgui(anisoentry) 1 end] \
@@ -1016 +1028 @@
             set entrycmd($var) ""
             set entryvar($var) ""
-            $item config -fg beige -bg beige  -state disabled
+            $item config -fg $expgui(bkgcolor1) -bg $expgui(bkgcolor1) \
+                    -state disabled
         }
         if { $iOrA == "disable"} {
             set entrycmd($var) ""
             set entryvar($var) ""
-#           [lindex $expgui(anisoentry) 0] config -fg white -state disabled
-            [lindex $expgui(anisoentry) 0] config -fg beige -bg beige -state disabled
+            [lindex $expgui(anisoentry) 0] config \
+                    -fg $expgui(bkgcolor1) -bg $expgui(bkgcolor1) \
+                    -state disabled
         } else {
             set entrycmd(U11) "atominfo $p $atomnum Uiso"
@@ -1039 +1053 @@
     if {$atomnum == 0} {
         foreach label $expgui(atomreflbl) {
-            $label config -fg beige
+            $label config -fg $expgui(bkgcolor1)
         }
         foreach entry $expgui(atomref) {
-            $entry config -state disabled -fg beige -bg beige
+            $entry config -state disabled \
+                    -fg $expgui(bkgcolor1) -bg $expgui(bkgcolor1)
+            # turn off checkbuttons
+            catch {$entry deselect}
+
         }
         return
@@ -1050 +1068 @@
     }
     foreach entry $expgui(atomref) {
-        $entry config -state normal -fg black -bg beige
+        $entry config -state normal -fg black -bg $expgui(bkgcolor1)
     }
     foreach var {xref uref fref xdamp udamp fdamp}  {
@@ -1063 +1081 @@
     if {$atomnum == 0} {
         foreach label $expgui(atomlabels) {
-            $label config -fg beige
+            $label config -fg $expgui(bkgcolor1)
         }
         foreach entry $expgui(atomentry) {
-            $entry config -state disabled -fg beige -bg beige
+            $entry config -state disabled \
+                    -fg $expgui(bkgcolor1) -bg $expgui(bkgcolor1)
         }
         return
@@ -2635 +2654 @@
     #  This is a big frame in the Phase notebook pane to hold atomic data.
     set fbig [frame $expgui(phaseFrame).fbig -width 180 \
-            -relief raised -borderwidth 4 -bg beige]
+            -relief raised -borderwidth 4]
     #  This is a frame just below the big frame: for edits
     set frame3 [frame $expgui(phaseFrame).frame3 -width 100 \
-            -relief raised -borderwidth 4 -bg beige]
+            -relief raised -borderwidth 4 -bg $expgui(bkgcolor1)]
 
     grid $expgui(phaseFrame).top -sticky news -row 0 -column 0 
@@ -2731 +2750 @@
 
     # --------------------------- Begin Edit Box ------------------------
-    grid [set expgui(EditingAtoms) [label $frame3.top -bg beige -fg blue]] \
+    grid [set expgui(EditingAtoms) [label $frame3.top -bg $expgui(bkgcolor1) -fg blue]] \
             -column 0 -row 0 -padx 2 -pady 3 -columnspan 10 -sticky w
     if [file executable $expgui(exptool)] {
         button $frame3.newa -text "Add New Atoms" \
+                -bg $expgui(bkgcolor1) -highlightthickness 0 \
                 -command {MakeAddAtomsBox $expgui(curPhase)}
         grid $frame3.newa -column 11 -row 0
     }
     button [set expgui(atomxform) $frame3.xa] \
+            -bg $expgui(bkgcolor1) -highlightthickness 0 \
             -command {MakeXformAtomsBox $expgui(curPhase)}
     grid $expgui(atomxform) -column 11 -row 1 -sticky ew
 
-    set f3l1 [label $frame3.l1 -text "Refinement Flags " -bg beige]
+    set f3l1 [label $frame3.l1 -text "Refinement Flags:" -bg $expgui(bkgcolor1)]
     grid $f3l1 -column 0 -row 1 -padx 2 -sticky nsw -pady 3
-    
-    set f3cFlag1 [checkbutton $frame3.cf1 -text "X" -variable entryvar(xref) -bg beige]
-    set f3cFlag2 [checkbutton $frame3.cf2 -text "U" -variable entryvar(uref) -bg beige]
-    set f3cFlag3 [checkbutton $frame3.cf3 -text "F" -variable entryvar(fref) -bg beige]
-    grid $f3cFlag1 -column 1 -row 1 -padx 2 -pady 3 -sticky w
-    grid $f3cFlag2 -column 2 -row 1 -padx 2 -pady 3 -sticky w
-    grid $f3cFlag3 -column 3 -row 1 -padx 2 -pady 3 -sticky w
-    
-    set f3l4 [label $frame3.l4 -text "Damping Factors " -bg beige]
+    foreach lbl {X U F} var {xref uref fref} col {1 2 3} {
+        grid [checkbutton $frame3.cf$col \
+                -text $lbl -variable entryvar($var) \
+                -bg $expgui(bkgcolor1) -highlightthickness 0 \
+                -activebackground $expgui(bkgcolor1)] \
+                -column $col -row 1 -padx 4 -pady 3 -sticky w
+    }
+    set f3l4 [label $frame3.l4 -text "  Damping:" -bg $expgui(bkgcolor1)]
     grid $f3l4 -column 4 -row 1 -padx 2 -sticky nsw -pady 3
     
-    tk_optionMenu $frame3.om2 entryvar(xdamp) 0 1 2 3 4 5 6 7 8 9
-    tk_optionMenu $frame3.om3 entryvar(udamp) 0 1 2 3 4 5 6 7 8 9
-    tk_optionMenu $frame3.om4 entryvar(fdamp) 0 1 2 3 4 5 6 7 8 9
-    grid [label $frame3.lom2 -text X -bg beige] -column 5 -row 1 -padx 2 -pady 3 -sticky w
-    grid $frame3.om2 -column 6 -row 1 -padx 2 -pady 3 -sticky w
-    grid [label $frame3.lom3 -text U -bg beige] -column 7 -row 1 -padx 2 -pady 3 -sticky w
-    grid $frame3.om3 -column 8 -row 1 -padx 2 -pady 3 -sticky w
-    grid [label $frame3.lom4 -text F -bg beige] -column 9 -row 1 -padx 2 -pady 3 -sticky w
-    grid $frame3.om4 -column 10 -row 1 -padx 2 -pady 3 -sticky w
-
+    set col 4
+    foreach var {xdamp udamp fdamp} num {2 3 4} lbl {X U F} {
+        grid [label $frame3.lom$num -text $lbl \
+                -bg $expgui(bkgcolor1)] \
+                -column [incr col] -row 1 -padx 2 -pady 3 -sticky w
+        tk_optionMenu $frame3.om$num entryvar($var) 0 1 2 3 4 5 6 7 8 9
+        $frame3.om$num config -highlightthickness 0
+        grid $frame3.om$num -column [incr col] -row 1 -padx 2 -pady 3 -sticky w
+    }
     set expgui(atomreflbl) "$frame3.l1 $frame3.l4 $frame3.lom2 $frame3.lom3 $frame3.lom4 "
     set expgui(atomref) "$frame3.cf1 $frame3.cf2 $frame3.cf3 $frame3.om2 $frame3.om3 $frame3.om4"
     
-    set coords [frame $frame3.coords  -width 100 -borderwidth 0  -bg beige]
+    set coords [frame $frame3.coords  -width 100 -borderwidth 0  -bg $expgui(bkgcolor1)]
     grid $coords -column 0 -row 6 -columnspan 12 -sticky nsew
     
-    set f3l1 [label $frame3.coords.l1 -text "Label" -bg beige]
+    set f3l1 [label $frame3.coords.l1 -text "Label" -bg $expgui(bkgcolor1)]
     grid $f3l1 -column 0 -row 4 -padx 2 -sticky nsw -pady 3
     set expgui(atomlabels) $f3l1
@@ -2779 +2798 @@
     set expgui(atomentry) $f3e1
 
-    set f3l8 [label $frame3.coords.l8 -text "Coordinates" -bg beige]
+    set f3l8 [label $frame3.coords.l8 -text "Coordinates" -bg $expgui(bkgcolor1)]
     grid $f3l8 -column 2 -row 4 -padx 2 -sticky nsw -pady 3
     lappend expgui(atomlabels) $f3l8
-    set f3l11 [label $frame3.coords.l11 -text "Occupancy" -bg beige]
+    set f3l11 [label $frame3.coords.l11 -text "Occupancy" -bg $expgui(bkgcolor1)]
     grid $f3l11 -column 6 -row 4 -padx 2 -sticky nsw -pady 3
     lappend expgui(atomlabels) $f3l11
@@ -2794 +2813 @@
 
 
-    set f3f31 [frame $frame3.f3f31  -width 100 -borderwidth 0 -bg beige]
+    set f3f31 [frame $frame3.f3f31  -width 100 -borderwidth 0 -bg $expgui(bkgcolor1)]
     grid $f3f31 -column 0 -row 7 -columnspan 12
     set expgui(anisolabels) {}
-    lappend expgui(anisolabels)  [label $f3f31.l13 -text "Uiso" -bg beige]
-    lappend expgui(anisolabels)  [label $f3f31.l14 -text "U22" -bg beige]
-    lappend expgui(anisolabels)  [label $f3f31.l15 -text "U33" -bg beige]
-    lappend expgui(anisolabels)  [label $f3f31.l16 -text "U12" -bg beige]
-    lappend expgui(anisolabels)  [label $f3f31.l17 -text "U13" -bg beige]
-    lappend expgui(anisolabels)  [label $f3f31.l18 -text "U23" -bg beige]
-
+    foreach lbl {13 14 15 16 17 18} txt {Uiso U22 U33 U12 U13 U23} {
+        lappend expgui(anisolabels)  [\
+                label $f3f31.l$lbl -text $txt -bg $expgui(bkgcolor1)
+        ]
+    }
     set expgui(anisoentry) {}
     foreach i {e13 e14 e15 e16 e17 e18} var {U11 U22 U33 U12 U13 U23} { 
@@ -3155 +3172 @@
     $expgui(fm).file.menu add command -label "Reset" -command "reset"
 }
-if {$tcl_platform(platform) != "macintosh"} {
+if {$expgui(shell)} {
     $expgui(fm).file.menu add command -label "expnam" -command readnewexp
 }
@@ -3179 +3196 @@
 menu $expgui(fm).option.menu
 
-if {$tcl_platform(platform) != "macintosh"} {
+if {$expgui(shell)} {
     $expgui(fm).option.menu add checkbutton  -label "Archive EXP" \
             -variable expgui(archive)
@@ -3246 +3263 @@
     $expgui(fm).option.menu  add checkbutton -label "Override backspace" \
             -variable env(GSASBACKSPACE)
-    $expgui(fm).option.menu  add checkbutton -label "Autoload EXP" \
-            -variable expgui(autoexpload)
+    if {$expgui(shell)} {
+        $expgui(fm).option.menu  add checkbutton -label "Autoload EXP" \
+                -variable expgui(autoexpload)
+    }
 }
 
@@ -3255 +3274 @@
 pack $expgui(fm).file $expgui(fm).option -side left  -in $expgui(fm)
 
-if {$tcl_platform(platform) != "macintosh"} {
+if {$expgui(shell)} {
     foreach menu $expgui(menunames) {
         set m [string tolower $menu]
@@ -3265 +3284 @@
 pack $expgui(fm).help  -side right -in $expgui(fm)
 
-if {$tcl_platform(platform) != "macintosh"} {
+if {$expgui(shell)} {
     # add the commands in expgui_menulist 
     foreach menu [array names expgui_menulist ] {
@@ -3306 +3325 @@
     }
 }
-if {$tcl_platform(platform) != "macintosh"} {
+if {$expgui(shell)} {
     # set up button bar
     foreach cmd $expgui(buttonlist) {