Changeset 1005 for branches/sandbox/distrest.tcl

Timestamp:

Sep 15, 2010 5:54:04 PM (12 years ago)

Author:

chlake

Message:

Made SR_Sort generic and added sort routine to restraint list box.

Bug: when restraint editor box closes, it SR_Bond_List needs to be reset

File:

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

branches/sandbox/distrest.tcl

@@ -42 +42 @@
         -sticky sw -columnspan 2
 
-        set h_list .hard_list
+
         foreach {top main side lbl} [MakeScrollTable $rightfr] {}
 
-        button $top.alabel1 -text "Atom 1 "
-        button $top.alabel2 -text "Atom 2 "
-        label  $top.rlabel1 -text "Restraint"
-        label  $top.rlabel2 -text "esd"
-
-        grid $top.alabel1 -column 1 -row 2
-        grid $top.alabel2 -column 2 -row 2
+        set atom1_state  1
+        set atom2_state  1
+
+        button $top.alabel1 -text "Atom 1"    -width 6 -anchor center \
+               -command "SR_Sort atom1 $main $top.alabel1 $top.alabel2 {}"
+
+        button $top.alabel2 -text "Atom 2"   -width 6  -anchor center \
+               -command "SR_Sort atom2 $main $top.alabel1 $top.alabel2 {}"
+
+        label  $top.rlabel1 -text "Restraint" -width 9 -anchor center
+        label  $top.rlabel2 -text "esd"       -width 9 -anchor center
+
+        grid $top.alabel1 -column 1 -row 2 -padx 3
+        grid $top.alabel2 -column 2 -row 2 -padx 3
         grid $top.rlabel1 -column 4 -row 2
         grid $top.rlabel2 -column 5 -row 2
@@ -66 +73 @@
 #source c:/gsas/expgui/readexp.tcl
 #source c:/gsas/expgui/gsascmds.tcl
+
+
+
+
 
 #*********************************************************************************************
@@ -176 +187 @@
 # Procedure to sort soft restraints ---------------------------------------------
 #**************************************************************************************
-proc SR_Sort {whichbutton main} {
+proc SR_Sort {whichbutton main alabel1 alabel2 dlabel1} {
 # reset all button labels
-       $::sr_top.alabel1 config -text "Atom 1"
-       $::sr_top.alabel2 config -text "Atom 2"
-       $::sr_top.dlabel1 config -text "Distance"
+       $alabel1 config -text "Atom 1"
+       $alabel2 config -text "Atom 2"
+       if {$dlabel1 != ""} {$dlabel1 config -text "Distance"}
 
        if {$whichbutton == "atom1"} {
@@ -186 +197 @@
              set sr_prsort [lsort -integer -decreasing -index 1 $::sr_bond_list]
 
-             $::sr_top.alabel1 config -text "Atom 1 \u2193"
+             $alabel1 config -text "Atom 1 \u2193"
              } else {
                set sr_prsort [lsort -integer -increasing -index 1 $::sr_bond_list]
-               $::sr_top.alabel1 config -text "Atom 1 \u2191"
+               $alabel1 config -text "Atom 1 \u2191"
           }
           set x [expr $::sr_atom1_button * -1]
@@ -197 +208 @@
           if {$::sr_atom2_button == 1} {
              set sr_prsort [lsort -integer -decreasing -index 2 $::sr_bond_list]
-             $::sr_top.alabel2 config -text "Atom 2 \u2193"
+             $alabel2 config -text "Atom 2 \u2193"
              } else {
                set sr_prsort [lsort -integer -increasing -index 2 $::sr_bond_list]
-               $::sr_top.alabel2 config -text "Atom 2 \u2191"
+               $alabel2 config -text "Atom 2 \u2191"
           }
           set x [expr $::sr_atom2_button * -1]
@@ -208 +219 @@
              puts "distance"
              set sr_prsort [lsort -increasing -index 8 $::sr_bond_list]
-             $::sr_top.dlabel1 config -text "Distance \u2193"
+             $dlabel1 config -text "Distance \u2193"
              } else {
                set sr_prsort [lsort -decreasing -index 8 $::sr_bond_list]
-               $::sr_top.dlabel1 config -text "Distance \u2191"
+               $dlabel1 config -text "Distance \u2191"
          }
          set x [expr $::sr_distance_button * -1]
@@ -233 +244 @@
 set     ::contraintmainbox $main
 
-button $::sr_top.alabel1 -text "Atom 1 "   -command "SR_Sort atom1 $main"
-button $::sr_top.alabel2 -text "Atom 2 "   -command "SR_Sort atom2 $main"
-button $::sr_top.dlabel1 -text "Distance " -command "SR_Sort distance $main"
+button $::sr_top.alabel1 -text "Atom 1 "   \
+       -command "SR_Sort atom1 $main $::sr_top.alabel1 $::sr_top.alabel2 $::sr_top.dlabel1"
+button $::sr_top.alabel2 -text "Atom 2 " \
+       -command "SR_Sort atom2 $main $::sr_top.alabel1 $::sr_top.alabel2 $::sr_top.dlabel1"
+button $::sr_top.dlabel1 -text "Distance " \
+       -command "SR_Sort distance $main $::sr_top.alabel1 $::sr_top.alabel2 $::sr_top.dlabel1"
 
 grid $::sr_top.alabel1 -column 1 -row 2