Changeset 1011 for branches

Timestamp:

Sep 20, 2010 12:44:02 PM (11 years ago)

Author:

chlake

Message:

Fixed phase choice problems and traces. Added grab restore to fix optionMenu bug.

File:

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

branches/sandbox/distrest.tcl

@@ -6 +6 @@
 #::sr_lookuplist1
 #::sr_lookuplist2
-#::sr_rb
-#::sr_top
+#sr_top
 #::sr_checkall
 #::sr_entryvar(choicenum)
@@ -37 +36 @@
 #SR_Build
 
-proc DisplayDistanceRestraints {} {
+proc DisplayDistanceRestraints {args} {
     global expcons
     eval destroy [winfo children $expcons(distmaster)]
@@ -65 +64 @@
     # Pick Phase to be Evaluated **********************************************
     label $phasebox.phlabel -text Phase
-    set ::sr_phaselist $::expmap(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"
+#    set ::sr_phaselist $::expmap(phaselist)
+
+    eval tk_optionMenu $phasebox.phase ::sr_entryvar(softphase) $::expmap(phaselist)
+#    eval tk_optionMenu $phasebox.phase ::sr_entryvar(softphase) $::sr_phaselist
+#   trace variable ::sr_entryvar(softphase) w DisplayDistanceRestraints
+#   bind $phasebox.phase <ButtonRelease> {DisplayDistanceRestraints}
+
     grid $phasebox.phlabel -column 0 -row 0
     grid $phasebox.phase  -column 1 -row 0
@@ -117 +117 @@
     grid $top.rlabel2 -column 5 -row 2
 
-    set ::sr_rb ""
     SR_Rest_Only
+    SR_Show_RestraintsOnly $main $rightfr
+    foreach item [trace vinfo ::sr_entryvar(softphase)] {
+    eval trace vdelete ::sr_entryvar(softphase) $item
+    }
+    trace add variable ::sr_entryvar(softphase) write "SR_Show_RestraintsOnly $main $rightfr"
+}
+proc SR_Show_RestraintsOnly {main rightfr args} {
     SR_Fill_Display  $main
     ResizeScrollTable $rightfr
 }
-
 
 #*********************************************************************************************
@@ -208 +213 @@
         set num1 [lindex $bond_dist_array($x) 5]
         set num2 [lindex $bond_dist_array($x) 6]
-        set type1 [atominfo 1 [lindex $bond_dist_array($x) 5] type]
+        set type1 [atominfo [lindex $bond_dist_array($x) 1] [lindex $bond_dist_array($x) 5] type]
         set type1 [lindex [split $type1 {+-}] 0]
-        set type2 [atominfo 1 [lindex $bond_dist_array($x) 6] type]
+        set type2 [atominfo [lindex $bond_dist_array($x) 1] [lindex $bond_dist_array($x) 6] type]
         set type2 [lindex [split $type2 {+-}] 0]
         lappend initsoftpar($x) $type1
         lappend initsoftpar($x) $type2
 
-        lappend initsoftpar($x) [atominfo 1 [lindex $bond_dist_array($x) 5] label]
-        lappend initsoftpar($x) [atominfo 1 [lindex $bond_dist_array($x) 6] label]
+        lappend initsoftpar($x) [atominfo [lindex $bond_dist_array($x) 1] [lindex $bond_dist_array($x) 5] label]
+        lappend initsoftpar($x) [atominfo [lindex $bond_dist_array($x) 1] [lindex $bond_dist_array($x) 6] label]
 
         #puts "$initsoftpar($x)"
@@ -282 +287 @@
 #*********************************************************************************
 #Procedure to set up soft display ************************************************
+# used for editing window
 #*********************************************************************************
 
@@ -287 +293 @@
     #global rprint
     destroy .mainrestraintbox.sr_rvaluebox
-    set ::sr_rb .mainrestraintbox.sr_rvaluebox
-    frame $::sr_rb
-    pack $::sr_rb -side top -fill both -expand 1
-
-    foreach {::sr_top main side lbl} [MakeScrollTable $::sr_rb] {}
+    set sr_rb .mainrestraintbox.sr_rvaluebox
+    frame $sr_rb
+    pack $sr_rb -side top -fill both -expand 1
+
+    foreach {sr_top main side lbl} [MakeScrollTable $sr_rb] {}
     set     ::contraintmainbox $main
 
-    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 " -width 7 \
-        -command "SR_Sort atom2 $main $::sr_top.alabel1 $::sr_top.alabel2 $::sr_top.dlabel1"
-    button $::sr_top.dlabel1 -text "Distance " -width 9 \
-        -command "SR_Sort distance $main $::sr_top.alabel1 $::sr_top.alabel2 $::sr_top.dlabel1"
-
-    grid $::sr_top.alabel1 -column 1 -row 2
-    grid $::sr_top.alabel2 -column 2 -row 2
-    grid $::sr_top.dlabel1 -column 3 -row 2
-
-    label  $::sr_top.rlabel1 -text "Restraint"
-    label  $::sr_top.rlabel2 -text "esd"
-    grid $::sr_top.rlabel1 -column 4 -row 2 -padx 20
-    grid $::sr_top.rlabel2 -column 5 -row 2 -padx 20
-
-
-    button $::sr_top.rcon1   -text "Check All" -width 10 -command {
+    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 " -width 7 \
+        -command "SR_Sort atom2 $main $sr_top.alabel1 $sr_top.alabel2 $sr_top.dlabel1"
+    button $sr_top.dlabel1 -text "Distance " -width 9 \
+        -command "SR_Sort distance $main $sr_top.alabel1 $sr_top.alabel2 $sr_top.dlabel1"
+
+    grid $sr_top.alabel1 -column 1 -row 2
+    grid $sr_top.alabel2 -column 2 -row 2
+    grid $sr_top.dlabel1 -column 3 -row 2
+
+    label  $sr_top.rlabel1 -text "Restraint"
+    label  $sr_top.rlabel2 -text "esd"
+    grid $sr_top.rlabel1 -column 4 -row 2 -padx 20
+    grid $sr_top.rlabel2 -column 5 -row 2 -padx 20
+
+
+    button $sr_top.rcon1   -text "Check All" -width 10 -command {
         set ::sr_checkall 1
         SR_Set_All_Check_Buttons
-        grid forget $::sr_top.rcon1
-        grid $::sr_top.rcon2 -column 6 -row 2 -padx 5
-    }
-
-    button $::sr_top.rcon2   -text "Clear All" -width 10 -command {
+        grid forget $sr_top.rcon1
+        grid $sr_top.rcon2 -column 6 -row 2 -padx 5
+    }
+
+    button $sr_top.rcon2   -text "Clear All" -width 10 -command {
         set ::sr_checkall 0
         SR_Set_All_Check_Buttons
-        grid forget $::sr_top.rcon2
-        grid $::sr_top.rcon1 -column 6 -row 2 -padx 5
-    }
-
-    grid $::sr_top.rcon1   -column 6 -row 2 -padx 5
+        grid forget $sr_top.rcon2
+        grid $sr_top.rcon1 -column 6 -row 2 -padx 5
+    }
+
+    grid $sr_top.rcon1   -column 6 -row 2 -padx 5
 
     #SR_Sort atom1 $main
     SR_Fill_Display  $main
+    bind $sr_rb <Configure> "ResizeScrollTable $sr_rb"
+    # see if reset of grab fixes tk bug with tk_optionMenu
+    grab release .mainrestraintbox
 }
 
 #*****************************************************************************************
 #Procedure to fill in sorted Restraint and esd data **************************************
+# used for both editing windows and restrain-only display in main EXPGUI window
 #*****************************************************************************************
 proc SR_Fill_Display {main args} {
@@ -386 +396 @@
         }
     }
-
-    bind $::sr_rb <Configure> {ResizeScrollTable $::sr_rb}
 }
 #****************************************************************************
@@ -449 +457 @@
         if {$test == -1} {
             set new_restraint ""
-            set type1 [atominfo 1 [lindex $temp_res1 1] type]
+            set type1 [atominfo [lindex $temp_res1 0] [lindex $temp_res1 1] type]
             set type1 [lindex [split $type1 {+-}] 0]
-            set type2 [atominfo 1 [lindex $temp_res1 2] type]
+            set type2 [atominfo [lindex $temp_res1 0] [lindex $temp_res1 2] type]
             set type2 [lindex [split $type2 {+-}] 0]
 
@@ -458 +466 @@
                 [lindex $temp_res1 5] [lindex $temp_res1 6] [lindex $temp_res1 7] \
                 "?.???" $type1 $type2 \
-                [atominfo 1 [lindex $temp_res1 1] label] [atominfo 1 [lindex $temp_res1 2] label] \
+                [atominfo [lindex $temp_res1 0] [lindex $temp_res1 1] label] [atominfo [lindex $temp_res1 0] [lindex $temp_res1 2] label] \
                 $t2
             set x [llength $::sr_bond_list]
@@ -630 +638 @@
 
     set choice {"Show All Bonds" "Restrained Bonds" "Unrestrained Bonds"}
-    set ::sr_entryvar(choice) "Show All Bonds"
 
     set m1 [eval tk_optionMenu $srcb1.rcon3 sr_entryvar(choice) $choice]
@@ -652 +659 @@
     grid $::srcb3.rbutton4     -column 0 -row 1 -pady 5
 
-
-
-    SR_Display
-
+    # remove traces
     foreach item [trace vinfo ::sr_entryvar(softatom1)] {
         eval trace vdelete ::sr_entryvar(softatom1) $item
     }
-    trace variable ::sr_entryvar(softatom1) w SR_Display
-
     foreach item [trace vinfo ::sr_entryvar(softatom2)] {
         eval trace vdelete ::sr_entryvar(softatom2) $item
     }
-    trace variable ::sr_entryvar(softatom2) w SR_Display
-
     foreach item [trace vinfo ::sr_entryvar(choicenum)] {
         eval trace vdelete ::sr_entryvar(choicenum) $item
     }
+    # reset filter vars
+    set ::sr_entryvar(choice) "Show All Bonds"
+    set ::sr_entryvar(choicenum) 0
+    set ::sr_entryvar(softatom1) "all"
+    set ::sr_entryvar(softatom2) "all"
+    # search out distances
+    SR_Display
+    # set traces for future changes to filter vars
+    trace variable ::sr_entryvar(softatom1) w SR_Display
     trace variable ::sr_entryvar(choicenum) w SR_Display
-
+    trace variable ::sr_entryvar(softatom2) w SR_Display
+    # make editor window modal (lock it on top)
     putontop $mrb
 }
@@ -681 +691 @@
     set ::sr_distance_button 1
     set ::sr_entryvar(choicenum) 0
-    set ::sr_entryvar(softphase) "1"
+#    set ::sr_entryvar(softphase) "1"
+#    set ::sr_phaselist $::expmap(phaselist)
     set ::sr_entryvar(softatom1) "all"
     set ::sr_entryvar(softatom2) "all"