Changeset 395 for trunk

Timestamp:

Dec 4, 2009 5:05:27 PM (14 years ago)

Author:

toby

Message:

# on 2001/05/23 20:11:12, toby did:
use www.ncnr.nist.gov/xtal/software/expgui as default location for web pages
fix intermediate or old GSAS versions with fonts file in /fonts/ or named pgfont.dat
clean up file archiving in UNIX

File:

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

trunk/expgui

@@ -64 +64 @@
 #set expgui(debug) 1
 
+# location for web pages, if not found locally
+set expgui(website) www.ncnr.nist.gov/xtal/software/expgui
 # default for archive mode = on
 set expgui(archive) 1
@@ -172 +174 @@
 }
 # do we have a PGPLOT fonts file?
+# if it is in the "wrong" place/name -- make it "right"
+if {![file exists [file join $expgui(gsasdir) pgl grfont.dat]] && \
+        [file exists [file join $expgui(gsasdir) fonts grfont.dat]]} {
+    catch {file mkdir [file join $expgui(gsasdir) pgl]}
+    file copy [file join $expgui(gsasdir) fonts grfont.dat] \
+            [file join $expgui(gsasdir) pgl grfont.dat]
+}
+# do we have a PGPLOT fonts file?
+if {![file exists [file join $expgui(gsasdir) pgl grfont.dat]] && \
+        [file exists [file join $expgui(gsasdir) fonts pgfont.dat]]} {
+    catch {file mkdir [file join $expgui(gsasdir) pgl]}
+    file copy [file join $expgui(gsasdir) fonts pgfont.dat] \
+            [file join $expgui(gsasdir) pgl grfont.dat]
+}
+# do we have a PGPLOT fonts file?
+if {![file exists [file join $expgui(gsasdir) pgl grfont.dat]] && \
+        [file exists [file join $expgui(gsasdir) pgl pgfont.dat]]} {
+    file copy [file join $expgui(gsasdir) pgl pgfont.dat] \
+            [file join $expgui(gsasdir) pgl grfont.dat]
+}
 if ![file exists [file join $expgui(gsasdir) pgl grfont.dat]] {
     MyMessageBox -parent . -title "PGPLOT Error" \
-            -message "Warning -- Unable to find file GRFONT.DAT. GSAS graphics will not work. Is GSAS correctly installed?" \
+            -message "Warning -- Unable to find file GRFONT.DAT in [file join $expgui(gsasdir) pgl]. GSAS graphics will not work. Is GSAS correctly installed?" \
             -icon warning -type {"Limp Ahead"} -default "Limp Ahead" \
             -helplink "expguierr.html NoPGPLOT"
@@ -715 +737 @@
                 set file $expnam.EXP.000
             } else {
-                set file [lindex [lsort -decreasing $files] 0]
-                regexp {.*\.EXP.0?0?([0-9]*).*} $file junk number
-                incr number
+                set number {}
+                foreach file [lsort -decreasing $files] {
+                    if [catch {
+                        regexp {.*\.EXP\.([0-9][0-9][0-9]).*} $file junk number
+                        regexp {0?0?([0-9]*)} $number junk number
+                        incr number
+                    }] {
+                        continue
+                    } else {
+                        break
+                    }
+                }
+                if {$number == ""} {set number 0}
                 set file $expnam.EXP.[format "%3.3d" $number]
             }
@@ -733 +765 @@
     } errmsg
     if {$errmsg != ""} {
-        tk_dialog .warn Confirm "Error in archive: $errmsg" warning 0 OK
+        tk_dialog .warn Confirm "Error archiving the current .EXP file: $errmsg" warning 0 OK
     }
 }