Changeset 182

Timestamp:

Dec 4, 2009 5:01:46 PM (14 years ago)

Author:

toby

Message:

# on 2000/06/01 02:55:03, toby did:
add concurrent arg to runGSASwEXP (for RUNPLOT in histogram addition)
(NB this is incorrect, change should be to runGSASprog)
add coments, fix creation with lowercase .EXP filenames
fix expansion of disagl box

File:

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

trunk/gsascmds.tcl

@@ -163 +163 @@
 
 # run a GSAS program that requires an experiment file for input/output
-proc runGSASwEXP {proglist} {
+proc runGSASwEXP {proglist "concurrent 0"} {
     global expgui tcl_platform
     # Save the current exp file
@@ -183 +183 @@
         }
     }
-    forknewterm "$prog -- $expnam" $cmd 0 1 1
+    forknewterm "$prog -- $expnam" $cmd $concurrent 1 1
     # load the changed .EXP file automatically?
     if {$expgui(autoexpload)} {
@@ -189 +189 @@
         loadexp $expgui(expfile)
     }
-#    wm deiconify .
 }
 
@@ -979 +978 @@
         return
     }
-    #set expgui(FileMenuEXPNAM) [string toupper $expgui(FileMenuEXPNAM)]
+    # append a .EXP if not present
     if {[file extension $expgui(FileMenuEXPNAM)] == ""} {
         append expgui(FileMenuEXPNAM) ".EXP"
     }
+    # flag files that end in something other than .EXP .exp or .Exp...
     if {[string toupper [file extension $expgui(FileMenuEXPNAM)]] != ".EXP"} {
         tk_dialog .expFileErrorMsg "File Open Error" \
@@ -989 +989 @@
         return
     }
+    # check on the file status
     set file [file join $expgui(FileMenuDir) $expgui(FileMenuEXPNAM)]
     if {$mode == "new" && [file exists $file]} {
@@ -996 +997 @@
         if $ans {destroy .file}
         return
+    }
+    # if file does not exist in case provided, set the name to all
+    # upper case letters, since that is the best choice.
+    # if it does exist, read from it as is. For UNIX we will force uppercase later.
+    if {![file exists $file]} {
+        set expgui(FileMenuEXPNAM) [string toupper $expgui(FileMenuEXPNAM)]
+        set file [file join $expgui(FileMenuDir) $expgui(FileMenuEXPNAM)]
     }
     if {$mode == "old" && ![file exists $file]} {
@@ -1656 +1664 @@
         }
         
-        grid columnconfigure .disagl 1 -weight 1
+        grid columnconfigure .disagl 0 -weight 1
         grid rowconfigure .disagl 1 -weight 1
         wm title .disagl "DISAGL results $expgui(expfile)"