Changeset 658 for trunk/lstview

Timestamp:

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

Author:

toby

Message:

# on 2002/10/31 17:26:56, toby did:
trap gsas_config errors
prevent infinite loop in readsum

File:

• trunk/lstview (modified) (7 diffs, 3 props)

trunk/lstview

@@ -194 +194 @@
         set npos [$win index "$pos+1line linestart"]
         set fpos [$win index $pos-1line]
-        set pos [$win search {Summary table} $npos+1line end]
         
         if {!$txtvw(plotvars)} continue
@@ -200 +199 @@
         # parse outs the last listed cycle number
         set lstcyc {}
-        while {$fpos != "0.0" && $lstcyc == ""} {
-            set line [$win get $fpos "$fpos lineend"]
-            regexp {cycle *([0-9]+):} $line a lstcyc
-            set fpos [$win index $fpos-1line]
-        } 
+        set fpos [$win search -backwards -nocase -regexp {cycle *[0-9]+ } $pos]
+        if {$fpos != ""} {
+            set end [$win index "$fpos lineend"]
+            set lstcyc [lindex [$win get $fpos $end] 1]
+        }
         # get the cycle offset
         set ncyc [lindex [$win get $npos "$npos lineend"] end]
@@ -239 +238 @@
             if {$npos == $end} break
         }
+        set pos [$win search {Summary table} $npos+1line end]
     }
 }
@@ -348 +348 @@
     global txtvw
     set fp [open [file join ~ .gsas_config] a]
-    puts $fp "set txtvw(followcycle) $txtvw(followcycle)"
+    puts $fp "set txtvw(followcycle) [list $txtvw(followcycle)]"
     puts $fp "set txtvw(font) [list $txtvw(font)]"
     close $fp
@@ -385 +385 @@
 }
 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
 
 source [file join $expgui(scriptdir) gsascmds.tcl]
@@ -390 +393 @@
 
 # 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"
+}
 
 set txtvw(lastchi) {}
@@ -700 +708 @@
 }
 donewaitmsg
-# read a file compressed file
-if {$zfil != ""} {updatetext $zfil 0; close $zfil}
+# read a file compressed file, if present
+if {$zfil != ""} {
+    updatetext $zfil
+    close $zfil
+}
 # read the initial file
 updatetext $lstfp