Changeset 479

Timestamp:

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

Author:

toby

Message:

# on 2001/10/31 20:07:41, toby did:
change excledt to run "in-line"

File:

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

trunk/gsascmds.tcl

@@ -1073 +1073 @@
 
 # run excledt
-proc excledit {"hst {}"} {
+proc excledit {} {
     global expgui liveplot wishshell expmap
     set expnam [file root [file tail $expgui(expfile)]]
-    if {$hst == ""} {
-        # which histograms are ready for use?
-        set validlist {}
-        foreach ihist $expmap(powderlist) {
-            if {[string trim [string range $expmap(htype_$ihist) 3 3]] == "" || \
-                    [string range $expmap(htype_$ihist) 3 3] == "*"} {
-# someday support DUMMY
-#                   [string range $expmap(htype_$ihist) 3 3] == "D" 
-                lappend validlist $ihist
-            }
-        }
-        if {[llength $validlist] == 0} {
-            MyMessageBox -parent . -title "No Valid Histograms" \
-                    -message "No histograms are ready to plot. Run POWPREF and try again" \
-                    -icon warning -helplink "expguierr.html NoValidHist"
-            return
-        }
-        # use $liveplot(hst) if valid, the 1st entry otherwise
-        if {[lsearch $validlist $liveplot(hst)] != -1} {
-            set hst $liveplot(hst)
-        } else {
-            set hst [lindex $validlist 0]
-        }
+    # which histograms are ready for use?
+    set validlist {}
+    foreach ihist $expmap(powderlist) {
+        if {[string trim [string range $expmap(htype_$ihist) 3 3]] == "" || \
+                [string range $expmap(htype_$ihist) 3 3] == "*" || \
+                [string range $expmap(htype_$ihist) 3 3] == "D"} {
+            lappend validlist $ihist
+        }
+    }
+    if {[llength $validlist] == 0} {
+        MyMessageBox -parent . -title "No Valid Histograms" \
+                -message "No histograms are ready to plot. Run POWPREF and try again" \
+                -icon warning -helplink "expguierr.html NoValidHist"
+        return
     }
     if {$expgui(autoiconify)} {wm iconify .}
-    exec $wishshell [file join $expgui(scriptdir) excledt] \
-            $expnam $hst $liveplot(legend)
+    StartExcl 
     if {$expgui(autoiconify)} {wm deiconify .}
-    # check for changes in the .EXP file immediately
-    whenidle
 }
 
@@ -1334 +1322 @@
     set expnam [file rootname $expgui(expfile)]
     # get the last archived version
-    set lastf [lindex [lsort [glob $expnam.{O\[0-9A-F\]\[0-9A-F\]}]] end]
+    set lastf [lindex [lsort [glob -nocomplain $expnam.{O\[0-9A-F\]\[0-9A-F\]}]] end]
     if {$lastf == ""} {
         set num 01
@@ -2456 +2444 @@
                 -e /bin/sh -c [list $command] $suffix} errmsg
         if $expgui(debug) {puts "xterm result = $errmsg"}
-        if {$wait && $expgui(autoiconify)} {wm deiconify .}
-    }
-}
+        if {$wait} {
+            if {$expgui(autoiconify)} {wm deiconify .}
+            # check for changes in the .EXP file immediately
+            whenidle
+        }
+    }
+}