Changeset 2177

Timestamp:

Mar 17, 2016 3:00:50 PM (8 years ago)

Author:

vondreele

Message:

add ranges to Sadp plots

Location:

trunk

Files:

• GSASIIgrid.py (modified) (2 diffs)
• GSASIIphsGUI.py (modified) (2 diffs)

trunk/GSASIIgrid.py

@@ -504 +504 @@
         self.planeChoice = ['h0l','0kl','hhl','h-hl',]
         self.lmax = '2'
-        self.lmaxChoice = ['1','2','3','4','5',]
+        self.lmaxChoice = [str(i+1) for i in range(6)]
         self.mult = '2'
-        self.multChoice = ['1','2','3','4','5','6','7','8','9',]
+        self.multChoice = [str(i+1) for i in range(15)]
         self.Draw()
         
@@ -578 +578 @@
             return '0\n0\n4\n1\n%d\n%d\n16\n1\n%d\n0\nend\n'%    \
                 (self.planeChoice.index(self.plane)+1,self.lmaxChoice.index(self.lmax)+1,
-                self.multChoice.index(self.mult)+1),self.plane
+                self.multChoice.index(self.mult)+1),self.plane,self.lmax
 
     def OnOk(self,event):

trunk/GSASIIphsGUI.py

@@ -2425 +2425 @@
             import pylab as pl
             labels = Layers['Sadp']['Plane']
-            pl.imshow(Layers['Sadp']['Img'],aspect='equal')
+            lmax = float(Layers['Sadp']['Lmax'])
+            pl.imshow(Layers['Sadp']['Img'],aspect='auto',extent=[-lmax,lmax,-lmax,lmax])
             pl.ylabel(labels[-1])
             pl.xlabel(labels[:-1])
@@ -2880 +2881 @@
         dlg = G2gd.DIFFaXcontrols(G2frame,ctrls)
         if dlg.ShowModal() == wx.ID_OK:
-            ctrls,plane = dlg.GetSelection()
+            ctrls,plane,lmax = dlg.GetSelection()
             data['Layers']['Sadp'] = {}
             data['Layers']['Sadp']['Plane'] = plane
+            data['Layers']['Sadp']['Lmax'] = lmax
         else:
             return