Changeset 861

Timestamp:

Mar 1, 2013 2:59:47 PM (10 years ago)

Author:

vondreele

Message:

more rigid body stuff

File:

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

trunk/GSASIIphsGUI.py

@@ -1664 +1664 @@
 ################################################################################
             
-    def UpdateDrawAtoms():
+    def UpdateDrawAtoms(atomStyle=''):
         G2frame.dataFrame.SetStatusText('')
         generalData = data['General']
@@ -1671 +1671 @@
         cx,ct,cs,ci = drawingData['atomPtrs']
         atomData = drawingData['Atoms']
+        if atomStyle:
+            for atom in atomData:
+                atom[cs] = atomStyle
         Types = [wg.GRID_VALUE_STRING,wg.GRID_VALUE_STRING,]+3*[wg.GRID_VALUE_FLOAT+':10,5',]+ \
             [wg.GRID_VALUE_STRING,wg.GRID_VALUE_CHOICE+": ,lines,vdW balls,sticks,balls & sticks,ellipsoids,polyhedra",
@@ -3136 +3139 @@
                     for i,id in enumerate(RBObj['Ids']):
                         data['Atoms'][AtLookUp[id]][cx:cx+3] = newXYZ[i]
-                    UpdateDrawAtoms()
+                    data['Drawing']['Atoms'] = []
+                    UpdateDrawAtoms('balls & sticks')
                     G2plt.PlotStructure(G2frame,data)
                 except ValueError:
@@ -3161 +3165 @@
                     for i,id in enumerate(RBObj['Ids']):
                         data['Atoms'][AtLookUp[id]][cx:cx+3] = newXYZ[i]
-                    UpdateDrawAtoms()
+                    data['Drawing']['Atoms'] = []
+                    UpdateDrawAtoms('balls & sticks')
                     G2plt.PlotStructure(G2frame,data)
                 except ValueError:
@@ -3219 +3224 @@
                 Obj.SetValue("%10.3f"%(RBObj['Torsions'][item][0]))                
                 data['Drawing']['Atoms'] = []
-                UpdateDrawAtoms()
+                UpdateDrawAtoms('balls & sticks')
                 drawAtoms.ClearSelection()
                 G2plt.PlotStructure(G2frame,data)
@@ -3375 +3380 @@
     def OnRBAssign(event):
         
+        G2frame.dataFrame.SetStatusText('')
         RBData = G2frame.PatternTree.GetItemPyData(   
             G2gd.GetPatternTreeItemId(G2frame,G2frame.root,'Rigid bodies'))