Changeset 3296

Timestamp:

Feb 22, 2018 1:16:19 PM (5 years ago)

Author:

vondreele

Message:

add selection for mustain, size & 3D pole distribution projections

Location:

trunk

Files:

• GSASIIddataGUI.py (modified) (2 diffs)
• GSASIIphsGUI.py (modified) (3 diffs)
• GSASIIplot.py (modified) (2 diffs)

trunk/GSASIIddataGUI.py

@@ -71 +71 @@
             h,k,l = hkl
             Obj.SetValue('%3d %3d %3d'%(h,k,l)) 
+            G2plt.PlotSizeStrainPO(G2frame,data,G2frame.hist)
+            
+        def OnProj(event):
+            Obj = event.GetEventObject()
+            generalData['3Dproj'] = Obj.GetValue()
             G2plt.PlotSizeStrainPO(G2frame,data,G2frame.hist)
         
@@ -89 +94 @@
             POhklSizer.Add(poAxis,0,WACV)
             plotSizer.Add(POhklSizer)
-        elif generalData['Data plot type'] == 'Inv. pole figure':
-            pass    #might need something here?      
+        elif generalData['Data plot type'] in ['Mustrain','Size']:
+            projSizer = wx.BoxSizer(wx.HORIZONTAL)
+            projSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Show projections for: '),0,WACV)
+            proj = ['','x','y','z','xy','xz','yz','xyz']
+            projType = wx.ComboBox(DData,wx.ID_ANY,value=generalData['3Dproj'],choices=proj,
+                style=wx.CB_READONLY|wx.CB_DROPDOWN)
+            projType.Bind(wx.EVT_COMBOBOX, OnProj)
+            projSizer.Add(projType,0,WACV)
+            plotSizer.Add(projSizer)            
         return plotSizer
        

trunk/GSASIIphsGUI.py

@@ -1153 +1153 @@
         if 'Pawley neg wt' not in generalData:
             generalData['Pawley neg wt'] = 0.0
+        if '3Dproj' not in generalData:
+            generalData['3Dproj'] = ''
         if 'Algolrithm' in generalData.get('MCSA controls',{}) or \
             'MCSA controls' not in generalData:
@@ -6300 +6302 @@
             shToler = G2G.ValidatedTxtCtrl(Texture,Penalty,1,nDig=(10,2),min=0.001)
             shPenalty.Add(shToler,0,WACV)
-            return shPenalty    
+            return shPenalty
+        
+        def OnProj(event):
+            Obj = event.GetEventObject()
+            generalData['3Dproj'] = Obj.GetValue()
+            wx.CallAfter(G2plt.PlotTexture,G2frame,data)            
         
         # UpdateTexture executable starts here
@@ -6394 +6401 @@
             else:
                 PTSizer.Add((0,5),0)
+        elif '3D' in textureData['PlotType']:
+            PTSizer.Add(wx.StaticText(Texture,-1,' Show projections for: '),0,WACV)
+            proj = ['','x','y','z','xy','xz','yz','xyz']
+            projType = wx.ComboBox(Texture,wx.ID_ANY,value=generalData['3Dproj'],choices=proj,
+                style=wx.CB_READONLY|wx.CB_DROPDOWN)
+            projType.Bind(wx.EVT_COMBOBOX, OnProj)
+            PTSizer.Add(projType,0,WACV)
+            PTSizer.Add((0,5),0)
+            
         if textureData['PlotType'] in ['Pole figure','Axial pole distribution','3D pole distribution']:
             PTSizer.Add(wx.StaticText(Texture,-1,' Pole figure HKL: '),0,WACV)

trunk/GSASIIplot.py

@@ -4039 +4039 @@
             xyzlim = np.array([Plot.get_xlim3d(),Plot.get_ylim3d(),Plot.get_zlim3d()]).T
             XYZlim = [min(xyzlim[0]),max(xyzlim[1])]
-            Plot.contour(X,Y,Z,10,zdir='x',offset=XYZlim[0])
-            Plot.contour(X,Y,Z,10,zdir='y',offset=XYZlim[1])
-            Plot.contour(X,Y,Z,10,zdir='z',offset=XYZlim[0])
+            if 'x' in generalData['3Dproj']: Plot.contour(X,Y,Z,10,zdir='x',offset=XYZlim[0])
+            if 'y' in generalData['3Dproj']: Plot.contour(X,Y,Z,10,zdir='y',offset=XYZlim[1])
+            if 'z' in generalData['3Dproj']: Plot.contour(X,Y,Z,10,zdir='z',offset=XYZlim[0])
             Plot.set_xlim3d(XYZlim)
             Plot.set_ylim3d(XYZlim)
@@ -4308 +4308 @@
                 xyzlim = np.array([Plot.get_xlim3d(),Plot.get_ylim3d(),Plot.get_zlim3d()]).T
                 XYZlim = [min(xyzlim[0]),max(xyzlim[1])]
-                Plot.contour(X,Y,Z,10,zdir='x',offset=XYZlim[0])
-                Plot.contour(X,Y,Z,10,zdir='y',offset=XYZlim[1])
-                Plot.contour(X,Y,Z,10,zdir='z',offset=XYZlim[0])
+                if 'x' in generalData['3Dproj']: Plot.contour(X,Y,Z,10,zdir='x',offset=XYZlim[0])
+                if 'y' in generalData['3Dproj']: Plot.contour(X,Y,Z,10,zdir='y',offset=XYZlim[1])
+                if 'z' in generalData['3Dproj']: Plot.contour(X,Y,Z,10,zdir='z',offset=XYZlim[0])
                 Plot.set_xlim3d(XYZlim)
                 Plot.set_ylim3d(XYZlim)