Changeset 388

Timestamp:

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

Author:

toby

Message:

# on 2001/05/11 16:10:22, toby did:
button to display gzip'ed input files on Unix (on expnam)
change in location of PGPLOT font file in Windows
GSAS env var for UNIX

File:

• trunk/gsascmds.tcl (modified) (8 diffs, 3 props)

trunk/gsascmds.tcl

@@ -1668 +1668 @@
 #------------------------------------------------------------------------------
 proc getExpFileName {mode} {
-    global expgui
+    global expgui tcl_platform
     set frm .file
     catch {destroy $frm}
@@ -1685 +1685 @@
     pack [radiobutton $frmC.0 -text "Mod. Date" -value 0 \
             -variable expgui(filesort) -command "ChooseExpFil $frmA"] -side top
+
+    set expgui(includearchived) 0
+    if {$tcl_platform(platform) == "unix" && $mode == "old"} {
+        pack [checkbutton $frmC.ar -text "Include Archived Files" \
+                -variable expgui(includearchived) \
+                -command "ChooseExpFil $frmA"] -side top -pady 10
+    }
     pack [button $frmC.b -text Read \
             -command "valid_exp_file $frmA $mode"] -side bottom
@@ -1741 +1748 @@
         append expgui(FileMenuEXPNAM) ".EXP"
     }
-    # flag files that end in something other than .EXP .exp or .Exp...
-    if {[string toupper [file extension $expgui(FileMenuEXPNAM)]] != ".EXP"} {
+    # check for archive files
+    if {([string match {*.EXP.[0-9][0-9][0-9].gz} $expgui(FileMenuEXPNAM)] || \
+            [string match {*.EXP.[0-9][0-9][0-9]} $expgui(FileMenuEXPNAM)]) && \
+            $tcl_platform(platform) == "unix" && \
+            $mode == "old" && [file exists $expgui(FileMenuEXPNAM)]} {
+        destroy .file
+        return
+    } elseif {[string toupper [file extension $expgui(FileMenuEXPNAM)]] != ".EXP"} {
+        # check for files that end in something other than .EXP .exp or .Exp...
         MyMessageBox -parent . -title "File Open Error" \
                 -message "File [file tail $expgui(FileMenuEXPNAM)] is not a valid name. Experiment files must end in \".EXP\"" \
@@ -1758 +1772 @@
         ]
         if {[string tolower $ans] == "overwrite"} {destroy .file}
-#       if $ans {destroy .file}
         return
     }
@@ -1915 +1928 @@
             set modified [file mtime $file]
             lappend pairlist [list $file $modified]
+        } elseif {![file isdirectory $file] && $expgui(includearchived) && \
+                ([string match {*.EXP.[0-9][0-9][0-9].gz} $file] ||\
+                [string match {*.EXP.[0-9][0-9][0-9]} $file])} {
+            set modified [file mtime $file]
+            lappend pairlist [list $file $modified]
         }
     }
@@ -1987 +2005 @@
         set env(GSAS) [file nativename $expgui(gsasdir)]
         # PGPLOT_FONT is needed by PGPLOT
-        set env(PGPLOT_FONT) [file nativename [file join $expgui(gsasdir) fonts grfont.dat]]
+        set env(PGPLOT_FONT) [file nativename [file join $expgui(gsasdir) pgl grfont.dat]]
         # this is the number of lines/page in the .LST (etc.) file
         set env(LENPAGE) 60
@@ -2051 +2069 @@
         set env(GSAS) [file nativename $expgui(gsasdir)]
         # PGPLOT_FONT is needed by PGPLOT
-        set env(PGPLOT_FONT) [file nativename [file join $expgui(gsasdir) fonts grfont.dat]]
+        set env(PGPLOT_FONT) [file nativename [file join $expgui(gsasdir) pgl grfont.dat]]
         # this is the number of lines/page in the .LST (etc.) file
         set env(LENPAGE) 60
@@ -2096 +2114 @@
         global env expgui
         # UNIX environment variables
+        set env(GSAS) [file nativename $expgui(gsasdir)]
+        set env(gsas) [file nativename $expgui(gsasdir)]
         set env(GSASEXE) $expgui(gsasexe)
         set env(ATOMDATA) [file join $expgui(gsasdir) data atmdata.dat]