Changeset 1006

Timestamp:

Sep 16, 2010 2:32:38 PM (15 years ago)

Author:

chlake

Message:

Fixed refresh problems after leaving Restraint Editor Window

File:

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

branches/sandbox/distrest.tcl ¶

@@ -62 +62 @@
         grid $top.rlabel2 -column 5 -row 2
 
-        SR_Rest_Only
         set ::sr_rb ""
         SR_Fill_Display  $main
@@ -85 +84 @@
         catch {unset ::sr_lookuplist1}
         catch {unset ::sr_lookuplist2}
-        catch {unset ::sr_restraintdist}
-        catch {unset ::sr_restraintesd}
+#        catch {unset ::sr_restraintdist}
+#        catch {unset ::sr_restraintesd}
         set ::sr_bond_list ""
         set ::sr_key_list ""
@@ -149 +148 @@
               #create bond ID code
               set t2 [string map {" " ""} [set t1 $initsoftpar($x)]]
-              set ::sr_restraintdist($t2) ""
-              set ::sr_restraintesd($t2) ""
+
+              set z [info exists ::sr_restraintdist($t2)]
+              if {$z == 0} {
+                            set ::sr_restraintdist($t2) ""
+                            set ::sr_restraintesd($t2) ""
+                            }
 
               #extract bond distance
@@ -427 +430 @@
 proc SR_Write_Restraints { } {
      if {$::sr_error == 0} {
-#          set ::sr_write ""
+          set sr_write ""
+          set new_list ""
           set len [llength $::sr_bond_list]
+          set ::sr_key_list ""
           for {set i 0} {$i <= [expr $len-1]} {incr i} {
                     set temp [lindex $::sr_bond_list $i]
@@ -438 +443 @@
                                 $::sr_restraintesd([lindex $temp 13])"
                                 lappend sr_write $softrest
-                    }
+                                lappend new_list $temp
+
+                    } else {
+                           unset ::sr_restraintdist([lindex $temp 13])
+                           unset ::sr_restraintesd([lindex $temp 13])
+                           }
           }
           puts $sr_write
           # put the entire restraint list back into the .EXP file
           SoftConst restraintlist set $sr_write
+          set ::sr_bond_list $new_list
           # indicate a change to the .EXP file
           incr ::expgui(changed)
           # close the window and return access to main window
           destroy .mainrestraintbox
+          set ::sr_display_mode noedit
           afterputontop
+          DisplayDistanceRestraints
      } else {
             bell
@@ -519 +532 @@
      pack $::srcb3 -side bottom -anchor w -fill x
 
-     label $srcb1.atomlabel1   -text "Atom Type 1"
-     label $srcb1.atomlabel2   -text "Atom Type 2"
+     label $srcb1.atomlabel1   -text "Atom 1 Filter"
+     label $srcb1.atomlabel2   -text "Atom 2 Filter"
      label $srcb1.dminlabel    -text "Dmin"
      label $srcb1.dmaxlabel    -text "Dmax"
@@ -543 +556 @@
      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 $::srcb3.rbutton4 -text "Cancel" -command {destroy .mainrestraintbox; afterputontop}
+     button $::srcb3.rbutton4 -text "Cancel" -command {destroy .mainrestraintbox
+                                                      afterputontop
+                                                      SR_Rest_Only
+                                                      DisplayDistanceRestraints}
+     wm protocol .mainrestraintbox WM_DELETE_WINDOW {destroy .mainrestraintbox
+                                                      afterputontop
+                                                      SR_Rest_Only
+                                                      DisplayDistanceRestraints}
 
      grid $srcb1.atomlabel1   -column 1 -row 0
@@ -648 +668 @@
 #*************************************************************************
 proc SR_Initialize {} {
+catch {unset ::sr_restraintdist}
+catch {unset ::sr_restraintesd}
+
 set ::sr_atom1_button 1
 set ::sr_atom2_button 1
@@ -660 +683 @@
 set ::sr_dminvalue 0
 set ::sr_dmaxvalue 1000
-
+SR_Rest_Only
 }
 
 proc SR_Rest_Only {} {
-     set ::sr_display_mode noedit
+        set ::sr_display_mode noedit
         catch {unset ::sr_lookuplist1}
         catch {unset ::sr_lookuplist2}
-        catch {unset ::sr_restraintdist}
-        catch {unset ::sr_restraintesd}
+#        catch {unset ::sr_restraintdist}
+#        catch {unset ::sr_restraintesd}
         set ::sr_bond_list ""
         set ::sr_key_list ""
- SR_Load_Restraints
+SR_Load_Restraints
 }
 
@@ -684 +707 @@
 #SR_Load_Restraints
 
+
+
+
 proc SR_TEST {} {
      set ::sr_display_mode edit