Changeset 2583 for trunk/GSASIIconstrGUI.py

Timestamp:

Dec 15, 2016 2:50:36 PM (5 years ago)

Author:

vondreele

Message:

put default 'Plane' into drawing Data from old gpx files
fix frame display issues for rigid bodies

File:

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

trunk/GSASIIconstrGUI.py

@@ -1076 +1076 @@
         Size[1] = min(500,Size[1])
         G2frame.dataFrame.setSizePosLeft(Size)
-#        G2frame.dataFrame.SetSize((500,250)) # set frame size here
 
     def OnPageChanged(event):
@@ -1612 +1611 @@
                 Obj = event.GetEventObject()
                 rbId = Indx[Obj.GetId()]
-                del data['Vector'][rbId]
-                data['RBIds']['Vector'].remove(rbId)
-                rbData['useCount'] -= 1
+                if rbId in data['Vector']:
+                    del data['Vector'][rbId]
+                    data['RBIds']['Vector'].remove(rbId)
+                    rbData['useCount'] -= 1
                 wx.CallAfter(UpdateVectorRB)
                 
@@ -1800 +1800 @@
         VectorRBDisplay.SetSizer(VectorRBSizer,True)
         Size = VectorRBSizer.GetMinSize()
-#        Size[0] += 40
-#        Size[1] = max(Size[1],450) + 20
+        Size[0] += 40
+        Size[1] = max(Size[1],450) + 20
         VectorRBDisplay.SetSize(Size)
         VectorRB.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
@@ -1822 +1822 @@
                 Obj = event.GetEventObject()
                 rbId = Indx[Obj.GetId()]
-                del data['Residue'][rbId]
-                data['RBIds']['Residue'].remove(rbId)
+                if rbId in data['Residue']: 
+                    del data['Residue'][rbId]
+                    data['RBIds']['Residue'].remove(rbId)
                 wx.CallAfter(UpdateResidueRB)
                 
@@ -2060 +2061 @@
         #ResidueRB.DestroyChildren() # bad, deletes scrollbars on Mac!
         if ResidueRB.GetSizer():
-            ResidueRB.GetSizer().Clear(True)
+            ResidueRB.DestroyChildren()
+#            ResidueRB.GetSizer().Clear(True)
+            
         ResidueRBDisplay = wx.Panel(ResidueRB)
         ResidueRBSizer = wx.BoxSizer(wx.VERTICAL)
@@ -2085 +2088 @@
         ResidueRBDisplay.SetSizer(ResidueRBSizer,True)
         Size = ResidueRBSizer.GetMinSize()
-#        Size[0] += 40
-#        Size[1] = max(Size[1],450) + 20
+        Size[0] += 40
+        Size[1] = max(Size[1],450) + 20
         ResidueRBDisplay.SetSize(Size)
         ResidueRB.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)