Changeset 1378
- Timestamp:
- Jun 11, 2014 3:38:24 PM (9 years ago)
- Location:
- trunk
- Files:
-
- 11 edited
-
GSASII.py (modified) (3 diffs)
-
GSASIIconstrGUI.py (modified) (5 diffs)
-
GSASIIddataGUI.py (modified) (5 diffs)
-
GSASIIexprGUI.py (modified) (1 diff)
-
GSASIIgrid.py (modified) (4 diffs)
-
GSASIIimgGUI.py (modified) (13 diffs)
-
GSASIIphsGUI.py (modified) (17 diffs)
-
GSASIIplot.py (modified) (2 diffs)
-
GSASIIpwdGUI.py (modified) (13 diffs)
-
scanCCD.py (modified) (6 diffs)
-
testDeriv.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASII.py
r1368 r1378 2178 2178 mainSizer.Add((10,10),1) 2179 2179 ncols = len(data)/40+1 2180 dataGridSizer = wx.FlexGridSizer( rows=len(data),cols=ncols,hgap=2,vgap=2)2180 dataGridSizer = wx.FlexGridSizer(cols=ncols,hgap=2,vgap=2) 2181 2181 for id,item in enumerate(self.data): 2182 2182 ckbox = wx.CheckBox(panel,id,item[1]) … … 2229 2229 mainSizer.Add(topLabl,0,wx.ALIGN_CENTER_VERTICAL|wx.LEFT,10) 2230 2230 mainSizer.Add((10,10),1) 2231 dataGridSizer = wx.FlexGridSizer( rows=len(data),cols=2,hgap=2,vgap=2)2231 dataGridSizer = wx.FlexGridSizer(cols=2,hgap=2,vgap=2) 2232 2232 for id,item in enumerate(self.data[:-1]): 2233 2233 name = wx.TextCtrl(panel,-1,item[1],size=wx.Size(200,20)) … … 3362 3362 # end DEBUG 3363 3363 return True 3364 def MacOpenFile(self, filename): 3365 '''Called on Mac every time a file is dropped on the app when it is running, 3366 treat this like a File/Open project menu action. 3367 Should be ignored on other platforms 3368 ''' 3369 # PATCH: Canopy 1.4 script main seems dropped on app; ignore .py files 3370 if os.path.splitext(filename)[1] == '.py': return 3371 # end PATCH 3372 self.main.OnFileOpen(None,filename) 3373 3364 # def MacOpenFile(self, filename): 3365 # '''Called on Mac every time a file is dropped on the app when it is running, 3366 # treat this like a File/Open project menu action. 3367 # Should be ignored on other platforms 3368 # ''' 3369 # # PATCH: Canopy 1.4 script main seems dropped on app; ignore .py files 3370 # print 'MacOpen',filename 3371 # if os.path.splitext(filename)[1] == '.py': return 3372 # # end PATCH 3373 # self.main.OnFileOpen(None,filename) 3374 # removed because this gets triggered when a file is on the command line in canopy 1.4 -- not likely used anyway 3375 3374 3376 def main(): 3375 3377 '''Start up the GSAS-II application''' -
trunk/GSASIIconstrGUI.py
r1359 r1378 112 112 mainSizer.Add(topLabl,0,wx.ALIGN_CENTER_VERTICAL|wx.LEFT,10) 113 113 mainSizer.Add((10,10),1) 114 dataGridSizer = wx.FlexGridSizer( rows=len(data),cols=3,hgap=2,vgap=2)114 dataGridSizer = wx.FlexGridSizer(cols=3,hgap=2,vgap=2) 115 115 self.OkBtn = wx.Button(panel,wx.ID_OK) 116 116 for id in range(len(self.data)): … … 735 735 :returns: wx.Sizer created by method 736 736 ''' 737 constSizer = wx.FlexGridSizer( 1,6,0,0)737 constSizer = wx.FlexGridSizer(0,6,0,0) 738 738 maxlen = 70 # characters before wrapping a constraint 739 739 for Id,item in enumerate(data[name]): … … 1032 1032 resList = [] 1033 1033 plotDefaults = {'oldxy':[0.,0.],'Quaternion':[0.,0.,0.,1.],'cameraPos':30.,'viewDir':[0,0,1],} 1034 1034 1035 1035 def OnPageChanged(event): 1036 1036 global resList … … 1828 1828 G2frame.dataFrame.Bind(wx.EVT_MENU, OnDefineTorsSeq, id=G2gd.wxID_RESIDUETORSSEQ) 1829 1829 G2frame.dataDisplay = G2gd.GSNoteBook(parent=G2frame.dataFrame,size=G2frame.dataFrame.GetClientSize()) 1830 G2frame.dataDisplay.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED, OnPageChanged)1831 1830 1832 1831 VectorRB = wx.ScrolledWindow(G2frame.dataDisplay) … … 1835 1834 G2frame.dataDisplay.AddPage(ResidueRB,'Residue rigid bodies') 1836 1835 UpdateVectorRB() 1836 G2frame.dataDisplay.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED, OnPageChanged) 1837 1837 -
trunk/GSASIIddataGUI.py
r1257 r1378 626 626 parms = zip(['S11','S22','S33','S12','S13','S23'],UseList[item]['Size'][4], 627 627 UseList[item]['Size'][5],range(6)) 628 dataSizer = wx.FlexGridSizer( 1,6,5,5)628 dataSizer = wx.FlexGridSizer(0,6,5,5) 629 629 for Pa,val,ref,id in parms: 630 630 sizeRef = wx.CheckBox(DData,-1,label=Pa) … … 648 648 UseList[item]['Mustrain'][5] = numb*[False,] 649 649 parms = zip(Snames,UseList[item]['Mustrain'][4],UseList[item]['Mustrain'][5],range(numb)) 650 dataSizer = wx.FlexGridSizer( 1,6,5,5)650 dataSizer = wx.FlexGridSizer(0,6,5,5) 651 651 for Pa,val,ref,id in parms: 652 652 strainRef = wx.CheckBox(DData,-1,label=Pa) … … 664 664 665 665 def HstrainSizer(): 666 hstrainSizer = wx.FlexGridSizer( 1,6,5,5)666 hstrainSizer = wx.FlexGridSizer(0,6,5,5) 667 667 Hsnames = G2spc.HStrainNames(SGData) 668 668 parms = zip(Hsnames,UseList[item]['HStrain'][0],UseList[item]['HStrain'][1],range(len(Hsnames))) … … 682 682 683 683 def PoTopSizer(POData): 684 poSizer = wx.FlexGridSizer( 1,6,5,5)684 poSizer = wx.FlexGridSizer(0,6,5,5) 685 685 choice = ['March-Dollase','Spherical harmonics'] 686 686 POtype = choice[['MD','SH'].index(POData[0])] … … 731 731 mainSizer.Add(wx.StaticText(DData,-1,' Spherical harmonic coefficients: '+'Texture index: %.3f'%(textJ)),0,WACV) 732 732 mainSizer.Add((0,5),0) 733 ODFSizer = wx.FlexGridSizer( 2,8,2,2)733 ODFSizer = wx.FlexGridSizer(0,8,2,2) 734 734 ODFIndx = {} 735 735 ODFkeys = POData[5].keys() -
trunk/GSASIIexprGUI.py
r1373 r1378 392 392 'Assignment of variables to labels:'), 393 393 0,wx.EXPAND|wx.ALIGN_CENTER,0) 394 GridSiz = wx.FlexGridSizer( len(self.exprVarLst)+1,5,2,2)394 GridSiz = wx.FlexGridSizer(0,5,2,2) 395 395 GridSiz.Add( 396 396 wx.StaticText(self.varbox,wx.ID_ANY,'label',style=wx.CENTER), -
trunk/GSASIIgrid.py
r1340 r1378 952 952 cols = 3 953 953 if CopyButton: cols += 1 954 subSizer = wx.FlexGridSizer( rows=len(dictlst),cols=cols,hgap=2,vgap=2)954 subSizer = wx.FlexGridSizer(cols=cols,hgap=2,vgap=2) 955 955 self.ValidatedControlsList = [] # make list of TextCtrls 956 956 for i,(d,k) in enumerate(zip(dictlst,elemlst)): … … 1196 1196 mainSizer.Add((10,10),1) 1197 1197 1198 radiiSizer = wx.FlexGridSizer( 2,3,5,5)1198 radiiSizer = wx.FlexGridSizer(0,3,5,5) 1199 1199 radiiSizer.Add(wx.StaticText(self.panel,-1,' Type'),0,WACV) 1200 1200 radiiSizer.Add(wx.StaticText(self.panel,-1,'Bond radii'),0,WACV) … … 1214 1214 radiiSizer.Add(aRadii,0,WACV) 1215 1215 mainSizer.Add(radiiSizer,0,wx.EXPAND) 1216 factorSizer = wx.FlexGridSizer( 2,2,5,5)1216 factorSizer = wx.FlexGridSizer(0,2,5,5) 1217 1217 Names = ['Bond','Angle'] 1218 1218 for i,name in enumerate(Names): … … 1859 1859 num = len(fullVaryList) - len(varyList) 1860 1860 mainSizer.Add(wx.StaticText(self,wx.ID_ANY,' + '+str(num)+' parameters are varied via constraints')) 1861 subSizer = wx.FlexGridSizer( rows=len(parmDict)+1,cols=4,hgap=2,vgap=2)1861 subSizer = wx.FlexGridSizer(cols=4,hgap=2,vgap=2) 1862 1862 parmNames = parmDict.keys() 1863 1863 parmNames.sort() -
trunk/GSASIIimgGUI.py
r1376 r1378 391 391 G2plt.PlotExposedImage(G2frame,event=event) 392 392 393 maxSizer = wx.FlexGridSizer( 2,3,0,5)393 maxSizer = wx.FlexGridSizer(0,3,0,5) 394 394 maxSizer.AddGrowableCol(1,1) 395 395 maxSizer.SetFlexibleDirection(wx.HORIZONTAL) … … 439 439 penVal.SetValue("%6.3f" % (data['DetDepth'])) #reset in case of error 440 440 441 calibSizer = wx.FlexGridSizer( 5,2,5,5)441 calibSizer = wx.FlexGridSizer(0,2,5,5) 442 442 calibSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Calibration coefficients'),0,WACV) 443 443 calibSizer.Add((5,0),0) … … 614 614 polaVal.SetValue('%.3f'%(data['PolaVal'][0])) 615 615 616 dataSizer = wx.FlexGridSizer( 5,2,5,3)616 dataSizer = wx.FlexGridSizer(0,2,5,3) 617 617 dataSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Integration coefficients'),0,WACV) 618 618 dataSizer.Add((5,0),0) … … 751 751 darkMult.SetValue("%.3f" % (data['dark image'][1])) #reset in case of error 752 752 753 backSizer = wx.FlexGridSizer( 1,4,5,5)753 backSizer = wx.FlexGridSizer(0,4,5,5) 754 754 755 755 backSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Dark image'),0,WACV) … … 825 825 G2plt.PlotExposedImage(G2frame,event=event) 826 826 827 calibSizer = wx.FlexGridSizer( 2,3,5,5)827 calibSizer = wx.FlexGridSizer(0,3,5,5) 828 828 comboSizer = wx.BoxSizer(wx.HORIZONTAL) 829 829 comboSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Calibrant '),0,WACV) … … 951 951 952 952 mainSizer.Add((5,5),0) 953 DataSizer = wx.FlexGridSizer( 1,2,5,5)953 DataSizer = wx.FlexGridSizer(0,2,5,5) 954 954 DataSizer.Add(CalibCoeffSizer(),0) 955 955 DataSizer.Add(IntegrateSizer(),0) … … 1198 1198 arcs = data['Arcs'] #radius, start/end azimuth, thickness 1199 1199 1200 littleSizer = wx.FlexGridSizer( 2,3,0,5)1200 littleSizer = wx.FlexGridSizer(0,3,0,5) 1201 1201 littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Lower/Upper limits '),0,WACV) 1202 1202 Text = wx.TextCtrl(G2frame.dataDisplay,value=("%8d" % (thresh[0][0])),style=wx.TE_READONLY) … … 1221 1221 delSpotId = [] 1222 1222 if spots: 1223 littleSizer = wx.FlexGridSizer( len(spots)+2,3,0,5)1223 littleSizer = wx.FlexGridSizer(0,3,0,5) 1224 1224 littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Spot masks:'),0,WACV) 1225 1225 littleSizer.Add((5,0),0) … … 1250 1250 delRingId = [] 1251 1251 if rings: 1252 littleSizer = wx.FlexGridSizer( len(rings)+2,3,0,5)1252 littleSizer = wx.FlexGridSizer(0,3,0,5) 1253 1253 littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Ring masks:'),0,WACV) 1254 1254 littleSizer.Add((5,0),0) … … 1279 1279 delArcId = [] 1280 1280 if arcs: 1281 littleSizer = wx.FlexGridSizer( len(rings)+2,4,0,5)1281 littleSizer = wx.FlexGridSizer(0,4,0,5) 1282 1282 littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Arc masks:'),0,WACV) 1283 1283 littleSizer.Add((5,0),0) … … 1316 1316 delFrameId = [] 1317 1317 if polygons: 1318 littleSizer = wx.FlexGridSizer( len(polygons)+2,2,0,5)1318 littleSizer = wx.FlexGridSizer(0,2,0,5) 1319 1319 littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Polygon masks:'),0,WACV) 1320 1320 littleSizer.Add((5,0),0) … … 1332 1332 mainSizer.Add(littleSizer,0,) 1333 1333 if frame: 1334 littleSizer = wx.FlexGridSizer( 3,2,0,5)1334 littleSizer = wx.FlexGridSizer(0,2,0,5) 1335 1335 littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Frame mask:'),0, 1336 1336 WACV) … … 1591 1591 Indx = {} 1592 1592 delIndx = [] 1593 dzeroSizer = wx.FlexGridSizer( 1,8,5,5)1593 dzeroSizer = wx.FlexGridSizer(0,8,5,5) 1594 1594 for id,dzero in enumerate(data['d-zero']): 1595 1595 dzeroSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,label=(' d-zero #%d: '%(id))),0,WACV) -
trunk/GSASIIphsGUI.py
r1360 r1378 382 382 if laue in cellGUI[0]: 383 383 useGUI = cellGUI 384 cellSizer = wx.FlexGridSizer( 2,useGUI[1]+1,5,5)384 cellSizer = wx.FlexGridSizer(0,useGUI[1]+1,5,5) 385 385 if PWDR: 386 386 cellRef = wx.CheckBox(General,-1,label='Refine unit cell:') … … 418 418 denSizer[2].SetValue('%.3f'%(mattCoeff)) 419 419 420 elemSizer = wx.FlexGridSizer( 8,len(generalData['AtomTypes'])+1,1,1)420 elemSizer = wx.FlexGridSizer(0,len(generalData['AtomTypes'])+1,1,1) 421 421 elemSizer.Add(wx.StaticText(General,label=' Elements'),0,WACV) 422 422 for elem in generalData['AtomTypes']: … … 1699 1699 dlg, wx.ID_ANY,#size=(100,200), 1700 1700 style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER) 1701 subSizer1 = wx.FlexGridSizer( rows=1,cols=2,hgap=5,vgap=2)1701 subSizer1 = wx.FlexGridSizer(cols=2,hgap=5,vgap=2) 1702 1702 panel2 = wxscroll.ScrolledPanel( 1703 1703 dlg, wx.ID_ANY,#size=(100,200), 1704 1704 style = wx.TAB_TRAVERSAL|wx.SUNKEN_BORDER) 1705 subSizer2 = wx.FlexGridSizer( rows=1,cols=3,hgap=5,vgap=2)1705 subSizer2 = wx.FlexGridSizer(cols=3,hgap=5,vgap=2) 1706 1706 subSizer1.Add(wx.StaticText(panel1,wx.ID_ANY,'Parameter name ')) 1707 1707 subSizer1.Add(wx.StaticText(panel1,wx.ID_ANY,' value'),0,wx.ALIGN_RIGHT) … … 2784 2784 2785 2785 slopSizer = wx.BoxSizer(wx.HORIZONTAL) 2786 slideSizer = wx.FlexGridSizer( 7,2)2786 slideSizer = wx.FlexGridSizer(0,2) 2787 2787 slideSizer.AddGrowableCol(1,1) 2788 2788 … … 3166 3166 mainSizer.Add(titleSizer,0) 3167 3167 mainSizer.Add((0,5),0) 3168 shSizer = wx.FlexGridSizer( 1,6,5,5)3168 shSizer = wx.FlexGridSizer(0,6,5,5) 3169 3169 shSizer.Add(wx.StaticText(Texture,-1,'Texture model: '),0,WACV) 3170 3170 shModel = wx.ComboBox(Texture,-1,value=textureData['Model'],choices=shModels, … … 3187 3187 mainSizer.Add(shSizer,0,0) 3188 3188 mainSizer.Add((0,5),0) 3189 PTSizer = wx.FlexGridSizer( 2,4,5,5)3189 PTSizer = wx.FlexGridSizer(0,4,5,5) 3190 3190 PTSizer.Add(wx.StaticText(Texture,-1,' Texture plot type: '),0,WACV) 3191 3191 choices = ['Axial pole distribution','Pole figure','Inverse pole figure'] … … 3224 3224 mainSizer.Add(wx.StaticText(Texture,-1,'Spherical harmonic coefficients: '),0,WACV) 3225 3225 mainSizer.Add((0,5),0) 3226 ODFSizer = wx.FlexGridSizer( 2,8,2,2)3226 ODFSizer = wx.FlexGridSizer(0,8,2,2) 3227 3227 ODFIndx = {} 3228 3228 ODFkeys = textureData['SH Coeff'][1].keys() … … 3446 3446 RBObj['ThermalMotion'][2][item] = Obj.GetValue() 3447 3447 3448 thermSizer = wx.FlexGridSizer( 1,9,5,5)3448 thermSizer = wx.FlexGridSizer(0,9,5,5) 3449 3449 model = RBObj['ThermalMotion'] 3450 3450 if model[0] == 'Uiso': … … 3521 3521 pass 3522 3522 3523 topSizer = wx.FlexGridSizer( 2,6,5,5)3523 topSizer = wx.FlexGridSizer(0,6,5,5) 3524 3524 Orig = RBObj['Orig'][0] 3525 3525 Orien,OrienV = G2mth.Q2AVdeg(RBObj['Orient'][0]) … … 3601 3601 resrbSizer.Add(LocationSizer(RBObj,'Residue')) 3602 3602 resrbSizer.Add(wx.StaticText(RigidBodies,-1,'Torsions:'),0,WACV) 3603 torSizer = wx.FlexGridSizer( 1,6,5,5)3603 torSizer = wx.FlexGridSizer(0,6,5,5) 3604 3604 for itors,tors in enumerate(RBObj['Torsions']): 3605 3605 torSizer.Add(wx.StaticText(RigidBodies,-1,'Torsion '+'%d'%(itors)),0,WACV) … … 3945 3945 0,WACV) 3946 3946 mainSizer.Add((5,5),0) 3947 OriSizer = wx.FlexGridSizer( 1,5,5,5)3947 OriSizer = wx.FlexGridSizer(0,5,5,5) 3948 3948 OriSizer.Add(wx.StaticText(RigidBodies,-1,'Origin x,y,z: '),0,WACV) 3949 3949 for ix,x in enumerate(Orig): … … 3964 3964 mainSizer.Add(OriSizer) 3965 3965 mainSizer.Add((5,5),0) 3966 RefSizer = wx.FlexGridSizer( 1,7,5,5)3966 RefSizer = wx.FlexGridSizer(0,7,5,5) 3967 3967 if len(atomData): 3968 3968 RefSizer.Add(wx.StaticText(RigidBodies,-1,'Location setting: Select match to'),0,WACV) … … 3985 3985 rbAtTypes = data['testRBObj']['rbAtTypes'] 3986 3986 rbSeq = RBData['Residue'][rbId]['rbSeq'] 3987 TorSizer = wx.FlexGridSizer( 1,4)3987 TorSizer = wx.FlexGridSizer(0,4) 3988 3988 TorSizer.AddGrowableCol(1,1) 3989 3989 for t,[torsion,seq] in enumerate(zip(Torsions,rbSeq)): … … 4257 4257 def atomSizer(model): 4258 4258 4259 atomsizer = wx.FlexGridSizer( 1,7,5,5)4259 atomsizer = wx.FlexGridSizer(0,7,5,5) 4260 4260 atomsizer.Add(wx.StaticText(MCSA,-1,' Atom: '+model['name']+': '),0,WACV) 4261 4261 for ix,item in enumerate(['x','y','z']): … … 4329 4329 4330 4330 rbsizer = wx.BoxSizer(wx.VERTICAL) 4331 rbsizer1 = wx.FlexGridSizer( 1,7,5,5)4331 rbsizer1 = wx.FlexGridSizer(0,7,5,5) 4332 4332 rbsizer1.Add(wx.StaticText(MCSA,-1,model['Type']+': '+model['name']+': '),0,WACV) 4333 4333 for ix,item in enumerate(['x','y','z']): … … 4356 4356 rbsizer1.Add(posRange,0,WACV) 4357 4357 4358 rbsizer2 = wx.FlexGridSizer( 1,6,5,5)4358 rbsizer2 = wx.FlexGridSizer(0,6,5,5) 4359 4359 Ori = model['Ori'][0] 4360 4360 rbsizer2.Add(wx.StaticText(MCSA,-1,'Oa: '),0,WACV) … … 4397 4397 atNames = RBData['Residue'][model['RBId']]['atNames'] 4398 4398 rbsizer.Add(wx.StaticText(MCSA,-1,'Torsions:'),0,WACV) 4399 rbsizer3 = wx.FlexGridSizer( 1,8,5,5)4399 rbsizer3 = wx.FlexGridSizer(0,8,5,5) 4400 4400 for it,tor in enumerate(model['Tor'][0]): 4401 4401 iBeg,iFin = RBData['Residue'][model['RBId']]['rbSeq'][it][:2] -
trunk/GSASIIplot.py
r1377 r1378 3268 3268 Rd = np.array([255,0,0]) 3269 3269 Gr = np.array([0,255,0]) 3270 wxGreen = wx.Colo r(0,255,0)3270 wxGreen = wx.Colour(0,255,0) 3271 3271 Bl = np.array([0,0,255]) 3272 3272 Or = np.array([255,128,0]) 3273 wxOrange = wx.Colo r(255,128,0)3273 wxOrange = wx.Colour(255,128,0) 3274 3274 uBox = np.array([[0,0,0],[1,0,0],[1,1,0],[0,1,0],[0,0,1],[1,0,1],[1,1,1],[0,1,1]]) 3275 3275 uEdges = np.array([ … … 3887 3887 def RenderLabel(x,y,z,label,r,color,matRot): 3888 3888 ''' 3889 color wx.Colo r object3889 color wx.Colour object 3890 3890 ''' 3891 3891 glPushMatrix() -
trunk/GSASIIpwdGUI.py
r1367 r1378 676 676 backSizer.Add(topSizer) 677 677 backSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Background coefficients:'),0,WACV) 678 bakSizer = wx.FlexGridSizer( 1,5,5,5)678 bakSizer = wx.FlexGridSizer(0,5,5,5) 679 679 for i,value in enumerate(data[0][3:]): 680 680 bakVal = wx.TextCtrl(G2frame.dataDisplay,wx.ID_ANY,'%10.4f'%(value),style=wx.TE_PROCESS_ENTER) … … 1167 1167 G2frame.dataFrame.SetLabel('Instrument Parameters') 1168 1168 G2frame.dataDisplay = wx.Panel(G2frame.dataFrame) 1169 topSizer = wx.FlexGridSizer( 1,6,5,5)1170 instSizer = wx.FlexGridSizer( 2,6,5,5)1169 topSizer = wx.FlexGridSizer(0,6,5,5) 1170 instSizer = wx.FlexGridSizer(0,6,5,5) 1171 1171 topSizer.Add(wx.StaticText(G2frame.dataDisplay,-1,' Histogram Type: '+insVal['Type']),0,WACV) 1172 1172 # topSizer.Add((5,5),0) … … 1641 1641 mainSizer.Add((5,5),0) 1642 1642 1643 parmSizer = wx.FlexGridSizer( 10,2,5,0)1643 parmSizer = wx.FlexGridSizer(0,2,5,0) 1644 1644 for key,lbl,nDig in parms: 1645 1645 if 'list' in str(type(data[key])): … … 1669 1669 anomrho = [0.,0.] 1670 1670 mu = 0. 1671 subSizer = wx.FlexGridSizer( 1,4,5,5)1671 subSizer = wx.FlexGridSizer(0,4,5,5) 1672 1672 Substances = G2frame.PatternTree.GetItemPyData( 1673 1673 G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Substances')) … … 2170 2170 mainSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Indexing controls: '),0,WACV) 2171 2171 mainSizer.Add((5,5),0) 2172 littleSizer = wx.FlexGridSizer( 2,5,5,5)2172 littleSizer = wx.FlexGridSizer(0,5,5,5) 2173 2173 littleSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Max Nc/Nobs '),0,WACV) 2174 2174 NcNo = wx.SpinCtrl(G2frame.dataDisplay) … … 2187 2187 0,WACV) 2188 2188 mainSizer.Add((5,5),0) 2189 littleSizer = wx.FlexGridSizer( 2,7,5,5)2189 littleSizer = wx.FlexGridSizer(0,7,5,5) 2190 2190 bravList = [] 2191 2191 bravs = zip(bravais,bravaisNames) … … 2232 2232 useGUI = cellGUI 2233 2233 cellList = [] 2234 littleSizer = wx.FlexGridSizer( 2,useGUI[1],5,5)2234 littleSizer = wx.FlexGridSizer(0,useGUI[1],5,5) 2235 2235 for txt,fmt,ifEdit,Id in useGUI[2]: 2236 2236 littleSizer.Add(wx.StaticText(G2frame.dataDisplay,label=txt),0,WACV) … … 2594 2594 0,WACV) 2595 2595 else: 2596 elSizer = wx.FlexGridSizer( 1,6,5,5)2596 elSizer = wx.FlexGridSizer(0,6,5,5) 2597 2597 Substance = data['Substances'][name] 2598 2598 Elems = Substance['Elements'] … … 2606 2606 elSizer.Add(num,0,WACV) 2607 2607 substSizer.Add(elSizer,0) 2608 vdsSizer = wx.FlexGridSizer( 1,4,5,5)2608 vdsSizer = wx.FlexGridSizer(0,4,5,5) 2609 2609 vdsSizer.Add(wx.StaticText(parent=G2frame.dataDisplay,label=' Volume: '), 2610 2610 0,WACV) … … 2940 2940 sizeSizer = wx.BoxSizer(wx.VERTICAL) 2941 2941 sizeSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' Size distribution parameters: '),0,WACV) 2942 binSizer = wx.FlexGridSizer( 1,7,5,5)2942 binSizer = wx.FlexGridSizer(0,7,5,5) 2943 2943 binSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' No. size bins: '),0,WACV) 2944 2944 bins = ['50','100','150','200'] … … 3155 3155 3156 3156 def ParmSizer(): 3157 parmSizer = wx.FlexGridSizer( 1,3,5,5)3157 parmSizer = wx.FlexGridSizer(0,3,5,5) 3158 3158 parmSizer.AddGrowableCol(2,1) 3159 3159 parmSizer.SetFlexibleDirection(wx.HORIZONTAL) … … 3790 3790 # mainSizer.Add(dataSizer,0) 3791 3791 mainSizer.Add((5,5),0) 3792 fileSizer = wx.FlexGridSizer( 3,6,5,1)3792 fileSizer = wx.FlexGridSizer(0,6,5,1) 3793 3793 select = ['Sample Bkg.','Container'] 3794 3794 if data['Container']['Name']: … … 3804 3804 Abs = G2lat.CellAbsorption(ElList,data['Form Vol']) 3805 3805 Trans = G2pwd.Transmission(data['Geometry'],Abs*data['Pack'],data['Diam']) 3806 elemSizer = wx.FlexGridSizer( 3,3,5,1)3806 elemSizer = wx.FlexGridSizer(0,3,5,1) 3807 3807 for El in ElList: 3808 3808 FillElemSizer(elemSizer,ElList[El]) -
trunk/scanCCD.py
r1112 r1378 308 308 309 309 colorList = [m for m in mpl.cm.datad.keys() if not m.endswith("_r")] 310 colorSizer = wx.FlexGridSizer( 1,5,5,5)310 colorSizer = wx.FlexGridSizer(0,5,5,5) 311 311 colorSizer.Add(wx.StaticText(self.SCCDPanel,label=' Color bar '),0,wx.ALIGN_CENTER_VERTICAL) 312 312 colSel = wx.ComboBox(self.SCCDPanel,value=data['color'],choices=colorList, … … 345 345 self.PlotImage() 346 346 347 maxSizer = wx.FlexGridSizer( 1,3,0,5)347 maxSizer = wx.FlexGridSizer(0,3,0,5) 348 348 maxSizer.AddGrowableCol(1,1) 349 349 maxSizer.SetFlexibleDirection(wx.HORIZONTAL) … … 371 371 self.PlotImage() 372 372 373 zSizer = wx.FlexGridSizer( 1,4,5,5)373 zSizer = wx.FlexGridSizer(0,4,5,5) 374 374 zSizer.Add(wx.StaticText(self.SCCDPanel,label='Upper intensity mask:'),0,wx.ALIGN_CENTER_VERTICAL) 375 375 zMax = wx.TextCtrl(self.SCCDPanel,value='%d'%(data['Zmax'])) … … 411 411 self.PlotImage() 412 412 413 zeroSizer = wx.FlexGridSizer( 1,6,5,5)413 zeroSizer = wx.FlexGridSizer(0,6,5,5) 414 414 zeroSizer.Add(wx.StaticText(self.SCCDPanel,label='X-zero:'),0,wx.ALIGN_CENTER_VERTICAL) 415 415 zMax = wx.TextCtrl(self.SCCDPanel,value='%.3f'%(data['Zeros'][0])) … … 445 445 self.PlotImage() 446 446 447 TBLRsizer = wx.FlexGridSizer( 2,4,5,5)447 TBLRsizer = wx.FlexGridSizer(0,4,5,5) 448 448 for i,item in enumerate(['Bottom','Top']): 449 449 TBLRsizer.Add(wx.StaticText(self.SCCDPanel,label=item+' limit, pixels:'),0,wx.ALIGN_CENTER_VERTICAL) … … 474 474 self.PlotImage() 475 475 476 scanSizer = wx.FlexGridSizer( 1,6,5,5)476 scanSizer = wx.FlexGridSizer(0,6,5,5) 477 477 for i,item in enumerate(['Lower 2-th','Upper 2-th','2-th step']): 478 478 scanSizer.Add(wx.StaticText(self.SCCDPanel,label=item+':'),0,wx.ALIGN_CENTER_VERTICAL) -
trunk/testDeriv.py
r1299 r1378 127 127 use = self.use 128 128 delt = self.delt 129 mainSizer = wx.FlexGridSizer( 1,8,5,5)129 mainSizer = wx.FlexGridSizer(0,8,5,5) 130 130 for id,[ck,name,d] in enumerate(zip(use,varylist,delt)): 131 131 useVal = wx.CheckBox(self.testDerivPanel,label=name)
Note: See TracChangeset
for help on using the changeset viewer.
