Changeset 756

Timestamp:

Sep 11, 2012 2:28:29 PM (11 years ago)

Author:

vondreele

Message:

change display of density maps - now faster
implement a view direction command (not succcessfuly so far)

Location:

trunk

Files:

• GSASIIphsGUI.py (modified) (2 diffs)
• GSASIIplot.py (modified) (6 diffs)

trunk/GSASIIphsGUI.py

@@ -39 +39 @@
                 'rho':[],'rhoMax':0.,'mapSize':10.0,'cutOff':50.,'Flip':False}
 # trig functions in degrees
-sind = lambda x: math.sin(x*math.pi/180.)
-tand = lambda x: math.tan(x*math.pi/180.)
-cosd = lambda x: math.cos(x*math.pi/180.)
-asind = lambda x: 180.*math.asin(x)/math.pi
+sind = lambda x: np.sin(x*np.pi/180.)
+tand = lambda x: np.tan(x*np.pi/180.)
+cosd = lambda x: np.cos(x*np.pi/180.)
+asind = lambda x: 180.*np.arcsin(x)/np.pi
+acosd = lambda x: 180.*np.arccos(x)/np.pi
 
 class SymOpDialog(wx.Dialog):
@@ -2581 +2582 @@
                 
             def OnViewDir(event):
+                event.Skip()
                 Obj = event.GetEventObject()
                 viewDir = Obj.GetValue().split()
                 try:
-                    VD = [float(viewDir[i]) for i in range(3)]
+                    Amat,Bmat = G2lat.cell2AB(generalData['Cell'][1:7])
+                    VD = np.array([float(viewDir[i]) for i in range(3)])
+#                    VD = np.inner(Amat,VD)
+                    VD /= np.sqrt(np.sum(VD**2))
+                    V = np.array(drawingData['viewDir'])
+#                    V = np.inner(Amat,V)
+                    V /= np.sqrt(np.sum(V**2))
+                    A = acosd(np.sum(V*VD))
+                    VX = np.cross(V,VD)
+                    QV = G2mth.AVdeg2Q(A,VX)
+                    Q = drawingData['Quaternion']
+                    drawingData['Quaternion'] = G2mth.prodQQ(Q,QV)
                 except (ValueError,IndexError):
                     VD = drawingData['viewDir']
                 Obj.SetValue('%.3f %.3f %.3f'%(VD[0],VD[1],VD[2]))
-                drawingData['viewDir'] = VP
+                drawingData['viewDir'] = VD
                 G2plt.PlotStructure(G2frame,data)
                                 

trunk/GSASIIplot.py

@@ -2391 +2391 @@
         if key in ['C']:
             drawingData['viewPoint'] = [[.5,.5,.5],[0,0]]
-            VD = np.inner(Bmat,np.array([0,0,1]))
-            VD /= np.sqrt(np.sum(VD**2))
-            drawingData['viewDir'] = VD
+            drawingData['viewDir'] = [0.,0.,1]
             drawingData['oldxy'] = []
             drawingData['Quaternion'] = [0.0,0.0,1.0,0.0]
@@ -2737 +2735 @@
         glPopMatrix()
         
+    def RenderDots(XYZ,RC):
+        glEnable(GL_COLOR_MATERIAL)
+        XYZ = np.array(XYZ)
+        glPushMatrix()
+        for xyz,rc in zip(XYZ,RC):
+            x,y,z = xyz
+            r,c = rc
+            glColor3ubv(c)
+            glPointSize(r*50)
+            glBegin(GL_POINTS)
+            glVertex3fv(xyz)
+            glEnd()
+        glPopMatrix()
+        glColor4ubv([0,0,0,0])
+        glDisable(GL_COLOR_MATERIAL)
+        
     def RenderSmallSphere(x,y,z,radius,color):
         glMaterialfv(GL_FRONT_AND_BACK,GL_DIFFUSE,color)
@@ -2745 +2759 @@
         gluSphere(q,radius,4,2)
         glPopMatrix()
-        
+                
     def RenderEllipsoid(x,y,z,ellipseProb,E,R4,color):
         s1,s2,s3 = E
@@ -2849 +2863 @@
     def RenderMap(rho,rhoXYZ,indx,Rok):
         cLevel = drawingData['contourLevel']
+        XYZ = []
+        RC = []
         for i,xyz in enumerate(rhoXYZ):
             if not Rok[i]:
@@ -2857 +2873 @@
                     alpha = (abs(rho[I,J,K])/mapData['rhoMax']-cLevel)/(1.-cLevel)
                 if rho[I,J,K] < 0.:
-                    RenderSmallSphere(x,y,z,0.1*alpha,Rd)
+                    XYZ.append(xyz)
+                    RC.append([0.1*alpha,Rd])
                 else:
-                    RenderSmallSphere(x,y,z,0.1*alpha,Gr)
+                    XYZ.append(xyz)
+                    RC.append([0.1*alpha,Gr])
+        RenderDots(XYZ,RC)
                             
     def Draw():
@@ -3052 +3071 @@
     Page.SetFocus()
     if mapData['Flip']:
+        choice = [' save as/key:','jpeg','tiff','bmp','u: roll up','d: roll down','l: roll left','r: roll right']
+    else:
         choice = [' save as/key:','jpeg','tiff','bmp','c: center on 1/2,1/2,1/2','n: next','p: previous']
-    else:
-        choice = [' save as/key:','jpeg','tiff','bmp','u: roll up','d: roll down','l: roll left','r: roll right']
     cb = wx.ComboBox(G2frame.G2plotNB.status,style=wx.CB_DROPDOWN|wx.CB_READONLY,choices=choice)
     cb.Bind(wx.EVT_COMBOBOX, OnKeyBox)