Changeset 874 for trunk/addcmds.tcl

Timestamp:

Dec 4, 2009 5:13:31 PM (11 years ago)

Author:

toby

Message:

# on 2006/03/29 03:47:44, toby did:
Allow use of d-min or Q-max when adding multiple histograms (IPNS request)

File:

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

trunk/addcmds.tcl

@@ -242 +242 @@
 }
 trace variable newhist(setnum) w LabelInstParm
+trace variable newhist(LimitMode) w ClearHistLimit
+set newhist(LimitMode_boxes) {}
+
+proc ClearHistLimit {args} {
+    global newhist
+    if {$newhist(LimitMode) == 1} {return}
+    foreach box $newhist(LimitMode_boxes) {
+        catch {$box delete 0 end}
+    }
+}
+
 proc MakeAddHistBox {} {
     global expmap newhist
@@ -289 +300 @@
     grid [entry $np.e3 -width 12 -textvariable newhist(2tLimit) \
             ] -column 1 -row 18 -rowspan 3
-    grid [radiobutton $np.cb3 -text "D-min" -variable newhist(LimitMode) \
+    grid [radiobutton $np.cb3 -text "d-min" -variable newhist(LimitMode) \
             -value 0] -column 2 -row 18 -sticky w
     grid [radiobutton $np.cb4 -textvariable newhist(limitLbl)  \
             -variable newhist(LimitMode) -anchor w -justify l \
             -value 1] -column 2 -row 20 -sticky w
+    set newhist(LimitMode_boxes) $np.e3
     grid [radiobutton $np.cb5 -text "Q-max" -variable newhist(LimitMode) \
             -value 2] -column 2 -row 19 -sticky w
@@ -499 +511 @@
     set row 0
     set col -1
+    set flag 0
     foreach i $newhist(banklist) {
         if {$col > 8} {
@@ -512 +525 @@
             SetTmax
         } else {
-            set newhist(2tLimit) {}
-            set newhist(LimitMode) {}
-        }
+            set flag 1
+        }
+    }
+    if {$flag} {
+        set newhist(2tLimit) {}
+        set newhist(LimitMode) {}
     }
     SetMultipleAdd $np
@@ -1097 +1113 @@
             -scrollregion {0 0 5000 500} -width 0 -height 250 \
             -yscrollcommand "$top.scroll set"] \
-            -column 0 -columnspan 2 -row 1 -sticky nsew
+            -column 0 -columnspan 2 -row 2 -sticky ns
     grid columnconfigure $top 0 -weight 1
-    grid rowconfigure $top 1 -weight 1
+    grid rowconfigure $top 2 -weight 1
     scrollbar $top.scroll \
             -command "$top.canvas yview"
@@ -1106 +1122 @@
     grid [label $top.top -text "Select banks to add" -bg beige] \
             -column 0 -columnspan 3 -row 0 -sticky ew
-    grid [button $top.add -text Add -command "destroy $np"] -column 0 -row 2
+    grid [frame $top.vartyp -bd 2 -relief groove] \
+            -column 0 -columnspan 3 -row 1 -sticky ew
+    grid [label $top.vartyp.top -text "Data limit units:"] -column 0 -row 0 -columnspan 3 -sticky w
+    grid [radiobutton $top.vartyp.cb3 -text "d-min" -variable newhist(LimitMode) \
+            -value 0] -column 0 -row 1 -sticky w
+    grid [radiobutton $top.vartyp.cb4 -textvariable newhist(datalimlbl)  \
+            -variable newhist(LimitMode) -anchor w -justify l \
+            -value 1] -column 1 -row 1 -sticky w
+    grid [radiobutton $top.vartyp.cb5 -text "Q-max" -variable newhist(LimitMode) \
+            -value 2] -column 2 -row 1 -sticky w
+    set newhist(LimitMode) 1
+    
+    grid [button $top.add -text Add -command "destroy $np"] -column 0 -row 3
     grid [button $top.cancel -text Cancel -command "destroy $top"] \
-            -column 1 -row 2 -columnspan 2
-
+            -column 1 -row 3 -columnspan 2
     set row 1
     grid [label $cfr.t1 -text "Bank\n#"] -column 0 -row 0
     switch $newhist(insttype) {
-        TOF {set txt "T-min\n(ms)"}
-        ED  {set txt "E-max\n(KeV)"}
-        default {set txt "2theta\nmax"}
-    }
-    grid [label $cfr.t2 -text $txt] -column 1 -row 0
+        TOF {set newhist(datalimlbl) "T-min\n(ms)"}
+        ED  {set newhist(datalimlbl) "E-max\n(KeV)"}
+        default {set newhist(datalimlbl) "2theta\nmax"}
+    }
+    grid [label $cfr.t2 -textvariable newhist(datalimlbl)] -column 1 -row 0
     foreach i $newhist(banklist) {
         grid [checkbutton $cfr.c$i -text $i \
@@ -1123 +1150 @@
                 -column 0 -row [incr row] -sticky w
         set newhist(usebank$i) 1
-        grid [entry $cfr.e$i -width 8] -column 1 -row $row -sticky w
+        grid [entry $cfr.e$i -width 8 -textvariable newhist(tlimit$i)] \
+            -column 1 -row $row -sticky w
+        lappend newhist(LimitMode_boxes) $cfr.e$i
         if {$newhist(insttype) == "TOF"} {
-            $cfr.e$i config -textvariable newhist(tmin$i)
+            set newhist(tlimit$i) $newhist(tmin$i)
         } else {
-            $cfr.e$i config -textvariable newhist(tmax$i)
+            set newhist(tlimit$i) $newhist(tmax$i)
         }
     }
@@ -1136 +1165 @@
     # use the scroll for BIG lists
     if {[lindex $sizes 3] > [winfo height $top.canvas]} {
-        grid $top.scroll -sticky ns -column 3 -row 1
+        grid $top.scroll -sticky ns -column 3 -row 2
     } else {
         grid forget $top.scroll 
@@ -1157 +1186 @@
     foreach i $newhist(banklist) {
         if {$newhist(usebank$i)} {
-            if {[catch {expr $newhist(tmin$i)}]} {
+            if {[catch {expr $newhist(tlimit$i)}]} {
                 append err "  The Max/Min limit is not valid for bank $i\n"
-            } elseif {$newhist(tmin$i) <= 0} {
+            } elseif {$newhist(tlimit$i) <= 0} {
                 append err "  The Max/Min limit is not valid for bank $i\n"
             }
@@ -1206 +1235 @@
             puts $fp $i
             puts $fp $k
-            puts $fp "T"
-            puts $fp "$newhist(tmin$i)"
+            if {$newhist(LimitMode) == 1} {
+                puts $fp "T"
+                puts $fp "$newhist(tlimit$i)"
+            } elseif {$newhist(LimitMode) == 2} {
+                puts $fp "D"
+                set Q 100
+                catch {set Q [expr {4*acos(0)/$newhist(tlimit$i)}]}
+                puts $fp "$Q"
+            } else {
+                puts $fp "D"
+                puts $fp "$newhist(tlimit$i)"
+            }
             puts $fp "/"
             puts $fp "X"