Changeset 2177


Ignore:
Timestamp:
Mar 17, 2016 3:00:50 PM (6 years ago)
Author:
vondreele
Message:

add ranges to Sadp plots

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIgrid.py

    r2175 r2177  
    504504        self.planeChoice = ['h0l','0kl','hhl','h-hl',]
    505505        self.lmax = '2'
    506         self.lmaxChoice = ['1','2','3','4','5',]
     506        self.lmaxChoice = [str(i+1) for i in range(6)]
    507507        self.mult = '2'
    508         self.multChoice = ['1','2','3','4','5','6','7','8','9',]
     508        self.multChoice = [str(i+1) for i in range(15)]
    509509        self.Draw()
    510510       
     
    578578            return '0\n0\n4\n1\n%d\n%d\n16\n1\n%d\n0\nend\n'%    \
    579579                (self.planeChoice.index(self.plane)+1,self.lmaxChoice.index(self.lmax)+1,
    580                 self.multChoice.index(self.mult)+1),self.plane
     580                self.multChoice.index(self.mult)+1),self.plane,self.lmax
    581581
    582582    def OnOk(self,event):
  • trunk/GSASIIphsGUI.py

    r2176 r2177  
    24252425            import pylab as pl
    24262426            labels = Layers['Sadp']['Plane']
    2427             pl.imshow(Layers['Sadp']['Img'],aspect='equal')
     2427            lmax = float(Layers['Sadp']['Lmax'])
     2428            pl.imshow(Layers['Sadp']['Img'],aspect='auto',extent=[-lmax,lmax,-lmax,lmax])
    24282429            pl.ylabel(labels[-1])
    24292430            pl.xlabel(labels[:-1])
     
    28802881        dlg = G2gd.DIFFaXcontrols(G2frame,ctrls)
    28812882        if dlg.ShowModal() == wx.ID_OK:
    2882             ctrls,plane = dlg.GetSelection()
     2883            ctrls,plane,lmax = dlg.GetSelection()
    28832884            data['Layers']['Sadp'] = {}
    28842885            data['Layers']['Sadp']['Plane'] = plane
     2886            data['Layers']['Sadp']['Lmax'] = lmax
    28852887        else:
    28862888            return
Note: See TracChangeset for help on using the changeset viewer.