Changeset 360

Timestamp:

Dec 4, 2009 5:04:52 PM (11 years ago)

Author:

toby

Message:

# on 2000/12/22 19:44:07, toby did:
Major reworking of routines to run GSAS routines:

non-EXP using programs run independently by default
Pause is now hard-coded
EXP using programs run in foreground by default (exception is POWPLOT)

Win-95 implementation of forknewterm rewritten to loop over commands

& use lock file (resume when lock file is deleted) & have "lock" window

Win-NT revised to not use WINEXEC & run in foreground
UNIX implementation of forknewterm revised to match previous

File:

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

trunk/gsascmds.tcl

@@ -1234 +1234 @@
 #------------------------------------------------------------------------------
 # run a GSAS program that does not require an experiment file
-proc runGSASprog {proglist} {
+proc runGSASprog {proglist "concurrent 1"} {
+    # if concurrent is 0, EXPGUI runs the GSAS program in background
+    # -- this is not currently needed anywhere where the .EXP file is not.
     global expgui tcl_platform
     set cmd {}
@@ -1245 +1247 @@
         }
     }
-    forknewterm $prog $cmd 0 1 1
+    forknewterm $prog $cmd [expr !$concurrent] 1
 }
 
 # run a GSAS program that requires an experiment file for input/output
 proc runGSASwEXP {proglist "concurrent 0"} {
+    # most programs that require the .EXP file change it and 
+    # cannot be run concurrently
     global expgui tcl_platform
     # Save the current exp file
@@ -1269 +1273 @@
         }
     }
-    forknewterm "$prog -- $expnam" $cmd $concurrent 1 1
+    forknewterm "$prog -- $expnam" $cmd [expr !$concurrent] 1
     # load the changed .EXP file automatically?
     if {$expgui(autoexpload)} {
@@ -2158 +2162 @@
 # platform-specific definitions
 if {$tcl_platform(platform) == "windows" && $tcl_platform(os) == "Windows 95"} {
+    # windows-95, -98 and presumably -me do not allow Tcl/Tk to run the
+    # DOS box synchronously, so we create a "lock" file that is deleted
+    # at the end of the DOS run so we can tell when the run is done.
+    # We create a window to force the deleting of the file so that if
+    # the DOS process crashes, the user can continue anyway.
+    #
+    # procedure to check if the lock file is still there (Win-9x/me only)
+    proc checklockfile {file window} {
+        if [file exists $file] {
+            after 500 checklockfile $file $window
+        } else {
+            catch {destroy $window}
+        }
+    }
     # this creates a DOS box to run a program in
-    proc forknewterm {title command "background 0" "scrollbar 1" "wait 1"} {
+    proc forknewterm {title command "wait 1" "scrollbar 1"} {
         global env expgui
         # Windows environment variables
-        # -95 does not seem to be able to use these
         set env(GSAS) [file nativename $expgui(gsasdir)]
         # PGPLOT_FONT is needed by PGPLOT
@@ -2170 +2187 @@
         set pwd [file nativename [pwd]]
         
+        # check the .EXP path -- can DOS use it?
+        if {[string first // [pwd]] != -1} {
+            MyMessageBox -parent . -title "Invalid Path" \
+                    -message {Error -- Use "Map network drive" to access this directory with a letter (e.g. F:) GSAS can't directly access a network drive} \
+                    -icon error -type ok -default ok \
+                    -helplink "expgui_Win_readme.html NetPath"
+            return
+        }
+        # pause is hard coded in the .BAT file
+        #
+        # loop over multiple commands
+        foreach cmd $command {
+            # simulate the wait with a lock file
+            if {$wait} {
+                if {$expgui(autoiconify)} {wm iconify .}
+                # create a blank lock file and a message window
+                close [open expgui.lck w]
+                toplevel .lock
+                grid [button .lock.0 -text Help -bg yellow \
+                        -command "MakeWWWHelp expguierr.html lock"] \
+                        -column 1 -row 0
+                grid [label .lock.1 \
+                        -text "Please wait while the GSAS program finishes."] \
+                        -column 0 -row 0
+                grid [label .lock.2 -text \
+                        "In case a problem occurs, close the DOS box"] \
+                        -column 0 -columnspan 2 -row 1
+                grid [label .lock.3 -text \
+                        "and press the \"Continue\" button (below)"] \
+                        -column 0 -columnspan 2 -row 2
+                grid [button .lock.b -text "Continue" \
+                        -command "destroy .lock; wm deiconify ."] \
+                        -column 0 -columnspan 2 -row 3
+                putontop .lock
+                update
+                checklockfile expgui.lck .lock
+            }
+            # replace the forward slashes with backward
+            regsub -all / $cmd \\ cmd
+            winexec -d [file nativename [pwd]] \
+                    [file join $expgui(scriptdir) gsastcl.bat] $cmd
+            if {$wait} {
+                tkwait window .lock
+                file delete -force expgui.lck
+            }
+        }
+        if {$expgui(autoiconify) && $wait} {wm deiconify .}
+        # check for changes in the .EXP file immediately
+        whenidle
+    }
+} elseif {$tcl_platform(platform) == "windows"} {
+    # now for Windows-NT, where we can run synchronously
+    #
+    # this creates a DOS box to run a program in
+    proc forknewterm {title command  "wait 1" "scrollbar 1"} {
+        global env expgui
+        # Windows environment variables
+        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]]
+        # this is the number of lines/page in the .LST (etc.) file
+        set env(LENPAGE) 60
+        set pwd [file nativename [pwd]]
         # check the path -- can DOS use it?
         if {[string first // [pwd]] != -1} {
@@ -2178 +2258 @@
             return
         }
-        # all winexec commands are background commands
-        #       if $background 
-        
         # pause is hard coded in the .BAT file
-            
-        # replace the forward slashes with backward
-        regsub -all / $command \\ command
-        # Win95 does not seem to inherit the environment from Tcl env vars
-        # so define it in the .BAT file
-        winexec -d [file nativename [pwd]] \
-                [file join $expgui(scriptdir) gsastcl.bat] \
-                "[file nativename $expgui(gsasdir)] $command"
-    }
-} elseif {$tcl_platform(platform) == "windows"} {
-    # now for - brain-dead Windows-NT
-    # this creates a DOS box to run a program in
-    proc forknewterm {title command "background 0" "scrollbar 1" "wait 1"} {
-        global env expgui
-        # Windows environment variables
-        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]]
-        # this is the number of lines/page in the .LST (etc.) file
-        set env(LENPAGE) 60
-        # all winexec commands are background commands -- ignore background arg
-        # can't get pause to work! -- ignore wait
-        
-        set prevcmd {}
-        foreach cmd $command {
-            if {$prevcmd != ""} {
-                tk_dialog .done_yet Confirm "Press OK to start command $cmd" "" 0 OK
-            }
-            # replace the forward slashes with backward
-            regsub -all / $cmd \\ cmd
-            # cmd.exe must be in the path -- lets hope that at least works!
-            winexec -d [file nativename [pwd]] cmd.exe "/c $cmd"
-            set prevcmd $cmd
+
+        if {$wait} {
+            if {$expgui(autoiconify)} {wm iconify .}
+            # create a blank lock file (keep liveplot from running)
+            close [open expgui.lck w]
+            # loop over commands
+            foreach cmd $command {
+                # replace the forward slashes with backward
+                regsub -all / $cmd \\ cmd
+                exec $env(COMSPEC) /c \
+                        "start [file join $expgui(scriptdir) gsastcl.bat] $cmd"
+            }
+            file delete -force expgui.lck
+            if {$expgui(autoiconify)} {wm deiconify .}
+            # check for changes in the .EXP file immediately
+            whenidle
+        } else {
+            # loop over commands
+            foreach cmd $command {
+                # replace the forward slashes with backward
+                regsub -all / $cmd \\ cmd
+                # run in background
+                exec $env(COMSPEC) /c \
+                        "start [file join $expgui(scriptdir) gsastcl.bat] $cmd" &
+            }
         }
     }
 } else {
     # this creates a xterm window to run a program in
-    proc forknewterm {title command "background 0" "scrollbar 1" "wait 1"} {
+    proc forknewterm {title command "wait 1" "scrollbar 1"} {
         global env expgui
         # UNIX environment variables
@@ -2239 +2308 @@
             append termopts " +sb"
         }
-        if $background {
+        if {$wait} {
+            set suffix {}
+        } else {
             set suffix {&}
-        } else {
-            set suffix {}
         }
         #
-        if $wait  {
+        #if $wait {
             append command "\; echo -n Press Enter to continue \; read x"
-        }
-        if !$background {wm iconify .}
+        #}
+        if {$wait && $expgui(autoiconify)} {wm iconify .}
         catch {eval exec xterm $termopts -title [list $title] \
                 -e /bin/sh -c [list $command] $suffix} errmsg
         if $expgui(debug) {puts "xterm result = $errmsg"}
-        if !$background {wm deiconify .}
-    }
-}
+        if {$wait && $expgui(autoiconify)} {wm deiconify .}
+    }
+}