Changeset 661 for trunk

Timestamp:

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

Author:

toby

Message:

# on 2002/10/31 17:32:06, toby did:
trap gsas_config errors & write to file better

File:

• trunk/widplt (modified) (2 diffs, 3 props)

trunk/widplt

@@ -669 +669 @@
     global graph
     set fp [open [file join ~ .gsas_config] a]
-    puts $fp "set graph(legend) $graph(legend)"
-    puts $fp "set graph(printout) $graph(printout)"
-    puts $fp "set graph(outname) $graph(outname)"
-    puts $fp "set graph(outcmd) $graph(outcmd)"
-    puts $fp "set graph(plotunits) $graph(plotunits)"
-    puts $fp "set graph(equivwave) $graph(equivwave)"
+    puts $fp "set graph(legend) [list $graph(legend)]"
+    puts $fp "set graph(printout) [list $graph(printout)]"
+    puts $fp "set graph(outname) [list $graph(outname)]"
+    puts $fp "set graph(outcmd) [list $graph(outcmd)]"
+    puts $fp "set graph(plotunits) [list $graph(plotunits)]"
+    puts $fp "set graph(equivwave) [list $graph(equivwave)]"
     close $fp
 }
@@ -978 +978 @@
 }
 set expgui(scriptdir) [file dirname $expgui(script) ]
+set expgui(docdir) [file join $expgui(scriptdir) doc]
+# location for web pages, if not found locally
+set expgui(website) www.ncnr.nist.gov/xtal/software/expgui
 
 # fetch EXP file processing routines 
 source [file join $expgui(scriptdir) readexp.tcl]
+source [file join $expgui(scriptdir) gsascmds.tcl]
 
 # override options with locally defined values
-if [file exists [file join $expgui(scriptdir) localconfig]] {
-    source [file join $expgui(scriptdir) localconfig]
-}
-if [file exists [file join ~ .gsas_config]] {
-    source [file join ~ .gsas_config]
+if {[catch {
+    foreach file [list \
+                      [file join $expgui(scriptdir) localconfig] \
+                      [file join ~ .gsas_config]] {
+        if [file exists $file] {source $file}
+    }
+} errmsg]} {
+    set msg "Error reading file $file (aka [file nativename $file]): $errmsg"
+    MyMessageBox -parent . -title "Customize warning" \
+        -message $msg -icon warning -type Ignore -default ignore \
+        -helplink "expguierr.html Customizewarning"
 }
 #----------------------------------------------------------------