Changeset 997 for trunk/expgui

Timestamp:

Sep 7, 2010 12:58:41 PM (10 years ago)

Author:

toby

Message:

fix awful bug introduced with prev. code rearangement that should not have been checked in; add ability to read archived files from command line; Add routines to read and write soft constrain records

File:

• trunk/expgui (modified) (2 diffs)

trunk/expgui

@@ -53 +53 @@
 if {$argv != ""} {
     if {[string match *noshell* [string tolower $argv]]} {
-        #puts noshell
+        # I doubt that noshell mode is used by anyone
         set expgui(shell) 0
-        SetEXPfile [lindex $argv 1]
+        set expgui(expfile)  [lindex $argv 1]
     } else {
-        SetEXPfile [lindex $argv 0]
-    }
-    if {[string match -nocase {.o[0-9a-f][0-9a-f]} \
-             [file extension $expgui(expfile)]]} {
-        # this is an archived file -- need to handle this later
-        tk_dialog .expFileErrorMsg "No archived files yet" \
-            "At present you must use open (expnam) to open archived files" warning 0 "Continue"
-        set expgui(expfile) {}
-    } 
+        set expgui(expfile)  [lindex $argv 0]
+    }
 }
 
@@ -299 +292 @@
 }
 #---------------------------------------------------------------------------
+if {$expgui(expfile) != ""} {
+    if {[string match -nocase {.o[0-9a-f][0-9a-f]} \
+             [file extension $expgui(expfile)]]} {
+        if {[file exists $expgui(expfile)]} {
+            # this is an archived file -- archive the current .EXP file
+            set expnam [file rootname $expgui(expfile)]
+            # get the last archived version
+            set lastf [lindex [lsort [glob -nocomplain $expnam.{O\[0-9A-F\]\[0-9A-F\]}]] end]
+            if {$lastf == ""} {
+                set num 01
+            } else {
+                regexp {.*\.O([0-9A-F][0-9A-F])$} $lastf a num
+                scan $num %x num
+                if {$num >= 255} {
+                    set num FF
+                } else {
+                    set num [string toupper [format %.2x [incr num]]]
+                }
+            }
+            catch {
+                set newfile $expnam.O$num
+                file rename -force $expnam.EXP $newfile
+                set fp [open $expnam.LST a+]
+                puts $fp "\n----------------------------------------------"
+                puts $fp "     Regressing to archive file [file tail $expgui(expfile)]"
+                puts $fp "     but first archiving [file tail $expnam.EXP] as [file tail $newfile]"
+                puts $fp "----------------------------------------------\n"
+                close $fp
+            }
+            file copy -force $expgui(expfile) $expnam.EXP
+            set expgui(expfile) $expnam.EXP
+        } else {
+            MyMessageBox -parent . -title "File not found" \
+                -message "Warning -- Archive file $expgui(expfile) was not found." \
+                -icon warning -type OK -default ok
+            set expgui(expfile) {}
+        }
+    } else {
+        SetEXPfile $expgui(expfile)
+    }
+}
 if {$expgui(expfile) == ""} {
     # place the parent window because the getExpFileName window will be centered above it.