Changeset 730 for trunk/instedit.tcl


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

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/instedit.tcl

    • Property rcs:date changed from 2003/05/22 21:34:13 to 2003/08/11 19:28:27
    • Property rcs:rev changed from 1.1 to 1.2
    • Property rcs:lines set to +54 -54
    r691 r730  
    1717        grid [radiobutton $topfr.fr.$i -text $i -value $i \
    1818                -command "instShowBank $box"\
    19                 -variable instparms(bank)] -row $row -col $col
     19                -variable instparms(bank)] -row $row -column $col
    2020        if {[incr col] > 10} {set col 0; incr row}
    2121    }
     
    159159    grid [label $bnkfr.l1 -text "Bank #$b" -relief raised -bd 2 \
    160160            -anchor w -justify left] \
    161             -col 0 -row 0 -columnspan 99 -sticky ew
    162     grid [label $bnkfr.l2 -text "Title: "] -col 0 -row 1 -sticky e
     161            -column 0 -row 0 -columnspan 99 -sticky ew
     162    grid [label $bnkfr.l2 -text "Title: "] -column 0 -row 1 -sticky e
    163163    grid [entry $bnkfr.e2 -textvariable instdat(head$b) -width 60] \
    164             -col 1 -row 1 -sticky w -columnspan 99
     164            -column 1 -row 1 -sticky w -columnspan 99
    165165
    166166    grid [label $bnkfr.l3 -text "Instrument\nname: " -anchor e -justify r] \
    167             -col 0 -row 2 -sticky e
     167            -column 0 -row 2 -sticky e
    168168    grid [entry $bnkfr.e3 -textvariable instdat(name$b) -width 30] \
    169             -col 1 -row 2 -sticky w -columnspan 99
     169            -column 1 -row 2 -sticky w -columnspan 99
    170170
    171171    if {$instparms(banklabel) == "TOF"} return
     
    174174    set col 0
    175175    grid [label $bnkfr.l4a -text "Radiation\ntype:" -anchor e -justify r] \
    176             -col $col -row 4 -sticky e -rowspan 2
     176            -column $col -row 4 -sticky e -rowspan 2
    177177    set menu [tk_optionMenu $bnkfr.rad instparms(irad) "     "]
    178178    $bnkfr.rad config -width 6
    179179   
    180     grid $bnkfr.rad -col [incr col] -row 4 -sticky w -rowspan 2
     180    grid $bnkfr.rad -column [incr col] -row 4 -sticky w -rowspan 2
    181181    grid [radiobutton $bnkfr.c4a -text Monochromatic \
    182182            -command "disableWaveBoxes $bnkfr $b" \
    183183            -variable instparms(wavemode) -value 1] \
    184             -col [incr col] -row 4 -sticky w
     184            -column [incr col] -row 4 -sticky w
    185185    grid [radiobutton $bnkfr.c4b -text Dual \
    186186            -command "disableWaveBoxes $bnkfr $b" \
    187187            -variable instparms(wavemode) -value 2] \
    188             -col $col -row 5 -sticky w
     188            -column $col -row 5 -sticky w
    189189
    190190           
    191191    grid [label $bnkfr.l4 -text "Wavelength: "] \
    192             -col [incr col] -row 4 -sticky e -rowspan 2
     192            -column [incr col] -row 4 -sticky e -rowspan 2
    193193    grid [entry $bnkfr.e4d -textvariable instdat(difc$b) -width 10] \
    194             -col [incr col] -row 5 -sticky ew
    195     grid [label $bnkfr.l4d -text Primary] -col $col -row 4 -sticky ew
     194            -column [incr col] -row 5 -sticky ew
     195    grid [label $bnkfr.l4d -text Primary] -column $col -row 4 -sticky ew
    196196    grid [entry $bnkfr.e4e -textvariable instdat(difa$b) -width 10] \
    197             -col [incr col] -row 5 -sticky ew
    198     grid [label $bnkfr.l4e -text Secondary] -col $col -row 4 -sticky ew
     197            -column [incr col] -row 5 -sticky ew
     198    grid [label $bnkfr.l4e -text Secondary] -column $col -row 4 -sticky ew
    199199    grid [entry $bnkfr.e4f -textvariable instdat(kratio$b) -width 10] \
    200             -col [incr col] -row 5 -sticky ew
    201     grid [label $bnkfr.l4f -text ratio] -col $col -row 4 -sticky ew
     200            -column [incr col] -row 5 -sticky ew
     201    grid [label $bnkfr.l4f -text ratio] -column $col -row 4 -sticky ew
    202202
    203203    set col 0
    204204    grid [label $bnkfr.l6 -text "Zero\nCorrection:" \
    205205            -anchor e -justify r] \
    206             -col $col -row 6 -sticky e
     206            -column $col -row 6 -sticky e
    207207    grid [entry $bnkfr.e6 -textvariable instdat(zero$b) -width 10] \
    208             -col [incr col] -row 6 -sticky ew
     208            -column [incr col] -row 6 -sticky ew
    209209
    210210    set col 0
    211211    grid [label $bnkfr.l7 -text "Polarization\nCorrection:" \
    212212            -anchor e -justify r] \
    213             -col $col -row 7 -sticky e
     213            -column $col -row 7 -sticky e
    214214    grid [radiobutton $bnkfr.c7a -text "Diffracted Beam" \
    215215            -variable instdat(ipola$b) -value 0] \
    216             -col [incr col] -row 7 -sticky w
     216            -column [incr col] -row 7 -sticky w
    217217    grid [radiobutton $bnkfr.c7b -text "Incident Beam" \
    218218            -variable instdat(ipola$b) -value 1] \
    219             -col [incr col] -row 7 -sticky w
     219            -column [incr col] -row 7 -sticky w
    220220    grid [radiobutton $bnkfr.c7c -text "None" \
    221221            -variable instdatr(ipola$b) -value 2] \
    222             -col [incr col] -row 7 -sticky w
     222            -column [incr col] -row 7 -sticky w
    223223    grid [label $bnkfr.l7a -text "Polarization\nFraction:" \
    224224            -anchor e -justify r] \
    225             -col [incr col] -row 7 -sticky e
     225            -column [incr col] -row 7 -sticky e
    226226    grid [entry $bnkfr.e7 -textvariable instdat(pola$b) -width 10] \
    227             -col [incr col] -row 7 -sticky ew
     227            -column [incr col] -row 7 -sticky ew
    228228
    229229    grid [frame [set prfrm $bnkfr.prof] -bd 2 -relief groove] \
    230             -col 0 -columnspan 99 -row 8
    231     grid [label $prfrm.l1 -text "Select profile: "] -col 0 -row 0
    232     grid [frame $prfrm.fr] -col 1 -columnspan 99 -row 0 -sticky w
    233     grid [frame $prfrm.fr1] -col 0 -columnspan 99 -row 2
     230            -column 0 -columnspan 99 -row 8
     231    grid [label $prfrm.l1 -text "Select profile: "] -column 0 -row 0
     232    grid [frame $prfrm.fr] -column 1 -columnspan 99 -row 0 -sticky w
     233    grid [frame $prfrm.fr1] -column 0 -columnspan 99 -row 2
    234234    set instparms(profileframe) $prfrm.fr1
    235235    for {set j 1} {$j <= $instparms(proftypes${b})} {incr j} {
    236236        grid [radiobutton $prfrm.fr.$j -text $j -value $j \
    237237                -command "ShowInstProfile $b" \
    238                 -variable instparms(profilenum)] -row 1 -col $j
     238                -variable instparms(profilenum)] -row 1 -column $j
    239239    }
    240240    grid [button $prfrm.fr.a -text "Add profile" \
    241             -command "AddInstProfile $box $b"] -row 1 -col 98
     241            -command "AddInstProfile $box $b"] -row 1 -column 98
    242242    grid [button $prfrm.fr.n -text "Import profile" \
    243             -command "ImportInstProfile $box $prfrm.fr1 $b"] -row 1 -col 99
     243            -command "ImportInstProfile $box $prfrm.fr1 $b"] -row 1 -column 99
    244244    $menu delete 0 end
    245245    foreach lbl {Cr Fe Cu Mo Ag Other} \
     
    314314    toplevel [set top $instparms(top).sel]
    315315    wm title $top "Select histogram and phase to select"
    316     grid [label $top.l1 -text "Histogram: "] -col 1 -row 1
     316    grid [label $top.l1 -text "Histogram: "] -column 1 -row 1
    317317    set menu [tk_optionMenu $top.w instparms(histimport) ""]
    318318    $menu delete 0 end
     
    345345        }
    346346    }
    347     grid $top.w -col 2 -row 1 -columnspan 2 -sticky w
     347    grid $top.w -column 2 -row 1 -columnspan 2 -sticky w
    348348    set instparms(histimport) [lindex $hlist 0]
    349     grid [label $top.l2 -text "Phase: "] -col 1 -row 2
     349    grid [label $top.l2 -text "Phase: "] -column 1 -row 2
    350350    set col 1
    351351    foreach h {1 2 3 4 5 6 7 8 9} {
    352352        grid [radiobutton $top.r$h \
    353353                -variable instparms(phaseimport) -value $h -text $h \
    354                 ] -col [incr col] -row 2
    355     }
    356     grid [frame $top.prof] -col 0 -columnspan 99 -row 3
     354                ] -column [incr col] -row 2
     355    }
     356    grid [frame $top.prof] -column 0 -columnspan 99 -row 3
    357357    grid [button $top.b1 -text Import -command "" -state disabled] \
    358             -col 0 -columnspan 2 -row 4
     358            -column 0 -columnspan 2 -row 4
    359359    grid [button $top.b2 -text Cancel -command "destroy $top"] \
    360             -col 2 -columnspan 2 -row 4
     360            -column 2 -columnspan 2 -row 4
    361361
    362362    # there a single histogram, select it
     
    403403    grid [label $frame.${col}_$row -justify left -anchor w \
    404404            -text "Profile type $lbl"] \
    405             -col $col -row $row -columnspan 99 -sticky w
     405            -column $col -row $row -columnspan 99 -sticky w
    406406    incr row
    407407    set col 0
    408408    grid [label $frame.${col}_$row -text "Peak cutoff"  -padx 4] \
    409             -col $col -row $row -sticky e
     409            -column $col -row $row -sticky e
    410410    incr col
    411411    grid [label $frame.${col}_$row -text "[lindex $proflist 2]" \
    412412            -relief groove -bd 2 -padx 2] \
    413             -col $col -row $row -sticky ew
     413            -column $col -row $row -sticky ew
    414414    incr col
    415415    set N $num
     
    423423        if {$col > 6} {set col 0; incr row}
    424424        grid [label $frame.${col}_$row -text $lbl -padx 4] \
    425                 -col $col -row $row -sticky e
     425                -column $col -row $row -sticky e
    426426        incr col
    427427        grid [label $frame.${col}_$row -text $val \
    428428                -bd 2 -padx 2 -relief groove] \
    429                 -col $col -row $row -sticky ew
     429                -column $col -row $row -sticky ew
    430430        incr col
    431431    }
     
    471471    set col 0
    472472    grid [label $frame.${col}_$row -text "Profile\ntype"] \
    473             -col $col -row $row
     473            -column $col -row $row
    474474    incr col
    475475    set menu [tk_optionMenu $frame.${col}_$row instdat(proftype${b}_$j) " "]
    476     grid $frame.${col}_$row -col $col -row $row -sticky ew
     476    grid $frame.${col}_$row -column $col -row $row -sticky ew
    477477    $menu delete 0 end
    478478    foreach val { 1  2  3  4} \
     
    487487    incr col
    488488    grid [label $frame.${col}_$row -text "Peak\ncutoff"] \
    489             -col $col -row $row
     489            -column $col -row $row
    490490    incr col
    491491    if [catch {set instdat(profcut${b}_$j)}] {
     
    494494    grid [entry $frame.${col}_$row -width 10 \
    495495            -textvariable instdat(profcut${b}_$j)] \
    496             -col $col -row $row
     496            -column $col -row $row
    497497    incr row
    498498    set col 0
     
    507507        if {$col > 6} {set col 0; incr row}
    508508        grid [label $frame.${col}_$row -text $lbl] \
    509                 -col $col -row $row
     509                -column $col -row $row
    510510        incr col
    511511        if [catch {set instdat(prof${b}_${j}_$i)}] {
     
    514514        grid [entry $frame.${col}_$row -width 14 \
    515515                -textvariable instdat(prof${b}_${j}_$i)] \
    516                 -col $col -row $row
     516                -column $col -row $row
    517517        incr col
    518518    }
     
    649649    }
    650650
    651     grid [frame $instparms(top).b1 -bd 2 -relief groove] -col 1 -row 1
    652     grid [frame $instparms(top).b1.a] -col 0 -row 0 -sticky ew
    653     grid [frame $instparms(top).b1.b] -col 0 -row 1 -sticky ew
     651    grid [frame $instparms(top).b1 -bd 2 -relief groove] -column 1 -row 1
     652    grid [frame $instparms(top).b1.a] -column 0 -row 0 -sticky ew
     653    grid [frame $instparms(top).b1.b] -column 0 -row 1 -sticky ew
    654654
    655655    instInit
Note: See TracChangeset for help on using the changeset viewer.