Changeset 746 for trunk/expgui

Timestamp:

Dec 4, 2009 5:11:19 PM (14 years ago)

Author:

toby

Message:

# on 2003/11/13 17:16:28, toby did:
Updates for OSX: window resize & catch puts
clean up the way "use new name" works for archived .EXP files
remove obsolete references to tkButtonInvoke

File:

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

trunk/expgui

@@ -193 +193 @@
 } else {
     set expgui(exptool) [file join $expgui(gsasexe) exptool]
-    if [catch {set env(GSASBACKSPACE)}] {set env(GSASBACKSPACE) 1}
+    if {$tcl_platform(os) != "Darwin"} {
+        if [catch {set env(GSASBACKSPACE)}] {set env(GSASBACKSPACE) 1}
+    }
 }
 # do we have a PGPLOT fonts file?
@@ -249 +251 @@
     }
 }
+set expgui(resize) 0
 if {$expgui(expfile) == ""} {
     # center the parent window because the getExpFileName window
@@ -261 +264 @@
     update
     #
-    set expgui(expfile) [getExpFileName old]
+    set expgui(expfile) [getExpFileName ""]
+    set expgui(resize) 1
 }
 if {$expgui(expfile) == ""} exit
@@ -314 +318 @@
                 close $fp
             }
-        }
-        file copy -force $expfile $expnam.EXP
-        set fmt [expload $expfile]
-        # 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
-        }
-        set expfile $expnam.EXP
+            file copy -force $expfile $expnam.EXP
+            set expfile $expnam.EXP
+        }
         if {$ans == "use new name"} {
-            SaveAsFile
-            set expfile $expgui(expfile)
-        }
+            set newexpfile [getExpFileName new]
+            if {$newexpfile == ""} return 
+            file copy -force $expfile $newexpfile
+            catch {cd [string trim [file dirname $expgui(expfile)]]}
+            set expfile [file tail $newexpfile]
+        }
+    }
+    set expgui(expfile) $expfile
+    set fmt [expload $expfile]
+    # 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 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
-        }
+        set expgui(changed) 1
     }
     # force exp files to be upper case, force save if name changes
@@ -764 +760 @@
     }
     # Create a binding for <Return> on the dialog
-    bind $w <Return> "tkButtonInvoke $w.bot.1"
+    bind $w <Return> "$w.bot.1 invoke"
     wm withdraw $w
     update idletasks
@@ -4260 +4256 @@
 # resize the notebook to fit all the tabs and the largest page
 ResizeNotebook
+if {$expgui(resize)} {
+    # this appears to be needed by OSX
+    update
+    wm geom . [winfo reqwidth .]x[winfo reqheight .]
+    # center the EXPGUI window
+    wm withdraw .
+    set x [expr [winfo screenwidth .]/2 - [winfo reqwidth .]/2 ]
+    set y [expr [winfo screenheight .]/2 - [winfo reqheight .]/2]
+    wm geom . +$x+$y
+    wm deiconify .
+}
 
 RaisePage lsFrame