Changeset 4041

Timestamp:

Jun 26, 2019 11:12:23 AM (4 years ago)

Author:

vondreele

Message:

fix issues with rigid body GUI controls - mostly proper assignment of rbId

File:

• trunk/GSASIIconstrGUI.py (modified) (8 diffs)

trunk/GSASIIconstrGUI.py

@@ -1730 +1730 @@
             print ('Rigid body UNKRB added')
         text.close()
-        UpdateResidueRB(rbId)
+        UpdateResidueRB()
         
     def FindNeighbors(Orig,XYZ,atTypes,atNames,AtInfo):
@@ -1796 +1796 @@
             rbData['rbSeq'].append([Orig,Piv,0.0,Riding])            
         dlg.Destroy()
-        UpdateResidueRB(rbId)
+        UpdateResidueRB()
 
     def UpdateVectorRB(Scroll=0):
@@ -2011 +2011 @@
         VectorRB.Scroll(0,Scroll)
         
-    def UpdateResidueRB(rbId=0):
+    def UpdateResidueRB():
         '''Draw the contents of the Residue Rigid Body tab for Rigid Bodies tree entry
         '''
+        global rbId
         def rbNameSizer(rbId,rbData):
 
@@ -2019 +2020 @@
                 Obj = event.GetEventObject()
                 rbData['RBname'] = Obj.GetValue()
-                wx.CallAfter(UpdateResidueRB,rbId)
+                wx.CallAfter(UpdateResidueRB)
                 
             def OnDelRB(event):
@@ -2045 +2046 @@
                     rbData['rbXYZ'] = newXYZ
                 G2plt.PlotRigidBody(G2frame,'Residue',AtInfo,rbData,plotDefaults)
-                wx.CallAfter(UpdateResidueRB,rbId)
+                wx.CallAfter(UpdateResidueRB)
                     
             def OnPlotRB(event):
@@ -2226 +2227 @@
                 rbId,Seq = Indx[Obj.GetId()]
                 data['Residue'][rbId]['rbSeq'].remove(Seq)        
-                wx.CallAfter(UpdateResidueRB,rbId)
+                wx.CallAfter(UpdateResidueRB)
             
             seqSizer = wx.FlexGridSizer(0,5,2,2)
@@ -2299 +2300 @@
                 
         def OnSelect(event):
+            global rbId
             rbname = rbchoice[select.GetSelection()]
             rbId = RBnames[rbname]
-            wx.CallLater(100,UpdateResidueRB,rbId)
+            wx.CallLater(100,UpdateResidueRB)
             
         #----- beginning of UpdateResidueRB -----------------------------------------------
@@ -2333 +2335 @@
             selSizer.Add(select,0)
             ResidueRBSizer.Add(selSizer,0)
-        if not rbId:
+        try:
+            if not rbId:
+                rbId = RBnames[rbchoice[0]]
+        except NameError:
             rbId = RBnames[rbchoice[0]]
         rbData = data['Residue'][rbId]