Changeset 1009

Timestamp:

Sep 17, 2010 11:50:03 AM (12 years ago)

Author:

chlake

Message:

Final?? File

File:

• branches/sandbox/distrest.tcl (modified) (9 diffs)

branches/sandbox/distrest.tcl

@@ -43 +43 @@
     set leftfr $expcons(distmaster).f1
     set rightfr $expcons(distmaster).f2
+    set phasebox $leftfr.f1
+    set editorbox $leftfr.f2
+    set atomfilter $leftfr.f3
 
     grid [frame $leftfr -bd 2 -relief groove] -column 0 -row 0 \
@@ -48 +51 @@
     grid [frame $rightfr -bd 2 -relief groove] -column 1 -row 0 \
         -sticky nsew
+    grid [frame $phasebox -bd 2 -relief groove] -column 0 -row 0 \
+         -sticky new -columnspan 2
+
+
+    grid [frame $editorbox -bd 2 -relief groove] -column 0 -row 2 \
+         -sticky sew -columnspan 2
+
 
     grid rowconfigure $expcons(distmaster) 0 -weight 1
@@ -54 +64 @@
 
     # Pick Phase to be Evaluated **********************************************
-    label $leftfr.phlabel -text Phase
+    label $phasebox.phlabel -text Phase
     set ::sr_phaselist $::expmap(phaselist)
-    eval tk_optionMenu $leftfr.phase sr_entryvar(softphase) $::sr_phaselist
+    eval tk_optionMenu $phasebox.phase sr_entryvar(softphase) $::sr_phaselist
     foreach item [trace vinfo ::sr_entryvar(softphase)] {
         eval trace vdelete ::sr_entryvar(softphase) $item
     }
-    trace variable ::sr_entryvar(softphase) w "SR_Fill_Display  $main"
-    grid $leftfr.phlabel -column 0 -row 0
-    grid $leftfr.phase  -column 1 -row 0
+    #trace variable ::sr_entryvar(softphase) w "SR_Fill_Display  $main"
+    grid $phasebox.phlabel -column 0 -row 0
+    grid $phasebox.phase  -column 1 -row 0
     #**************************************************************************
 
-    # Run Disagl Commands *****************************************************
-    button $leftfr.disagl -text "Refresh Disagl"
-    grid $leftfr.disagl -column 1 -row 1
-    #**************************************************************************
-
-    grid [label $leftfr.lweight -text "Restraint Weight"] -column 0 -row 2 -sticky sw
-    grid [entry $leftfr.weight -width 8 -textvariable entryvar(distrestweight)] -column 1 -row 2 -sticky sw
+    #Restraint Weight Control Box
+    grid [label $leftfr.lweight -text "Restraint Weight"] -column 0 -row 1 -sticky sw -pady 10
+    grid [entry $leftfr.weight -width 8 -textvariable entryvar(distrestweight)] -column 1 -row 1 -sticky sw \
+         -padx 5 -pady 10
     set ::entrycmd(distrestweight) "SoftConst weight"
     set ::entrycmd(trace) 0
     set ::entryvar(distrestweight) [SoftConst weight]
     set ::entrycmd(trace) 1
-    grid [button $leftfr.edit -text "Edit Distance Restraints" -command SR_TEST] -column 0 -row 3 \
+
+
+    #Run Disagl Commands *****************************************************
+    #button $leftfr.disagl -text "Refresh Disagl"
+    #grid $leftfr.disagl -column 1 -row 1
+    #**************************************************************************
+
+
+
+    #Activate Restraint Editor
+    grid [button $editorbox.edit -text "Activate Distance \n Restraint Editor" -command SR_TEST] -column 0 -row 3 \
         -sticky sw -columnspan 2
+        $editorbox.edit config -bg LightGreen -bd 6
 
 
@@ -229 +247 @@
             set sr_prsort [lsort -integer -decreasing -index 1 $::sr_bond_list]
 
-            $alabel1 config -text "Atom 1 \u2193"
+            $alabel1 config -text "Atom 1 \u2193" -width 7
         } else {
             set sr_prsort [lsort -integer -increasing -index 1 $::sr_bond_list]
-            $alabel1 config -text "Atom 1 \u2191"
+            $alabel1 config -text "Atom 1 \u2191" -width 7
         }
         set x [expr $::sr_atom1_button * -1]
@@ -240 +258 @@
         if {$::sr_atom2_button == 1} {
             set sr_prsort [lsort -integer -decreasing -index 2 $::sr_bond_list]
-            $alabel2 config -text "Atom 2 \u2193"
+            $alabel2 config -text "Atom 2 \u2193" -width 7
         } else {
             set sr_prsort [lsort -integer -increasing -index 2 $::sr_bond_list]
-            $alabel2 config -text "Atom 2 \u2191"
+            $alabel2 config -text "Atom 2 \u2191" -width 7
         }
         set x [expr $::sr_atom2_button * -1]
@@ -251 +269 @@
             #puts "distance"
             set sr_prsort [lsort -increasing -index 8 $::sr_bond_list]
-            $dlabel1 config -text "Distance \u2193"
+            $dlabel1 config -text "Distance \u2193" -width 9
         } else {
             set sr_prsort [lsort -decreasing -index 8 $::sr_bond_list]
-            $dlabel1 config -text "Distance \u2191"
+            $dlabel1 config -text "Distance \u2191" -width 9
         }
         set x [expr $::sr_distance_button * -1]
@@ -276 +294 @@
     set     ::contraintmainbox $main
 
-    button $::sr_top.alabel1 -text "Atom 1 "   \
+    button $::sr_top.alabel1 -text "Atom 1 " -width 7   \
         -command "SR_Sort atom1 $main $::sr_top.alabel1 $::sr_top.alabel2 $::sr_top.dlabel1"
-    button $::sr_top.alabel2 -text "Atom 2 " \
+    button $::sr_top.alabel2 -text "Atom 2 " -width 7 \
         -command "SR_Sort atom2 $main $::sr_top.alabel1 $::sr_top.alabel2 $::sr_top.dlabel1"
-    button $::sr_top.dlabel1 -text "Distance " \
+    button $::sr_top.dlabel1 -text "Distance " -width 9 \
         -command "SR_Sort distance $main $::sr_top.alabel1 $::sr_top.alabel2 $::sr_top.dlabel1"
 
@@ -403 +421 @@
         # valid value
         $win config -fg black
-        $::srcb3.rbutton3 config -bg green -text "Save Restraints to EXP File"
+        $::srcb3.rbutton3 config -bg LightGreen -text "Save Restraints to EXP File"
         set ::sr_error 0
     }
@@ -582 +600 @@
     button $srcb1.recalc   -text "Filter" -bd 6 -command {SR_Display}
     button $srcb2.rbutton1 -text "check update" -command {SR_Update_Restraints}
-    button $srcb2.rbutton2 -text "check remove" -command {SR_Delete_Restraints}
-    button $::srcb3.rbutton3 -text "Save Restraints to EXP File" -bd 6 -bg green -command {SR_Write_Restraints}
+    button $srcb2.rbutton2 -text "check delete" -command {SR_Delete_Restraints}
+    button $::srcb3.rbutton3 -text "Save Restraints to EXP File" -bd 6 -bg LightGreen -command {SR_Write_Restraints}
     button $::srcb3.rbutton4 -text "Cancel" -command {destroy .mainrestraintbox
         afterputontop