Changeset 838

Timestamp:

Dec 4, 2009 5:12:54 PM (14 years ago)

Author:

toby

Message:

# on 2005/03/24 21:45:48, toby did:
fix up resize for OS X
add LS band width as option (thanx RBVD)
note Pawley phase (thanks RBVD)
attempt to fix missing expmap(atomlistboxcontents) bug
(not sure why this happens, so at least trap errors)
Reset phase selection in GetPhaseFlags? in case this causes the missing expmap(atomlistboxcontents)
prevent use of TRNS & SHFT when ZERO is refined
add new print option (#10) (thanx RBVD)

File:

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

trunk/expgui

@@ -179 +179 @@
 SetTkDefaultOptions $expgui(font)
 #---------------------------------------------------------------------------
+set expgui(resize) 0
 # platform-specific code
 if {$tcl_platform(platform) == "windows" \
@@ -233 +234 @@
             -icon warning -type {"Limp Ahead"} -default "Limp Ahead" \
             -helplink "expguierr.html NoPGPLOT"
+    set expgui(resize) 1
 }
 #---------------------------------------------------------------------------
@@ -244 +246 @@
 #               -helplink "expguierr.html OpenErr"
         set expgui(expfile) {}
+        set expgui(resize) 1
     } elseif {[string first " " [file dirname $expgui(expfile)]] != -1} {
         update
@@ -250 +253 @@
                 -icon warning -type Continue -default continue
 #               -helplink "expguierr.html OpenErr"
+        set expgui(resize) 1
     } elseif ![file exists $expgui(expfile)] {
         update
@@ -259 +263 @@
         ]
         if {[string tolower $ans] != "create"} {set expgui(expfile) {}}
-    }
-}
-set expgui(resize) 0
+        set expgui(resize) 1
+    }
+}
 if {$expgui(expfile) == ""} {
     # center the parent window because the getExpFileName window
@@ -422 +426 @@
     set entryvar(cycles) [expinfo cycles]
     set entrycmd(cycles) "expinfo cycles"
+    set entryvar(mbw) [expinfo mbw]
+    set entrycmd(mbw) "expinfo mbw"
     # set expgui(globalmode) 0
     set expgui(printopt) "Print Options ([expinfo print])"
@@ -611 +617 @@
     tk_dialog .about {About...} \
 "EXPGUI\n\
-Jonathan Wasserman and Brian Toby\n\
+Brian Toby\n\
 NIST Center for Neutron Research\n\n\
-2000, Not subject to copyright\n\n\
+Not subject to copyright\n\n\
 Revision [lindex $expgui(Revision) 1] (readexp.tcl [lindex $expmap(Revision) 1])\n\n\
 Cite: B. H. Toby, EXPGUI, a graphical\n\
@@ -635 +641 @@
 \"General Structure Analysis System (GSAS)\",\n\
 Los Alamos National Laboratory Report\n\
-LAUR 86-748 (2000)." \
+LAUR 86-748 (2004)." \
         info 0 OK
 }
@@ -968 +974 @@
             } elseif {$type == 4} {
                 set expgui(phasetype) "Macromolecular"
+            } elseif {$type == 10} {
+                set expgui(phasetype) "Pawley"
             } else {
                 set expgui(phasetype) ""
@@ -1036 +1044 @@
 proc DisplayAllAtoms {curPhase "mode reset"} {
     global entryvar entrycmd expmap expgui
+    # make sure that atomlistboxcontents element exists
+    if {[catch {set expmap(atomlistboxcontents)}]} {
+        set expmap(atomlistboxcontents) {}
+    }
     # if it does not show, we don't have a phase or we are already displaying 
     # don't bother
@@ -1324 +1336 @@
 proc editOneRecord { AtomIndex } {
     global expmap expgui
+    # make sure that atomlistboxcontents element exists
+    if {[catch {set expmap(atomlistboxcontents)}]} return
+
     # get atom number & phase
     set tuple [lindex $expmap(atomlistboxcontents) $AtomIndex]
@@ -1338 +1353 @@
 proc editMultipleRecords { AtomIndexList } {
     global expmap expgui
+    # make sure that atomlistboxcontents element exists
+    if {[catch {set expmap(atomlistboxcontents)}]} return
+
     set numberList {}
     # current phase
@@ -2151 +2169 @@
     }
     mapexp
+    # reset the phase selection
+    set expgui(curPhase) {}
 }
 
@@ -2324 +2344 @@
         set ind -1
         set htype [string range $expmap(htype_$hist) 2 2]
+        set zflag 0
+        if {$htype == "C"} {
+            set zflag [histinfo $hist zref]
+        }
         foreach i $expmap(phaselist_$hist) {
             incr ind
@@ -2381 +2405 @@
                 set entrycmd(pterm${num}_$i) "hapinfo $hist $i pterm$num"
                 set entryvar(pterm${num}_$i) [hapinfo $hist $i pterm$num]
+                # disable trns & shft when zero is refined
+                if {$zflag && ($term == "trns" || $term == "shft")} {
+                    if {$entryvar(pref${num}_$i)} {
+                        incr expgui(changed)
+                        set entryvar(pref${num}_$i) 0
+                    }
+                    $ProfileFrame.l${num}_${i} config -fg gray
+                    $ProfileFrame.ref${num}_${i} config -state disabled
+                    $ProfileFrame.ent${num}_${i} config -fg gray
+                }
                 if {$col > 6} {set col -1; incr row}
             }
@@ -3841 +3875 @@
     8 "Print summary shift/esd data after last cycle"
     9 "Print zero/unit pole figure constraint terms"
+    10 "Output parameter name, value & esd to file"
 }
 pack [frame $expgui(lsFrame).hs -class HistList] \
@@ -3894 +3929 @@
         ] -row $row -column 0 -columnspan 2 
 menu $expgui(lsFrame).f1.lprint.menu
-foreach num [lsort [array names printopts]] {
+foreach num [lsort -integer [array names printopts]] {
     $expgui(lsFrame).f1.lprint.menu add checkbutton \
-            -label "$printopts($num) ([expr int(pow(2,$num))])"\
+        -label "$printopts($num) ([expr int(pow(2,$num))])"\
         -variable entryvar(printopt$num)
 }
@@ -3909 +3944 @@
         -from 1.0 -to 9.99 -showvalue 0 -command SetMarq -resolution 0.01 \
         -variable expgui(marq)] -row 1 -column 1
+
+incr row
+grid [frame $expgui(lsFrame).f1.d -bd 4 -relief groove] \
+        -row $row -column 2 -sticky ew
+grid [label $expgui(lsFrame).f1.d.lmbw -text "LS matrix bandwidth"] -row 0 -column 0
+grid [entry $expgui(lsFrame).f1.d.embw -width 4 \
+        -textvariable entryvar(mbw)] -row 0 -column 1
+set entrybox(mbw) $expgui(lsFrame).f1.d.embw
 
 incr row
@@ -3973 +4016 @@
     set expgui(convlbl) [format %5.2f [expr pow(10,$expgui(convg)/100.)]]
     set expgui(marq) [set expgui(marqinit) [expinfo marq]]
+    set expgui(mbw) [set expgui(mbwinit) [expinfo mbw]]
 }
 proc SetConv {x} {
@@ -4262 +4306 @@
     # this appears to be needed by OSX
     update
-    wm geom . [winfo reqwidth .]x[winfo reqheight .]
+    #wm geom . [winfo reqwidth .]x[winfo reqheight .]
+    wm geom . {}
     # center the EXPGUI window
     wm withdraw .