Changeset 2745

Timestamp:

Mar 6, 2017 2:12:32 PM (6 years ago)

Author:

vondreele

Message:

fixes to SetPhaseWindow? so scroll is over entire range of grids & windows have useful min size
fix to OnAtQPick in rigid body selection to handle parallel/antiparallel RBs & target atoms

Location:

trunk

Files:

• GSASIIddataGUI.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (8 diffs)

trunk/GSASIIddataGUI.py

@@ -1012 +1012 @@
                       0,WACV|wx.TOP,10)
         
-    G2phsGUI.SetPhaseWindow(G2frame.dataFrame,DData,mainSizer,Scroll)
+    G2phsGUI.SetPhaseWindow(G2frame.dataFrame,DData,mainSizer,Scroll=Scroll)

trunk/GSASIIphsGUI.py

@@ -67 +67 @@
 atan2d = lambda x,y: 180.*np.arctan2(y,x)/np.pi
 
-def SetPhaseWindow(mainFrame,phasePage,mainSizer=None,Size=None,Scroll=0):
+def SetPhaseWindow(mainFrame,phasePage,mainSizer=None,size=None,Scroll=0):
     if not mainSizer is None: 
         phasePage.SetSizer(mainSizer)
         Size = mainSizer.GetMinSize()
+    else:
+        Size = phasePage.GetBestSize()
     Size[0] += 40
-    Size[1] = min(Size[1]+ 150,500) 
     phasePage.SetScrollbars(10,10,Size[0]/10-4,Size[1]/10-1)
     phasePage.Scroll(0,Scroll)
-    Size[1] = min(500,Size[1])
-    mainFrame.setSizePosLeft(Size)
+    if size is None:
+        Size[1] = min(Size[1]+ 150,500) 
+#        Size[1] = min(500,Size[1])
+        mainFrame.setSizePosLeft(Size)
+    else:
+        size[1] = min(500,size[1])
+        mainFrame.setSizePosLeft(size)
     
 def FindBondsDraw(data):    
@@ -1359 +1365 @@
             mainSizer.Add(MCSASizer())
         G2frame.dataFrame.SetStatusText('')
-        SetPhaseWindow(G2frame.dataFrame,General,mainSizer,Scroll)
+        SetPhaseWindow(G2frame.dataFrame,General,mainSizer,Scroll=Scroll)
         
     def OnTransform(event):
@@ -1784 +1790 @@
                             Atoms.SetCellStyle(row,c,VERY_LIGHT_GREY,True)
             Atoms.AutoSizeColumns(False)
-            SetPhaseWindow(G2frame.dataFrame,Atoms,Size=[700,300])
+            SetPhaseWindow(G2frame.dataFrame,Atoms,size=[700,300])
 
         # FillAtomsGrid executable code starts here
@@ -4205 +4211 @@
            if colLabels[c] not in ['Style','Label','Color']:
                 drawAtoms.SetColAttr(c,attr)
-        SetPhaseWindow(G2frame.dataFrame,drawAtoms,Size=[600,300])
+        SetPhaseWindow(G2frame.dataFrame,drawAtoms,size=[600,300])
 
         FindBondsDraw(data)
@@ -6230 +6236 @@
                 data['testRBObj']['AtNames'] = AtNames
                 data['testRBObj']['rbObj'] = {'Orig':[[0,0,0],False],
-                    'Orient':[[0.,0.,0.,1.],' '],'Ids':[],'RBId':rbId,'Torsions':[],
+                    'Orient':[[0.,0.,0.,0.],' '],'Ids':[],'RBId':rbId,'Torsions':[],
                     'numChain':'','RBname':RBData[rbType][rbId]['RBname']}
                 data['testRBObj']['torAtms'] = []                
@@ -6295 +6301 @@
                 VBC = np.inner(Amat,np.array(atomData[atInd[2]][cx:cx+3]-Orig))
                 VCC = np.cross(VAR,VAC)
-                QuatA = G2mth.makeQuat(VAR,VAC,VCC)[0]
-                VAR = G2mth.prodQVQ(QuatA,VAR)
-                VBR = G2mth.prodQVQ(QuatA,VBR)
-                QuatB = G2mth.makeQuat(VBR,VBC,VAR)[0]
-                QuatC = G2mth.prodQQ(QuatB,QuatA)
+                if nl.norm(VCC) > 1e-7:
+                    QuatA = G2mth.makeQuat(VAR,VAC,VCC)[0]
+                    VAR = G2mth.prodQVQ(QuatA,VAR)
+                    VBR = G2mth.prodQVQ(QuatA,VBR)
+                    QuatB = G2mth.makeQuat(VBR,VBC,VAR)[0]
+                    QuatC = G2mth.prodQQ(QuatB,QuatA)
+                else:                               #parallel/antiparallel
+                    if np.dot(VAR,VAC)/(nl.norm(VAR)*nl.norm(VAC)) > 1e-7:  #no rotation
+                        QuatC = G2mth.AVdeg2Q(0.,[0.,0.,1.])
+                    else:
+                        QuatC = G2mth.AVdeg2Q(180.,VBR+VBC)
                 data['testRBObj']['rbObj']['Orient'] = [QuatC,' ']
                 for x,item in zip(QuatC,Osizers):
@@ -7237 +7249 @@
             G2frame.PawleyRefl.SetMargins(0,0)
             G2frame.PawleyRefl.AutoSizeColumns(False)
-            SetPhaseWindow(G2frame.dataFrame,G2frame.PawleyRefl,Size=[450,300])
+            SetPhaseWindow(G2frame.dataFrame,G2frame.PawleyRefl,size=[450,300])
                     
     def OnPawleySet(event):
@@ -7538 +7550 @@
             MapPeaks.SetMargins(0,0)
             MapPeaks.AutoSizeColumns(False)
-            SetPhaseWindow(G2frame.dataFrame,MapPeaks,Size=[440,300])
+            SetPhaseWindow(G2frame.dataFrame,MapPeaks,size=[440,300])
                     
     def OnPeaksMove(event):