Changeset 725 for trunk

Timestamp:

Dec 4, 2009 5:10:58 PM (13 years ago)

Author:

toby

Message:

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

File:

• trunk/liveplot (modified) (7 diffs, 3 props)

trunk/liveplot

@@ -1279 +1279 @@
 #       # o is number of refinable terms
 #       set o [expr {2 + ($expgui(FitOrder) - 2)/2}]
-#       grid [label $top.lbl -text terms] -col $k -row 1
+#       grid [label $top.lbl -text terms] -column $k -row 1
 #       if {$expgui(FitOrder) >= 4} {
-#           grid [label $top.rlbl -text radii] -col $k -row 2
+#           grid [label $top.rlbl -text radii] -column $k -row 2
 #       }
 #       incr k
@@ -1292 +1292 @@
         if {$i >= [llength $termlist]} {lappend termlist 0.}
         set bkgeditbox($i) [lindex $termlist $i]
-        grid [frame $top.$i -relief groove -bd 3] -col $k -row 1
-        grid [label $top.$i.l -text "[expr 1+$i]"] -col 1 -row 1
+        grid [frame $top.$i -relief groove -bd 3] -column $k -row 1
+        grid [label $top.$i.l -text "[expr 1+$i]"] -column 1 -row 1
         grid [entry $top.$i.e -textvariable bkgeditbox($i) -width $width] \
-                -col 2 -row 1
+                -column 2 -row 1
 #       if {$expgui(FitFunction) == 3 && $i > 1} {
 #           set j [expr $i-2]
@@ -1304 +1304 @@
 #           }
 #           grid [frame $top.r$j -relief groove -bd 3] \
-#                   -col [expr $k-2] -row 2
-#           grid [label $top.r$j.l -text "[expr -1+$i]"] -col 1 -row 1
+#                   -column [expr $k-2] -row 2
+#           grid [label $top.r$j.l -text "[expr -1+$i]"] -column 1 -row 1
 #           grid [entry $top.r$j.e -textvariable bkgeditbox(r$j) -width $width] \
-#                   -col 2 -row 1       
+#                   -column 2 -row 1    
 #       }
         incr k
@@ -1387 +1387 @@
     .bkg.bc create window 0 0 -anchor nw -window $top
     if {[llength $bkglist] == 0} {
-        grid [label $top.0 -text "(no points defined)"] -col 1 -row 1
+        grid [label $top.0 -text "(no points defined)"] -column 1 -row 1
     } else {
         set i -1
         foreach p $bkglist {
             incr i
-            grid [frame $top.$i -relief groove -bd 3] -col $i -row 1
-            grid [label $top.$i.l -text "[expr 1+$i]"] -col 1 -rowspan 2 -row 1
+            grid [frame $top.$i -relief groove -bd 3] -column $i -row 1
+            grid [label $top.$i.l -text "[expr 1+$i]"] -column 1 -rowspan 2 -row 1
             grid [entry $top.$i.ex -textvariable bkgedit(x$i) -width 13] \
-                    -col 2 -row 1
+                    -column 2 -row 1
             grid [entry $top.$i.ey -textvariable bkgedit(y$i) -width 13] \
-                    -col 2 -row 2
+                    -column 2 -row 2
             foreach val $p var {x y} {
                 set bkgedit(${var}$i) $val
@@ -2132 +2132 @@
     catch {pack [frame .bkg -bd 3 -relief sunken] -side bottom -fill both}
 #    grid [label .bkg.top -text "Background Point Editing"] \
-#           -col 0 -row 0 -columnspan 4
+#           -column 0 -row 0 -columnspan 4
 #    grid [button .bkg.help -text Help -bg yellow \
 #           -command "MakeWWWHelp liveplot.html bkgedit"] \
@@ -2138 +2138 @@
     
     grid [frame .bkg.l -bd 3 -relief groove] \
-            -col 0 -row 1 -columnspan 2 -sticky nse
-    grid [label .bkg.l.1 -text "Mouse click\naction"] -col 0 -row 0
+            -column 0 -row 1 -columnspan 2 -sticky nse
+    grid [label .bkg.l.1 -text "Mouse click\naction"] -column 0 -row 0
     foreach c {1 2 3} l {zoom add delete} {
         grid [button .bkg.l.b$c -text $l -command "bkgEditMode $c"] \
-                -col $c -row 0
+                -column $c -row 0
     }
     # leave a small blank space
     grid columnconfigure .bkg 2 -pad 0 -min 10
     grid [frame .bkg.f -bd 3 -relief groove] \
-            -col 3 -row 1 -columnspan 2 -sticky nsw
+            -column 3 -row 1 -columnspan 2 -sticky nsw
     grid [button .bkg.f.fit1 -text "Fit" -command {bkgFit .bkg.f.fit1}] \
-            -col 1 -row 1
-    grid [label .bkg.f.tl -text "with"] -col 3 -row 1
+            -column 1 -row 1
+    grid [label .bkg.f.tl -text "with"] -column 3 -row 1
     set termmenu [tk_optionMenu .bkg.f.terms expgui(FitOrder) 0]
-    grid .bkg.f.terms -col 4 -row 1
-    grid [label .bkg.f.tl1 -text "terms"] -col 5 -row 1
+    grid .bkg.f.terms -column 4 -row 1
+    grid [label .bkg.f.tl1 -text "terms"] -column 5 -row 1
 
     grid [frame .bkg.c1 -bd 3 -relief groove] \
-            -col 0 -row 5 -rowspan 2 -sticky nsew
-    grid [label .bkg.c1.0 -text "Background\nfunction #"] -col 0 -row 0
+            -column 0 -row 5 -rowspan 2 -sticky nsew
+    grid [label .bkg.c1.0 -text "Background\nfunction #"] -column 0 -row 0
     set bkgmenu [tk_optionMenu .bkg.c1.1 expgui(FitFunction) stuff]
-    grid .bkg.c1.1 -col 0 -row 1
+    grid .bkg.c1.1 -column 0 -row 1
     $bkgmenu delete 0 end
     foreach item {
@@ -2184 +2184 @@
     grid [button .bkg.cw -text "Save in\nEXP file\n& Exit" \
             -command "bkgSave;exit"] \
-            -col 4 -columnspan 2 -row 5 -rowspan 2 -sticky ns
+            -column 4 -columnspan 2 -row 5 -rowspan 2 -sticky ns
 
     grid [frame .bkg.bl -bd 3 -relief groove] \
-            -col 0 -row 3 -rowspan 2 -sticky nsew
-    grid [label .bkg.bl.1 -text "Background\npoints"] -col 0 -row 0
+            -column 0 -row 3 -rowspan 2 -sticky nsew
+    grid [label .bkg.bl.1 -text "Background\npoints"] -column 0 -row 0
     grid [canvas .bkg.bc \
             -scrollregion {0 0 5000 500} -width 0 -height 0 \