Changeset 354

Timestamp:

Dec 4, 2009 5:04:43 PM (16 years ago)

Author:

toby

Message:

# on 2000/11/27 21:05:56, toby did:
line up >10 banks in Hist add
set 2theta max from Bank header

File:

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

trunk/addcmds.tcl ¶

@@ -366 +366 @@
     }
     set newhist(banklist) {}
-    foreach child [pack slaves $np.bank] {destroy $child}
+    foreach child [winfo children $np.bank] {destroy $child}
     # is this a properly formatted file?
     if {$tcl_platform(platform) == "windows"} {
@@ -394 +394 @@
                 scan $line "BANK%d" num
                 lappend newhist(banklist) $num
+                # compute last point
+                set tmax 0
+                catch {
+                    scan $line "BANK%d%d%d%s%f%f" num nchan nrec rest start step
+                    set tmax [expr ($start + $step*($nchan-1))/100.]
+                }
+                set newhist(tmax$num) $tmax
             }
             # check for "Instrument parameter file" line
@@ -433 +440 @@
             # scan for BANK lines
             if {[string first BANK $line] == 0} {
-                scan $line "BANK%d" num
+                scan $line "BANK%d" num 
                 lappend newhist(banklist) $num
+                # compute last point
+                set tmax 0
+                catch {
+                    scan $line "BANK%d%d%d%s%f%f" num nchan nrec rest start step
+                    set tmax [expr ($start + $step*($nchan-1))/100.]
+                }
+                set newhist(tmax$num) $tmax
             }
             # check for "Instrument parameter file" line
@@ -457 +471 @@
         set newhist(rawfile) $inp
     }
+    set row 0
+    set col -1
     foreach i $newhist(banklist) {
-        pack [radiobutton $np.bank.$i -text $i \
-                -variable newhist(banknum) -value $i] -side left
+        if {$col > 8} {
+            set col -1
+            incr row
+        }
+        grid [radiobutton $np.bank.$i -text $i -command SetTmax \
+                -variable newhist(banknum) -value $i] \
+                -column [incr col] -row $row -sticky w
         # only 1 choice, so set it
-        if {[llength $newhist(banklist)] == 1} {set newhist(banknum) $i}
-    }
+        if {[llength $newhist(banklist)] == 1} {
+            set newhist(banknum) $i
+            SetTmax
+        } else {
+            set newhist(2tLimit) {}
+            set newhist(LimitMode) {}
+        }
+    }
+}
+
+proc SetTmax {} {
+    global newhist
+    set num $newhist(banknum)
+    set newhist(2tLimit) $newhist(tmax$num)
+    set newhist(LimitMode) 1
 }
 
@@ -495 +529 @@
     }
     set newhist(instbanks) {}
-    foreach child [pack slaves $np.set] {destroy $child}
+    foreach child [winfo children $np.set] {destroy $child}
     # is this a properly formatted file?
     if {$tcl_platform(platform) == "windows"} {
@@ -568 +602 @@
         set newhist(instfile) $inp
     }
+    set col -1
+    set row 0
     for {set i 1} {$i <= $newhist(instbanks)} {incr i} {
-        pack [radiobutton $np.set.$i -text $i \
-                -variable newhist(setnum) -value $i] -side left
+        if {$col > 8} {
+            set col -1
+            incr row
+        }
+        grid [radiobutton $np.set.$i -text $i \
+                -variable newhist(setnum) -value $i] \
+                -column [incr col] -row $row -sticky w
+
         if {$newhist(instbanks) == 1} {set newhist(setnum) $i}
     }