Changeset 725 for trunk/liveplot


Ignore:
Timestamp:
Dec 4, 2009 5:10:58 PM (11 years ago)
Author:
toby
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/liveplot

    • Property rcs:date changed from 2003/08/11 18:13:56 to 2003/08/11 19:22:46
    • Property rcs:lines changed from +49 -49 to +28 -28
    • Property rcs:rev changed from 1.34 to 1.35
    r719 r725  
    12791279#       # o is number of refinable terms
    12801280#       set o [expr {2 + ($expgui(FitOrder) - 2)/2}]
    1281 #       grid [label $top.lbl -text terms] -col $k -row 1
     1281#       grid [label $top.lbl -text terms] -column $k -row 1
    12821282#       if {$expgui(FitOrder) >= 4} {
    1283 #           grid [label $top.rlbl -text radii] -col $k -row 2
     1283#           grid [label $top.rlbl -text radii] -column $k -row 2
    12841284#       }
    12851285#       incr k
     
    12921292        if {$i >= [llength $termlist]} {lappend termlist 0.}
    12931293        set bkgeditbox($i) [lindex $termlist $i]
    1294         grid [frame $top.$i -relief groove -bd 3] -col $k -row 1
    1295         grid [label $top.$i.l -text "[expr 1+$i]"] -col 1 -row 1
     1294        grid [frame $top.$i -relief groove -bd 3] -column $k -row 1
     1295        grid [label $top.$i.l -text "[expr 1+$i]"] -column 1 -row 1
    12961296        grid [entry $top.$i.e -textvariable bkgeditbox($i) -width $width] \
    1297                 -col 2 -row 1
     1297                -column 2 -row 1
    12981298#       if {$expgui(FitFunction) == 3 && $i > 1} {
    12991299#           set j [expr $i-2]
     
    13041304#           }
    13051305#           grid [frame $top.r$j -relief groove -bd 3] \
    1306 #                   -col [expr $k-2] -row 2
    1307 #           grid [label $top.r$j.l -text "[expr -1+$i]"] -col 1 -row 1
     1306#                   -column [expr $k-2] -row 2
     1307#           grid [label $top.r$j.l -text "[expr -1+$i]"] -column 1 -row 1
    13081308#           grid [entry $top.r$j.e -textvariable bkgeditbox(r$j) -width $width] \
    1309 #                   -col 2 -row 1       
     1309#                   -column 2 -row 1   
    13101310#       }
    13111311        incr k
     
    13871387    .bkg.bc create window 0 0 -anchor nw -window $top
    13881388    if {[llength $bkglist] == 0} {
    1389         grid [label $top.0 -text "(no points defined)"] -col 1 -row 1
     1389        grid [label $top.0 -text "(no points defined)"] -column 1 -row 1
    13901390    } else {
    13911391        set i -1
    13921392        foreach p $bkglist {
    13931393            incr i
    1394             grid [frame $top.$i -relief groove -bd 3] -col $i -row 1
    1395             grid [label $top.$i.l -text "[expr 1+$i]"] -col 1 -rowspan 2 -row 1
     1394            grid [frame $top.$i -relief groove -bd 3] -column $i -row 1
     1395            grid [label $top.$i.l -text "[expr 1+$i]"] -column 1 -rowspan 2 -row 1
    13961396            grid [entry $top.$i.ex -textvariable bkgedit(x$i) -width 13] \
    1397                     -col 2 -row 1
     1397                    -column 2 -row 1
    13981398            grid [entry $top.$i.ey -textvariable bkgedit(y$i) -width 13] \
    1399                     -col 2 -row 2
     1399                    -column 2 -row 2
    14001400            foreach val $p var {x y} {
    14011401                set bkgedit(${var}$i) $val
     
    21322132    catch {pack [frame .bkg -bd 3 -relief sunken] -side bottom -fill both}
    21332133#    grid [label .bkg.top -text "Background Point Editing"] \
    2134 #           -col 0 -row 0 -columnspan 4
     2134#           -column 0 -row 0 -columnspan 4
    21352135#    grid [button .bkg.help -text Help -bg yellow \
    21362136#           -command "MakeWWWHelp liveplot.html bkgedit"] \
     
    21382138   
    21392139    grid [frame .bkg.l -bd 3 -relief groove] \
    2140             -col 0 -row 1 -columnspan 2 -sticky nse
    2141     grid [label .bkg.l.1 -text "Mouse click\naction"] -col 0 -row 0
     2140            -column 0 -row 1 -columnspan 2 -sticky nse
     2141    grid [label .bkg.l.1 -text "Mouse click\naction"] -column 0 -row 0
    21422142    foreach c {1 2 3} l {zoom add delete} {
    21432143        grid [button .bkg.l.b$c -text $l -command "bkgEditMode $c"] \
    2144                 -col $c -row 0
     2144                -column $c -row 0
    21452145    }
    21462146    # leave a small blank space
    21472147    grid columnconfigure .bkg 2 -pad 0 -min 10
    21482148    grid [frame .bkg.f -bd 3 -relief groove] \
    2149             -col 3 -row 1 -columnspan 2 -sticky nsw
     2149            -column 3 -row 1 -columnspan 2 -sticky nsw
    21502150    grid [button .bkg.f.fit1 -text "Fit" -command {bkgFit .bkg.f.fit1}] \
    2151             -col 1 -row 1
    2152     grid [label .bkg.f.tl -text "with"] -col 3 -row 1
     2151            -column 1 -row 1
     2152    grid [label .bkg.f.tl -text "with"] -column 3 -row 1
    21532153    set termmenu [tk_optionMenu .bkg.f.terms expgui(FitOrder) 0]
    2154     grid .bkg.f.terms -col 4 -row 1
    2155     grid [label .bkg.f.tl1 -text "terms"] -col 5 -row 1
     2154    grid .bkg.f.terms -column 4 -row 1
     2155    grid [label .bkg.f.tl1 -text "terms"] -column 5 -row 1
    21562156
    21572157    grid [frame .bkg.c1 -bd 3 -relief groove] \
    2158             -col 0 -row 5 -rowspan 2 -sticky nsew
    2159     grid [label .bkg.c1.0 -text "Background\nfunction #"] -col 0 -row 0
     2158            -column 0 -row 5 -rowspan 2 -sticky nsew
     2159    grid [label .bkg.c1.0 -text "Background\nfunction #"] -column 0 -row 0
    21602160    set bkgmenu [tk_optionMenu .bkg.c1.1 expgui(FitFunction) stuff]
    2161     grid .bkg.c1.1 -col 0 -row 1
     2161    grid .bkg.c1.1 -column 0 -row 1
    21622162    $bkgmenu delete 0 end
    21632163    foreach item {
     
    21842184    grid [button .bkg.cw -text "Save in\nEXP file\n& Exit" \
    21852185            -command "bkgSave;exit"] \
    2186             -col 4 -columnspan 2 -row 5 -rowspan 2 -sticky ns
     2186            -column 4 -columnspan 2 -row 5 -rowspan 2 -sticky ns
    21872187
    21882188    grid [frame .bkg.bl -bd 3 -relief groove] \
    2189             -col 0 -row 3 -rowspan 2 -sticky nsew
    2190     grid [label .bkg.bl.1 -text "Background\npoints"] -col 0 -row 0
     2189            -column 0 -row 3 -rowspan 2 -sticky nsew
     2190    grid [label .bkg.bl.1 -text "Background\npoints"] -column 0 -row 0
    21912191    grid [canvas .bkg.bc \
    21922192            -scrollregion {0 0 5000 500} -width 0 -height 0 \
Note: See TracChangeset for help on using the changeset viewer.