Changeset 730

Timestamp:

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

Author:

toby

Message:

# on 2003/08/11 19:28:27, toby did:
code cleanup -col -> -column

File:

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

trunk/instedit.tcl

@@ -17 +17 @@
         grid [radiobutton $topfr.fr.$i -text $i -value $i \
                 -command "instShowBank $box"\
-                -variable instparms(bank)] -row $row -col $col
+                -variable instparms(bank)] -row $row -column $col
         if {[incr col] > 10} {set col 0; incr row}
     }
@@ -159 +159 @@
     grid [label $bnkfr.l1 -text "Bank #$b" -relief raised -bd 2 \
             -anchor w -justify left] \
-            -col 0 -row 0 -columnspan 99 -sticky ew
-    grid [label $bnkfr.l2 -text "Title: "] -col 0 -row 1 -sticky e
+            -column 0 -row 0 -columnspan 99 -sticky ew
+    grid [label $bnkfr.l2 -text "Title: "] -column 0 -row 1 -sticky e
     grid [entry $bnkfr.e2 -textvariable instdat(head$b) -width 60] \
-            -col 1 -row 1 -sticky w -columnspan 99
+            -column 1 -row 1 -sticky w -columnspan 99
 
     grid [label $bnkfr.l3 -text "Instrument\nname: " -anchor e -justify r] \
-            -col 0 -row 2 -sticky e
+            -column 0 -row 2 -sticky e
     grid [entry $bnkfr.e3 -textvariable instdat(name$b) -width 30] \
-            -col 1 -row 2 -sticky w -columnspan 99
+            -column 1 -row 2 -sticky w -columnspan 99
 
     if {$instparms(banklabel) == "TOF"} return
@@ -174 +174 @@
     set col 0
     grid [label $bnkfr.l4a -text "Radiation\ntype:" -anchor e -justify r] \
-            -col $col -row 4 -sticky e -rowspan 2
+            -column $col -row 4 -sticky e -rowspan 2
     set menu [tk_optionMenu $bnkfr.rad instparms(irad) "     "]
     $bnkfr.rad config -width 6
     
-    grid $bnkfr.rad -col [incr col] -row 4 -sticky w -rowspan 2
+    grid $bnkfr.rad -column [incr col] -row 4 -sticky w -rowspan 2
     grid [radiobutton $bnkfr.c4a -text Monochromatic \
             -command "disableWaveBoxes $bnkfr $b" \
             -variable instparms(wavemode) -value 1] \
-            -col [incr col] -row 4 -sticky w
+            -column [incr col] -row 4 -sticky w
     grid [radiobutton $bnkfr.c4b -text Dual \
             -command "disableWaveBoxes $bnkfr $b" \
             -variable instparms(wavemode) -value 2] \
-            -col $col -row 5 -sticky w
+            -column $col -row 5 -sticky w
 
            
     grid [label $bnkfr.l4 -text "Wavelength: "] \
-            -col [incr col] -row 4 -sticky e -rowspan 2
+            -column [incr col] -row 4 -sticky e -rowspan 2
     grid [entry $bnkfr.e4d -textvariable instdat(difc$b) -width 10] \
-            -col [incr col] -row 5 -sticky ew 
-    grid [label $bnkfr.l4d -text Primary] -col $col -row 4 -sticky ew
+            -column [incr col] -row 5 -sticky ew 
+    grid [label $bnkfr.l4d -text Primary] -column $col -row 4 -sticky ew
     grid [entry $bnkfr.e4e -textvariable instdat(difa$b) -width 10] \
-            -col [incr col] -row 5 -sticky ew 
-    grid [label $bnkfr.l4e -text Secondary] -col $col -row 4 -sticky ew
+            -column [incr col] -row 5 -sticky ew 
+    grid [label $bnkfr.l4e -text Secondary] -column $col -row 4 -sticky ew
     grid [entry $bnkfr.e4f -textvariable instdat(kratio$b) -width 10] \
-            -col [incr col] -row 5 -sticky ew 
-    grid [label $bnkfr.l4f -text ratio] -col $col -row 4 -sticky ew
+            -column [incr col] -row 5 -sticky ew 
+    grid [label $bnkfr.l4f -text ratio] -column $col -row 4 -sticky ew
 
     set col 0
     grid [label $bnkfr.l6 -text "Zero\nCorrection:" \
             -anchor e -justify r] \
-            -col $col -row 6 -sticky e
+            -column $col -row 6 -sticky e
     grid [entry $bnkfr.e6 -textvariable instdat(zero$b) -width 10] \
-            -col [incr col] -row 6 -sticky ew
+            -column [incr col] -row 6 -sticky ew
 
     set col 0
     grid [label $bnkfr.l7 -text "Polarization\nCorrection:" \
             -anchor e -justify r] \
-            -col $col -row 7 -sticky e
+            -column $col -row 7 -sticky e
     grid [radiobutton $bnkfr.c7a -text "Diffracted Beam" \
             -variable instdat(ipola$b) -value 0] \
-            -col [incr col] -row 7 -sticky w
+            -column [incr col] -row 7 -sticky w
     grid [radiobutton $bnkfr.c7b -text "Incident Beam" \
             -variable instdat(ipola$b) -value 1] \
-            -col [incr col] -row 7 -sticky w
+            -column [incr col] -row 7 -sticky w
     grid [radiobutton $bnkfr.c7c -text "None" \
             -variable instdatr(ipola$b) -value 2] \
-            -col [incr col] -row 7 -sticky w
+            -column [incr col] -row 7 -sticky w
     grid [label $bnkfr.l7a -text "Polarization\nFraction:" \
             -anchor e -justify r] \
-            -col [incr col] -row 7 -sticky e
+            -column [incr col] -row 7 -sticky e
     grid [entry $bnkfr.e7 -textvariable instdat(pola$b) -width 10] \
-            -col [incr col] -row 7 -sticky ew
+            -column [incr col] -row 7 -sticky ew
 
     grid [frame [set prfrm $bnkfr.prof] -bd 2 -relief groove] \
-            -col 0 -columnspan 99 -row 8
-    grid [label $prfrm.l1 -text "Select profile: "] -col 0 -row 0
-    grid [frame $prfrm.fr] -col 1 -columnspan 99 -row 0 -sticky w
-    grid [frame $prfrm.fr1] -col 0 -columnspan 99 -row 2
+            -column 0 -columnspan 99 -row 8
+    grid [label $prfrm.l1 -text "Select profile: "] -column 0 -row 0
+    grid [frame $prfrm.fr] -column 1 -columnspan 99 -row 0 -sticky w
+    grid [frame $prfrm.fr1] -column 0 -columnspan 99 -row 2
     set instparms(profileframe) $prfrm.fr1
     for {set j 1} {$j <= $instparms(proftypes${b})} {incr j} {
         grid [radiobutton $prfrm.fr.$j -text $j -value $j \
                 -command "ShowInstProfile $b" \
-                -variable instparms(profilenum)] -row 1 -col $j
+                -variable instparms(profilenum)] -row 1 -column $j
     }
     grid [button $prfrm.fr.a -text "Add profile" \
-            -command "AddInstProfile $box $b"] -row 1 -col 98
+            -command "AddInstProfile $box $b"] -row 1 -column 98
     grid [button $prfrm.fr.n -text "Import profile" \
-            -command "ImportInstProfile $box $prfrm.fr1 $b"] -row 1 -col 99
+            -command "ImportInstProfile $box $prfrm.fr1 $b"] -row 1 -column 99
     $menu delete 0 end
     foreach lbl {Cr Fe Cu Mo Ag Other} \
@@ -314 +314 @@
     toplevel [set top $instparms(top).sel]
     wm title $top "Select histogram and phase to select"
-    grid [label $top.l1 -text "Histogram: "] -col 1 -row 1
+    grid [label $top.l1 -text "Histogram: "] -column 1 -row 1
     set menu [tk_optionMenu $top.w instparms(histimport) ""]
     $menu delete 0 end
@@ -345 +345 @@
         }
     }
-    grid $top.w -col 2 -row 1 -columnspan 2 -sticky w
+    grid $top.w -column 2 -row 1 -columnspan 2 -sticky w
     set instparms(histimport) [lindex $hlist 0]
-    grid [label $top.l2 -text "Phase: "] -col 1 -row 2
+    grid [label $top.l2 -text "Phase: "] -column 1 -row 2
     set col 1
     foreach h {1 2 3 4 5 6 7 8 9} {
         grid [radiobutton $top.r$h \
                 -variable instparms(phaseimport) -value $h -text $h \
-                ] -col [incr col] -row 2
-    }
-    grid [frame $top.prof] -col 0 -columnspan 99 -row 3
+                ] -column [incr col] -row 2
+    }
+    grid [frame $top.prof] -column 0 -columnspan 99 -row 3
     grid [button $top.b1 -text Import -command "" -state disabled] \
-            -col 0 -columnspan 2 -row 4
+            -column 0 -columnspan 2 -row 4
     grid [button $top.b2 -text Cancel -command "destroy $top"] \
-            -col 2 -columnspan 2 -row 4
+            -column 2 -columnspan 2 -row 4
 
     # there a single histogram, select it
@@ -403 +403 @@
     grid [label $frame.${col}_$row -justify left -anchor w \
             -text "Profile type $lbl"] \
-            -col $col -row $row -columnspan 99 -sticky w
+            -column $col -row $row -columnspan 99 -sticky w
     incr row
     set col 0
     grid [label $frame.${col}_$row -text "Peak cutoff"  -padx 4] \
-            -col $col -row $row -sticky e
+            -column $col -row $row -sticky e
     incr col
     grid [label $frame.${col}_$row -text "[lindex $proflist 2]" \
             -relief groove -bd 2 -padx 2] \
-            -col $col -row $row -sticky ew
+            -column $col -row $row -sticky ew
     incr col
     set N $num
@@ -423 +423 @@
         if {$col > 6} {set col 0; incr row}
         grid [label $frame.${col}_$row -text $lbl -padx 4] \
-                -col $col -row $row -sticky e
+                -column $col -row $row -sticky e
         incr col
         grid [label $frame.${col}_$row -text $val \
                 -bd 2 -padx 2 -relief groove] \
-                -col $col -row $row -sticky ew
+                -column $col -row $row -sticky ew
         incr col
     }
@@ -471 +471 @@
     set col 0
     grid [label $frame.${col}_$row -text "Profile\ntype"] \
-            -col $col -row $row
+            -column $col -row $row
     incr col
     set menu [tk_optionMenu $frame.${col}_$row instdat(proftype${b}_$j) " "]
-    grid $frame.${col}_$row -col $col -row $row -sticky ew
+    grid $frame.${col}_$row -column $col -row $row -sticky ew
     $menu delete 0 end
     foreach val { 1  2  3  4} \
@@ -487 +487 @@
     incr col
     grid [label $frame.${col}_$row -text "Peak\ncutoff"] \
-            -col $col -row $row
+            -column $col -row $row
     incr col
     if [catch {set instdat(profcut${b}_$j)}] {
@@ -494 +494 @@
     grid [entry $frame.${col}_$row -width 10 \
             -textvariable instdat(profcut${b}_$j)] \
-            -col $col -row $row
+            -column $col -row $row
     incr row
     set col 0
@@ -507 +507 @@
         if {$col > 6} {set col 0; incr row}
         grid [label $frame.${col}_$row -text $lbl] \
-                -col $col -row $row
+                -column $col -row $row
         incr col
         if [catch {set instdat(prof${b}_${j}_$i)}] {
@@ -514 +514 @@
         grid [entry $frame.${col}_$row -width 14 \
                 -textvariable instdat(prof${b}_${j}_$i)] \
-                -col $col -row $row
+                -column $col -row $row
         incr col
     }
@@ -649 +649 @@
     }
 
-    grid [frame $instparms(top).b1 -bd 2 -relief groove] -col 1 -row 1
-    grid [frame $instparms(top).b1.a] -col 0 -row 0 -sticky ew
-    grid [frame $instparms(top).b1.b] -col 0 -row 1 -sticky ew
+    grid [frame $instparms(top).b1 -bd 2 -relief groove] -column 1 -row 1
+    grid [frame $instparms(top).b1.a] -column 0 -row 0 -sticky ew
+    grid [frame $instparms(top).b1.b] -column 0 -row 1 -sticky ew
 
     instInit