Changeset 1009 for branches/sandbox


Ignore:
Timestamp:
Sep 17, 2010 11:50:03 AM (10 years ago)
Author:
chlake
Message:

Final?? File

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/sandbox/distrest.tcl

    r1008 r1009  
    4343    set leftfr $expcons(distmaster).f1
    4444    set rightfr $expcons(distmaster).f2
     45    set phasebox $leftfr.f1
     46    set editorbox $leftfr.f2
     47    set atomfilter $leftfr.f3
    4548
    4649    grid [frame $leftfr -bd 2 -relief groove] -column 0 -row 0 \
     
    4851    grid [frame $rightfr -bd 2 -relief groove] -column 1 -row 0 \
    4952        -sticky nsew
     53    grid [frame $phasebox -bd 2 -relief groove] -column 0 -row 0 \
     54         -sticky new -columnspan 2
     55
     56
     57    grid [frame $editorbox -bd 2 -relief groove] -column 0 -row 2 \
     58         -sticky sew -columnspan 2
     59
    5060
    5161    grid rowconfigure $expcons(distmaster) 0 -weight 1
     
    5464
    5565    # Pick Phase to be Evaluated **********************************************
    56     label $leftfr.phlabel -text Phase
     66    label $phasebox.phlabel -text Phase
    5767    set ::sr_phaselist $::expmap(phaselist)
    58     eval tk_optionMenu $leftfr.phase sr_entryvar(softphase) $::sr_phaselist
     68    eval tk_optionMenu $phasebox.phase sr_entryvar(softphase) $::sr_phaselist
    5969    foreach item [trace vinfo ::sr_entryvar(softphase)] {
    6070        eval trace vdelete ::sr_entryvar(softphase) $item
    6171    }
    62     trace variable ::sr_entryvar(softphase) w "SR_Fill_Display  $main"
    63     grid $leftfr.phlabel -column 0 -row 0
    64     grid $leftfr.phase  -column 1 -row 0
     72    #trace variable ::sr_entryvar(softphase) w "SR_Fill_Display  $main"
     73    grid $phasebox.phlabel -column 0 -row 0
     74    grid $phasebox.phase  -column 1 -row 0
    6575    #**************************************************************************
    6676
    67     # Run Disagl Commands *****************************************************
    68     button $leftfr.disagl -text "Refresh Disagl"
    69     grid $leftfr.disagl -column 1 -row 1
    70     #**************************************************************************
    71 
    72     grid [label $leftfr.lweight -text "Restraint Weight"] -column 0 -row 2 -sticky sw
    73     grid [entry $leftfr.weight -width 8 -textvariable entryvar(distrestweight)] -column 1 -row 2 -sticky sw
     77    #Restraint Weight Control Box
     78    grid [label $leftfr.lweight -text "Restraint Weight"] -column 0 -row 1 -sticky sw -pady 10
     79    grid [entry $leftfr.weight -width 8 -textvariable entryvar(distrestweight)] -column 1 -row 1 -sticky sw \
     80         -padx 5 -pady 10
    7481    set ::entrycmd(distrestweight) "SoftConst weight"
    7582    set ::entrycmd(trace) 0
    7683    set ::entryvar(distrestweight) [SoftConst weight]
    7784    set ::entrycmd(trace) 1
    78     grid [button $leftfr.edit -text "Edit Distance Restraints" -command SR_TEST] -column 0 -row 3 \
     85
     86
     87    #Run Disagl Commands *****************************************************
     88    #button $leftfr.disagl -text "Refresh Disagl"
     89    #grid $leftfr.disagl -column 1 -row 1
     90    #**************************************************************************
     91
     92
     93
     94    #Activate Restraint Editor
     95    grid [button $editorbox.edit -text "Activate Distance \n Restraint Editor" -command SR_TEST] -column 0 -row 3 \
    7996        -sticky sw -columnspan 2
     97        $editorbox.edit config -bg LightGreen -bd 6
    8098
    8199
     
    229247            set sr_prsort [lsort -integer -decreasing -index 1 $::sr_bond_list]
    230248
    231             $alabel1 config -text "Atom 1 \u2193"
     249            $alabel1 config -text "Atom 1 \u2193" -width 7
    232250        } else {
    233251            set sr_prsort [lsort -integer -increasing -index 1 $::sr_bond_list]
    234             $alabel1 config -text "Atom 1 \u2191"
     252            $alabel1 config -text "Atom 1 \u2191" -width 7
    235253        }
    236254        set x [expr $::sr_atom1_button * -1]
     
    240258        if {$::sr_atom2_button == 1} {
    241259            set sr_prsort [lsort -integer -decreasing -index 2 $::sr_bond_list]
    242             $alabel2 config -text "Atom 2 \u2193"
     260            $alabel2 config -text "Atom 2 \u2193" -width 7
    243261        } else {
    244262            set sr_prsort [lsort -integer -increasing -index 2 $::sr_bond_list]
    245             $alabel2 config -text "Atom 2 \u2191"
     263            $alabel2 config -text "Atom 2 \u2191" -width 7
    246264        }
    247265        set x [expr $::sr_atom2_button * -1]
     
    251269            #puts "distance"
    252270            set sr_prsort [lsort -increasing -index 8 $::sr_bond_list]
    253             $dlabel1 config -text "Distance \u2193"
     271            $dlabel1 config -text "Distance \u2193" -width 9
    254272        } else {
    255273            set sr_prsort [lsort -decreasing -index 8 $::sr_bond_list]
    256             $dlabel1 config -text "Distance \u2191"
     274            $dlabel1 config -text "Distance \u2191" -width 9
    257275        }
    258276        set x [expr $::sr_distance_button * -1]
     
    276294    set     ::contraintmainbox $main
    277295
    278     button $::sr_top.alabel1 -text "Atom 1 "   \
     296    button $::sr_top.alabel1 -text "Atom 1 " -width 7   \
    279297        -command "SR_Sort atom1 $main $::sr_top.alabel1 $::sr_top.alabel2 $::sr_top.dlabel1"
    280     button $::sr_top.alabel2 -text "Atom 2 " \
     298    button $::sr_top.alabel2 -text "Atom 2 " -width 7 \
    281299        -command "SR_Sort atom2 $main $::sr_top.alabel1 $::sr_top.alabel2 $::sr_top.dlabel1"
    282     button $::sr_top.dlabel1 -text "Distance " \
     300    button $::sr_top.dlabel1 -text "Distance " -width 9 \
    283301        -command "SR_Sort distance $main $::sr_top.alabel1 $::sr_top.alabel2 $::sr_top.dlabel1"
    284302
     
    403421        # valid value
    404422        $win config -fg black
    405         $::srcb3.rbutton3 config -bg green -text "Save Restraints to EXP File"
     423        $::srcb3.rbutton3 config -bg LightGreen -text "Save Restraints to EXP File"
    406424        set ::sr_error 0
    407425    }
     
    582600    button $srcb1.recalc   -text "Filter" -bd 6 -command {SR_Display}
    583601    button $srcb2.rbutton1 -text "check update" -command {SR_Update_Restraints}
    584     button $srcb2.rbutton2 -text "check remove" -command {SR_Delete_Restraints}
    585     button $::srcb3.rbutton3 -text "Save Restraints to EXP File" -bd 6 -bg green -command {SR_Write_Restraints}
     602    button $srcb2.rbutton2 -text "check delete" -command {SR_Delete_Restraints}
     603    button $::srcb3.rbutton3 -text "Save Restraints to EXP File" -bd 6 -bg LightGreen -command {SR_Write_Restraints}
    586604    button $::srcb3.rbutton4 -text "Cancel" -command {destroy .mainrestraintbox
    587605        afterputontop
Note: See TracChangeset for help on using the changeset viewer.