Changeset 4597 for trunk

Timestamp:

Oct 16, 2020 11:49:13 AM (5 years ago)

Author:

toby

Message:

add x+y and x+y+z as RB axes; move widget storage

File:

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

trunk/GSASIIphsGUI.py ¶

@@ -10028 +10028 @@
             symAxis = RBObj.get('symAxis')
             if symAxis:
-                if symAxis[0]:
+                if symAxis[0] == symAxis[1] == symAxis[2]:
+                    lbl = 'x+y+z'
+                elif symAxis[0] == symAxis[1] != symAxis[2]:
+                    lbl = 'x+y'
+                elif symAxis[0]:
                     lbl = 'x'
                 elif symAxis[1]:
@@ -10582 +10586 @@
                     i for i,a in enumerate(data['Atoms']) if a[0] == cryatom]
                 G2plt.PlotStructure(G2frame,data,False,UpdateTable)
-                data['testRBObj']['showSelect'].SetLabelText(cryatom)
+                misc['showSelect'].SetLabelText(cryatom)
             def OnSymRadioSet(event):
                 '''Set the symmetry axis for the body as 
@@ -10589 +10593 @@
                 access this so the default value is None. 
                 '''
-                data['testRBObj']['rbObj']['symAxis'] = (None,[1,0,0],[0,1,0],[0,0,1])[event.GetEventObject().GetSelection()]
+                axis = (None,[1,0,0],[0,1,0],[0,0,1],[1,1,0],[1,1,1]
+                    )[event.GetEventObject().GetSelection()]
+                if axis:
+                    axis = np.array(axis)/nl.norm(axis)
+                data['testRBObj']['rbObj']['symAxis'] = axis
                 UpdateTablePlot()                
             showAtom = [None]
@@ -10600 +10608 @@
 
             # Start of Draw()
+            RBdirlbl = ['x','y','z','x+y','x+y+z']
             if not data['testRBObj']: return
             if RigidBodies.GetSizer(): RigidBodies.GetSizer().Clear(True)
@@ -10638 +10647 @@
             OriSizer.Add(wx.StaticText(RigidBodies,wx.ID_ANY,'Origin: '),0,WACV)
             Xsizers = []
-            lbl = 'xyz'
             for ix in range(3):
-                OriSizer.Add(wx.StaticText(RigidBodies,wx.ID_ANY,lbl[ix]),0,WACV,4)
+                OriSizer.Add(wx.StaticText(RigidBodies,wx.ID_ANY,RBdirlbl[ix]),
+                                 0,WACV,4)
                 origX = G2G.ValidatedTxtCtrl(RigidBodies,rbObj['Orig'][0],ix,nDig=(10,5),
                     xmin=-1.5,xmax=1.5,typeHint=float,OnLeave=UpdateTablePlot)
@@ -10691 +10700 @@
             OriSizer.Add(wx.StaticText(RigidBodies,wx.ID_ANY,
                                     'Rigid body symmetry axis: '),0, WACV)
-            choices = ['None','x','y','z']
+            choices = ['None']+RBdirlbl
             symRadioSet = wx.RadioBox(RigidBodies,wx.ID_ANY,choices=choices)
             symRadioSet.Bind(wx.EVT_RADIOBOX, OnSymRadioSet)
@@ -10794 +10803 @@
             hSizer = wx.BoxSizer(wx.HORIZONTAL)
             hSizer.Add(wx.StaticText(RigidBodies,wx.ID_ANY,'Crystal Highlight: '))
-            data['testRBObj']['showSelect'] = G2G.G2ChoiceButton(RigidBodies,
+            misc['showSelect'] = G2G.G2ChoiceButton(RigidBodies,
                 data['testRBObj']['availAtoms'],None,None,showAtom,0,showCryAtom,size=(75,-1))
-            hSizer.Add(data['testRBObj']['showSelect'])
+            hSizer.Add(misc['showSelect'])
             btnSizer.Add(hSizer)
             btnSizer.Add((-1,20))
@@ -12761 +12770 @@
     global rbAtmDict   
     rbAtmDict = {}
+    misc = {}
     PhaseName = G2frame.GPXtree.GetItemText(Item)
     G2gd.SetDataMenuBar(G2frame)
@@ -12838 +12848 @@
                 if data['Atoms'][I][0] in data['testRBObj']['availAtoms']:
                     data['testRBObj']['CRYhighLight'] = [I]
-                    data['testRBObj']['showSelect'].SetLabelText(data['Atoms'][I][0])
+                    misc['showSelect'].SetLabelText(data['Atoms'][I][0])
                     break
         G2plt.PlotStructure(G2frame,data,False,data['testRBObj']['UpdateTable'])