Changeset 485

Timestamp:

Dec 4, 2009 5:06:57 PM (13 years ago)

Author:

toby

Message:

# on 2001/11/07 18:22:57, toby did:
remove echo in archive
add get file name for DISAGL/save
support histogram flags for all types of histograms

File:

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

trunk/gsascmds.tcl

@@ -1337 +1337 @@
         set file $expnam.O$num
         file rename -force $expgui(expfile) $file
-        exec echo "\n----------------------------------------------" >> $expnam.LST
-        exec echo "     Archiving [file tail $expnam.EXP] as [file tail $file]" >> $expnam.LST
-        exec echo "----------------------------------------------\n" >> $expnam.LST
+        set fp [open $expnam.LST a+]
+        puts $fp "\n----------------------------------------------"
+        puts $fp "     Archiving [file tail $expnam.EXP] as [file tail $file]"
+        puts $fp "----------------------------------------------\n"
+        close $fp
     } errmsg
     if {$errmsg != ""} {
@@ -1429 +1431 @@
 }
 
+
+# rename file current to suggested, 
+#   delete window if supplied
+#   use parent, if supplied or .
+proc RenameAsFile {current suggested "window {}" "parent {}"} {
+    if {$parent == "" && $window != ""} {set parent $window}
+    if {$parent == ""} {set parent .}
+    set newfile [tk_getSaveFile -initialfile $suggested -parent $parent]
+    if {$newfile == ""} return
+    file rename -force $current $newfile
+    if {$window != ""} {destroy $window}
+}
 
 # optionally run disagl as a windowless process, w/results in a separate window
@@ -1481 +1495 @@
                 -command "destroy .disagl; file delete $root.tmp"] \
                 -column 3 -row 0 -sticky e
-        grid [button .disagl.f.rename -text "Close & Save as .DIS" \
-                -command "destroy .disagl; file rename -force $root.tmp $root.DIS"] \
+        grid [button .disagl.f.rename \
+                -command "RenameAsFile $root.tmp $root.DIS .disagl" \
+                -text "Close & Save as..."] \
                 -column 4 -row 0 -sticky e
         # allow font changes on the fly
@@ -2057 +2072 @@
     global expmap expgui
     for {set i 1} {$i <= $expmap(nhst)} {incr i} {
-        if {[string range $expmap(htype_$i) 0 0] == "P"} {
+#       if {[string range $expmap(htype_$i) 0 0] == "P"} {
             set expgui(useflag_$i) [histinfo $i use]
-        }
+#       }
     }
 }
@@ -2091 +2106 @@
         }
         incr row
-        if {[string range $expmap(htype_$i) 0 0] == "P"} {
+#       if {[string range $expmap(htype_$i) 0 0] == "P"} {
             grid [checkbutton $sbox.$i -text $i -variable expgui(useflag_$i)] -row $row -col 0 
             set expgui(useflag_$i) [histinfo $i use]
-        }
+#       }
         grid [label $bbox.0$i \
-                -text [string range $expmap(htype_$i) 1 3] \
+                -text [string range $expmap(htype_$i) 0 3] \
                 ] -row $row -col 0 -padx $px
         grid [label $bbox.1$i -text [histinfo $i bank] \
@@ -2115 +2130 @@
     set prevchages $expgui(changed)
     for {set i 1} {$i <= $expmap(nhst)} {incr i} {
-        if {[string range $expmap(htype_$i) 0 0] == "P"} {
+#       if {[string range $expmap(htype_$i) 0 0] == "P"} {
             if {$expgui(useflag_$i) != [histinfo $i use]} {
                 histinfo $i use set $expgui(useflag_$i)
                 incr expgui(changed)
             }
-        }
+#       }
     }
     if {$prevchages != $expgui(changed)} {