Changeset 1633 for trunk/GSASIIphsGUI.py
 Timestamp:
 Jan 22, 2015 10:09:11 AM (8 years ago)
 File:

 1 edited
Legend:
 Unmodified
 Added
 Removed

trunk/GSASIIphsGUI.py
r1629 r1633 2081 2081 waveSizer.Add(waveHead) 2082 2082 if len(waveBlk): 2083 CSI = G2spc.GetSSfxuinel(xyz,uij,SGData,SSGData)2084 2083 for iwave,wave in enumerate(waveBlk): 2084 if not iwave: 2085 CSI = G2spc.GetSSfxuinel(waveType,xyz,uij,SGData,SSGData) 2086 else: 2087 CSI = G2spc.GetSSfxuinel('Fourier',xyz,uij,SGData,SSGData) 2085 2088 waveName = 'Fourier' 2086 2089 if Stype == 'Sfrac': … … 2190 2193 if generalData['Type'] != 'magnetic' and Stype == 'Smag': 2191 2194 break 2192 mainSizer.Add(WaveSizer(atom[1][SS]['waveType'],atom[1][SS][Stype],Stype,typeNames[Stype],Labels[Stype])) 2193 2195 mainSizer.Add(WaveSizer(atom[1][SS]['waveType'],atom[1][SS][Stype],Stype,typeNames[Stype],Labels[Stype])) 2194 2196 SetPhaseWindow(G2frame.dataFrame,waveData,mainSizer) 2195 2197 … … 2198 2200 mapData = generalData['4DmapData'] 2199 2201 reflName = mapData['RefList'] 2202 generalData['Map']['Flip'] = False 2200 2203 if not reflName: 2201 2204 G2frame.ErrorDialog('Fourier map','No reflections defined for Fourier map') … … 5034 5037 screenSize = wx.ClientDisplayRect() 5035 5038 Size = pgbar.GetSize() 5036 Size = (int(Size[0]*1.2),Size[1]) # increase size a bit along x5037 pgbar.SetPosition(wx.Point(screenSize[2]Size[0]305,screenSize[1]+5))5038 pgbar.SetSize(Size)5039 if 50 < Size[0] < 500: # sanity check on size, since this fails w/Win & wx3.0 5040 pgbar.SetSize((int(Size[0]*1.2),Size[1])) # increase size a bit along x 5041 pgbar.SetPosition(wx.Point(screenSize[2]Size[0]305,screenSize[1]+5)) 5039 5042 else: 5040 5043 pgbar = None … … 5626 5629 screenSize = wx.ClientDisplayRect() 5627 5630 Size = pgbar.GetSize() 5628 Size = (int(Size[0]*1.2),Size[1]) # increase size a bit along x5629 pgbar.SetPosition(wx.Point(screenSize[2]Size[0]305,screenSize[1]+5))5630 pgbar.SetSize(Size)5631 if 50 < Size[0] < 500: # sanity check on size, since this fails w/Win & wx3.0 5632 pgbar.SetSize((int(Size[0]*1.2),Size[1])) # increase size a bit along x 5633 pgbar.SetPosition(wx.Point(screenSize[2]Size[0]305,screenSize[1]+5)) 5631 5634 try: 5632 5635 newMap,new4Dmap = G2mth.SSChargeFlip(data,reflDict,pgbar) … … 5674 5677 screenSize = wx.ClientDisplayRect() 5675 5678 Size = pgbar.GetSize() 5676 Size = (int(Size[0]*1.2),Size[1]) # increase size a bit along x5677 pgbar.SetPosition(wx.Point(screenSize[2]Size[0]305,screenSize[1]+5))5678 pgbar.SetSize(Size)5679 if 50 < Size[0] < 500: # sanity check on size, since this fails w/Win & wx3.0 5680 pgbar.SetSize((int(Size[0]*1.2),Size[1])) # increase size a bit along x 5681 pgbar.SetPosition(wx.Point(screenSize[2]Size[0]305,screenSize[1]+5)) 5679 5682 try: 5680 5683 mapData.update(G2mth.ChargeFlip(data,reflDict,pgbar))
Note: See TracChangeset
for help on using the changeset viewer.