Changeset 359 for trunk/expgui

Timestamp:

Dec 4, 2009 5:04:51 PM (14 years ago)

Author:

toby

Message:

# on 2000/12/22 19:44:07, toby did:
add autoiconify option
require winexec for Win-9x only (not -NT)
Check for use of network directories
Defer whenidle loop (.EXP modification checking) if expgui.lck exists
Remove various unneeded window restacking commands
Allow Autoload in Windows
Allow "Show EXPTOOL output" for all platforms

File:

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

trunk/expgui

@@ -68 +68 @@
 # default for autoexec load = off
 set expgui(autoexpload) 0
+# by default expgui is iconified while GENLES, etc runs
+set expgui(autoiconify) 1
 # default for show EXPTOOL output = off
 set expgui(showexptool) 0
@@ -145 +147 @@
 #---------------------------------------------------------------------------
 # platform-specific code
-if {$tcl_platform(platform) == "windows"} {
-    set expgui(exptool) [file join $expgui(gsasexe) exptool.exe]
+if {$tcl_platform(platform) == "windows" \
+        && $tcl_platform(os) == "Windows 95"} {
     if [catch {package require winexec}] {
         MyMessageBox -parent . -title "WINEXEC Error" \
@@ -154 +156 @@
         destroy .
     }
+}
+if {$tcl_platform(platform) == "windows"} {
+    # check the path -- can DOS use it?
+    if {[string first {\\} $expgui(script) ] != -1} {
+        MyMessageBox -parent . -title "Invalid Path" \
+                -message {Error -- You cannot run EXPGUI/GSAS from a network drive unless it is mapped to a "drive" (like F:). Use "Map network drive" to access this directory} \
+                -icon error -type {"Limp Ahead"} -default "limp ahead" \
+                -helplink "expgui_Win_readme.html NetPath"
+    }
+    #
+    set expgui(exptool) [file join $expgui(gsasexe) exptool.exe]
     if ![file exists [file join $expgui(gsasdir) fonts grfont.dat]] {
         MyMessageBox -parent . -title "PGPLOT Error" \
@@ -432 +445 @@
     if {$tcl_platform(platform) != "windows"} {
         puts $fp "set env(GSASBACKSPACE) $env(GSASBACKSPACE)"
-        puts $fp "set expgui(autoexpload) $expgui(autoexpload)"
-    }
-    puts $fp "set expgui(showexptool) $expgui(showexptool)"
+    }
+    puts $fp "set expgui(archive) $expgui(archive)"
+    puts $fp "set expgui(autoexpload) $expgui(autoexpload)"
+    puts $fp "set expgui(autoiconify) $expgui(autoiconify)"
     close $fp
 }
@@ -463 +477 @@
 # This is called every 2 seconds to check for changes to the .EXP file
 proc whenidle {} {
-    global expgui
+    global expgui tcl_platform
     if $expgui(titleunchanged) {
         if {$expgui(changed) != 0} {
@@ -475 +489 @@
     }
     if {[file mtime $expgui(expfile)] != $expgui(expModifiedLast)} {
+        # we are "locked". Note that whenidle loop will be restarted later
+        if {$tcl_platform(platform) == "windows" && [file exists expgui.lck]} {
+            return
+        }
         set ans [ReloadExpMsg [file tail $expgui(expfile)] $expgui(changed)]
+
         if {$ans == 0} {
             loadexp $expgui(expfile)
@@ -563 +582 @@
     grab $w
     focus $w.bot.1
-    # for windows rearrange window stacking
-    if {$tcl_platform(platform) == "windows"} {
-        lower .
-        raise $w .
-    }
+    # for windows rearrange window stacking 
+    # -- Removed since this will normally happen after the GSAS program 
+    # has finished
+    #if {$tcl_platform(platform) == "windows"} {
+        #lower .
+        #raise $w .
+    #}
     update idletasks
 
@@ -581 +602 @@
     }
     # for windows rearrange window stacking
-    if {$tcl_platform(platform) == "windows"} {
-        raise .
-    }
+    #if {$tcl_platform(platform) == "windows"} {
+        #raise .
+    #}
     return $expgui(dialogbutton)
 }
@@ -3263 +3284 @@
     $expgui(fm).option.menu add checkbutton  -label "Use DISAGL window" \
             -variable expgui(disaglSeparateBox)
+    $expgui(fm).option.menu  add checkbutton -label "Autoload EXP" \
+            -variable expgui(autoexpload)
+    $expgui(fm).option.menu  add checkbutton -label "Iconify during GSAS" \
+            -variable expgui(autoiconify)
 }
 $expgui(fm).option.menu add cascade -menu  $expgui(fm).option.menu.asort \
@@ -3325 +3350 @@
     $expgui(fm).option.menu  add checkbutton -label "Override backspace" \
             -variable env(GSASBACKSPACE)
-    if {$expgui(shell)} {
-        $expgui(fm).option.menu  add checkbutton -label "Autoload EXP" \
-                -variable expgui(autoexpload)
-    }
-    $expgui(fm).option.menu  add checkbutton -label "Show EXPTOOL output" \
-                -variable expgui(showexptool)
-}
-
+}
+
+$expgui(fm).option.menu  add checkbutton -label "Show EXPTOOL output" \
+        -variable expgui(showexptool)
 $expgui(fm).option.menu add command -label "Save Options" \
         -command "SaveOptions"