Changeset 390 for trunk

Timestamp:

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

Author:

toby

Message:

# on 2001/05/11 16:18:58, toby did:
change in location of PGPLOT font file in Windows (now same for all)
support gzip compressed archive files as input in Unix
fix bug on disable "add histogram" button (button is missing if no EXPTOOL)

File:

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

trunk/expgui

@@ -167 +167 @@
     #
     set expgui(exptool) [file join $expgui(gsasexe) exptool.exe]
-    if ![file exists [file join $expgui(gsasdir) fonts grfont.dat]] {
-        MyMessageBox -parent . -title "PGPLOT Error" \
-                -message "Warning -- Unable to find file GRFONT.DAT. GSAS graphics will not work. Is GSAS correctly installed?" \
-                -icon warning -type {"Limp Ahead"} -default "Limp Ahead" \
-                -helplink "expguierr.html NoPGPLOT"
-    }
 } else {
     set expgui(exptool) [file join $expgui(gsasexe) exptool]
-    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?" \
-                -icon warning -type {"Limp Ahead"} -default "Limp Ahead" \
-                -helplink "expguierr.html NoPGPLOT"
-    }
     if [catch {set env(GSASBACKSPACE)}] {set env(GSASBACKSPACE) 1}
+}
+# do we have a PGPLOT fonts file?
+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?" \
+            -icon warning -type {"Limp Ahead"} -default "Limp Ahead" \
+            -helplink "expguierr.html NoPGPLOT"
 }
 #---------------------------------------------------------------------------
@@ -226 +221 @@
 proc loadexp {expfile} {
     global expgui expmap entryvar entrycmd tcl_platform
-    set exploadtime [time {set fmt [expload $expfile]}]
-    if $expgui(debug) {puts "expload $exploadtime"}
-    # if the file was not in the correct format, force a rewrite before use
-    if {$fmt < 0} {
-        # read error
-        return
-    } elseif {$fmt == 1} {
-        set expgui(changed) 0
+    # is this a compressed archive file? 
+    if {[string match {*.EXP.[0-9][0-9][0-9].gz} $expfile] && \
+            $tcl_platform(platform) == "unix"} {
+        regexp {.*.EXP} $expfile rootname
+        if {[auto_execok gunzip] == ""} {
+            # tno gunzip -- bail out
+            MyMessageBox -parent . -title "Cannot Load Archived File" \
+                -message "Unable to find the gunzip program in your path. Loading this archived version of [file tail $rootname] requires the gzip program. Load gunzip or fix your path and then restart EXPGUI" \
+                -icon error
+            return
+        }
+        set ans [MyMessageBox -parent . -title "Load Archived File" \
+                -message "Loading archived version of [file tail $rootname]. Do you want to overwrite $rootname or save the archived version under a new name?" \
+                -icon question -type "{Use New Name} Overwrite"\
+                -default {Use New Name} \
+                -helplink "expguierr.html LoadArchived"
+        ]
+        set fmt [expload $expfile]
+        if {$fmt < 0} {
+            # read error
+            return
+        }
+        set expgui(changed) 1
+        set expfile $rootname
+        if {$ans == "use new name"} {
+            SaveAsFile
+            set expfile $expgui(expfile)
+        }
+    # is this an uncompressed archive file? 
+    } elseif {[string match {*.EXP.[0-9][0-9][0-9]} $expfile] && \
+            $tcl_platform(platform) == "unix"} {
+        regexp {.*.EXP} $expfile rootname
+        set ans [MyMessageBox -parent . -title "Load Archived File" \
+                -message "Loading archived version of [file tail $rootname]. Do you want to overwrite $rootname or save the archived version under a new name?" \
+                -icon question -type "{Use New Name} Overwrite"\
+                -default {Use New Name} \
+                -helplink "expguierr.html LoadArchived"
+        ]
+        set fmt [expload $expfile]
+        if {$fmt < 0} {
+            # read error
+            return
+        }
+        set expgui(changed) 1
+        set expfile $rootname
+        if {$ans == "use new name"} {
+            SaveAsFile
+            set expfile $expgui(expfile)
+        }
     } else {
-        set expgui(changed) 1
-    }
-
+        set exploadtime [time {set fmt [expload $expfile]}]
+        if $expgui(debug) {puts "expload $exploadtime"}
+        # if the file was not in the correct format, force a rewrite before use
+        if {$fmt < 0} {
+            # read error
+            return
+        } elseif {$fmt == 1} {
+            set expgui(changed) 0
+        } else {
+            set expgui(changed) 1
+        }
+    }
     # force exp files to be upper case, force save if name changes
     set filetail [file tail $expfile]
@@ -1328 +1373 @@
 
     # disable the add histogram button if no phases are present
-    if {[llength $expmap(phaselist)] == 0} {
-        $expgui(histFrame).newh configure -state disabled
-    } else {
-        $expgui(histFrame).newh configure -state normal
+    catch {
+        if {[llength $expmap(phaselist)] == 0} {
+            $expgui(histFrame).newh configure -state disabled
+        } else {
+            $expgui(histFrame).newh configure -state normal
+        }
     }