Changeset 4672
- Timestamp:
- Dec 14, 2020 12:58:19 PM (3 years ago)
- Location:
- trunk
- Files:
-
- 12 edited
-
Absorb.py (modified) (12 diffs)
-
GSASIIIO.py (modified) (1 diff)
-
GSASIIIntPDFtool.py (modified) (4 diffs)
-
GSASIIconstrGUI.py (modified) (1 diff)
-
GSASIIctrlGUI.py (modified) (15 diffs)
-
GSASIIddataGUI.py (modified) (1 diff)
-
GSASIIexprGUI.py (modified) (9 diffs)
-
GSASIIimgGUI.py (modified) (9 diffs)
-
GSASIIphsGUI.py (modified) (3 diffs)
-
GSASIIpwd.py (modified) (1 diff)
-
GSASIIstrMath.py (modified) (2 diffs)
-
fprime.py (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Absorb.py
r4339 r4672 202 202 style=wx.TE_MULTILINE|wx.TE_DONTWRAP ) 203 203 self.Results.SetEditable(False) 204 mainSizer.Add(self.Results,1,wx. ALIGN_CENTER_HORIZONTAL|wx.EXPAND)204 mainSizer.Add(self.Results,1,wx.EXPAND) 205 205 mainSizer.Add((10,15),0) 206 206 … … 226 226 selSizer = wx.BoxSizer(wx.HORIZONTAL) 227 227 selSizer.Add((5,10),0) 228 selSizer.Add(wx.StaticText(parent=self.panel, label='Wavelength:'),0, 229 wx.ALIGN_CENTER_VERTICAL|wx.EXPAND) 228 selSizer.Add(wx.StaticText(parent=self.panel, label='Wavelength:'),0,wx.EXPAND) 230 229 selSizer.Add((5,10),0) 231 230 self.SpinText1 = wx.TextCtrl(id=wxID_SPINTEXT1, parent=self.panel, … … 235 234 self.SpinText1.Bind(wx.EVT_TEXT_ENTER, self.OnSpinText1, id=wxID_SPINTEXT1) 236 235 237 selSizer.Add(wx.StaticText(parent=self.panel, label='Energy:'),0, 238 wx.ALIGN_CENTER_VERTICAL|wx.EXPAND) 236 selSizer.Add(wx.StaticText(parent=self.panel, label='Energy:'),0,wx.EXPAND) 239 237 selSizer.Add((5,10),0) 240 238 self.SpinText2 = wx.TextCtrl(id=wxID_SPINTEXT2, parent=self.panel, … … 244 242 self.SpinText2.Bind(wx.EVT_TEXT_ENTER, self.OnSpinText2, id=wxID_SPINTEXT2) 245 243 246 selSizer.Add(wx.StaticText(parent=self.panel, label='Plot scale:'), 247 0,wx.ALIGN_CENTER_VERTICAL|wx.EXPAND) 244 selSizer.Add(wx.StaticText(parent=self.panel, label='Plot scale:'),0,wx.EXPAND) 248 245 selSizer.Add((5,10),0) 249 246 self.choice1 = wx.ComboBox(id=wxID_CHOICE1, parent=self.panel, value='Wavelength', … … 266 263 minValue=int(1000.*self.Wmin), parent=self.panel,style=wx.SL_HORIZONTAL, 267 264 value=int(self.Wave*1000.), ) 268 slideSizer.Add(self.slider1,1,wx.EXPAND |wx.ALIGN_RIGHT)265 slideSizer.Add(self.slider1,1,wx.EXPAND) 269 266 self.slider1.Bind(wx.EVT_SLIDER, self.OnSlider1, id=wxID_SLIDER1) 270 267 mainSizer.Add(slideSizer,0,wx.EXPAND) … … 273 270 cellSizer = wx.BoxSizer(wx.HORIZONTAL) 274 271 cellSizer.Add((5,10),0) 275 cellSizer.Add(wx.StaticText(parent=self.panel, label='Volume:'),0, 276 wx.ALIGN_CENTER_VERTICAL|wx.EXPAND) 272 cellSizer.Add(wx.StaticText(parent=self.panel, label='Volume:'),0,wx.EXPAND) 277 273 cellSizer.Add((5,10),0) 278 274 self.SpinText3 = wx.TextCtrl(id=wxID_SPINTEXT3, parent=self.panel, … … 283 279 284 280 cellSizer.Add((5,10),0) 285 cellSizer.Add(wx.StaticText(parent=self.panel, label='Z(vol):'),0, 286 wx.ALIGN_CENTER_VERTICAL|wx.EXPAND) 281 cellSizer.Add(wx.StaticText(parent=self.panel, label='Z(vol):'),0,wx.EXPAND) 287 282 cellSizer.Add((5,10),0) 288 283 self.SpinText4 = wx.TextCtrl(id=wxID_SPINTEXT4, parent=self.panel, … … 293 288 294 289 cellSizer.Add((5,10),0) 295 cellSizer.Add(wx.StaticText(parent=self.panel, label='Sample R:'),0, 296 wx.ALIGN_CENTER_VERTICAL|wx.EXPAND) 290 cellSizer.Add(wx.StaticText(parent=self.panel, label='Sample R:'),0,wx.EXPAND) 297 291 cellSizer.Add((5,10),0) 298 292 self.SpinText5 = wx.TextCtrl(id=wxID_SPINTEXT5, parent=self.panel, … … 303 297 304 298 cellSizer.Add((5,10),0) 305 cellSizer.Add(wx.StaticText(parent=self.panel, label='packing:'),0, 306 wx.ALIGN_CENTER_VERTICAL|wx.EXPAND) 299 cellSizer.Add(wx.StaticText(parent=self.panel, label='packing:'),0,wx.EXPAND) 307 300 cellSizer.Add((5,10),0) 308 301 self.SpinText6 = wx.TextCtrl(id=wxID_SPINTEXT6, parent=self.panel, … … 589 582 self.Page.canvas.mpl_connect('key_press_event', self.OnKeyPress) 590 583 newPlot = True 591 ax = self.Page.figure.add_subplot(111,label='absorb')584 self.ax = self.Page.figure.add_subplot(111,label='absorb') 592 585 self.fplot.set_visible(False) 593 586 self.Page.Choice = (' key press','g: toggle grid',) 594 587 self.Page.keyPress = self.OnKeyPress 595 ax.clear()596 ax.set_title('X-Ray Absorption',x=0,ha='left')597 ax.set_ylabel(r"$\mu R$",fontsize=14)588 self.ax.clear() 589 self.ax.set_title('X-Ray Absorption',x=0,ha='left') 590 self.ax.set_ylabel(r"$\mu R$",fontsize=14) 598 591 Ymin = 0.0 599 592 Ymax = 0.0 … … 604 597 fppsP1 = np.array(Fpps[1]) 605 598 fppsP2 = np.array(Fpps[2]) 606 ax.plot(fppsP1,fppsP2,label=r'$\mu R$ '+Fpps[0])599 self.ax.plot(fppsP1,fppsP2,label=r'$\mu R$ '+Fpps[0]) 607 600 if self.ifWave: 608 ax.set_xlabel(r'$\mathsf{\lambda, \AA}$',fontsize=14)609 ax.axvline(x=Wave,picker=3,color='black')601 self.ax.set_xlabel(r'$\mathsf{\lambda, \AA}$',fontsize=14) 602 self.ax.axvline(x=Wave,picker=3,color='black') 610 603 else: 611 ax.set_xlabel(r'$\mathsf{E, keV}$',fontsize=14)612 ax.set_xscale('log')613 ax.axvline(x=self.Kev/Wave,picker=3,color='black')614 ax.axhline(y=1.0,color='b')615 ax.axhline(y=5.0,color='r')616 ax.set_ylim(Ymin,Ymax)604 self.ax.set_xlabel(r'$\mathsf{E, keV}$',fontsize=14) 605 self.ax.set_xscale('log') 606 self.ax.axvline(x=self.Kev/Wave,picker=3,color='black') 607 self.ax.axhline(y=1.0,color='b') 608 self.ax.axhline(y=5.0,color='r') 609 self.ax.set_ylim(Ymin,Ymax) 617 610 if self.FPPS: 618 ax.legend(loc='best')611 self.ax.legend(loc='best') 619 612 if newPlot: 620 613 newPlot = False … … 624 617 tb = self.Page.canvas.toolbar 625 618 tb.push_current() 626 ax.set_xlim(xylim[0])627 ax.set_ylim(xylim[1])619 self.ax.set_xlim(xylim[0]) 620 self.ax.set_ylim(xylim[1]) 628 621 xylim = [] 629 622 tb.push_current() -
trunk/GSASIIIO.py
r4671 r4672 292 292 btnsizer.AddButton(OKbtn) # not sure why this is needed 293 293 btnsizer.Realize() 294 mainsizer.Add(btnsizer, 1, wx.AL IGN_CENTER|wx.ALL|wx.EXPAND, 5)294 mainsizer.Add(btnsizer, 1, wx.ALL|wx.EXPAND, 5) 295 295 dlg.SetSizer(mainsizer) 296 296 dlg.CenterOnParent() -
trunk/GSASIIIntPDFtool.py
r4491 r4672 540 540 sizer.Add(wx.StaticText(mnpnl, wx.ID_ANY,'Write to: '),0,wx.ALIGN_CENTER_VERTICAL) 541 541 fInp3 = G2G.ValidatedTxtCtrl(mnpnl,self.params,'outdir',notBlank=False,size=(300,-1)) 542 sizer.Add(fInp3,1,wx. ALIGN_CENTER_VERTICAL|wx.EXPAND)542 sizer.Add(fInp3,1,wx.EXPAND) 543 543 btn3 = wx.Button(mnpnl, wx.ID_ANY, "Browse") 544 544 btn3.Bind(wx.EVT_BUTTON, OnBrowse) … … 560 560 sizer.Add(G2G.G2CheckBox(mnpnl,'',self.params,'SeparateDir')) 561 561 lblsizr.Add(sizer) 562 mnsizer.Add(lblsizr,0,wx. ALIGN_CENTER|wx.EXPAND,1)562 mnsizer.Add(lblsizr,0,wx.EXPAND,1) 563 563 564 564 mnsizer.Add((-1,15)) … … 586 586 self.pdfSel = G2G.G2ChoiceButton(mnpnl,[''],self.params,'pdfprm', 587 587 onChoice=checkPDFselection) 588 sizer.Add(self.pdfSel,1,wx. ALIGN_CENTER_VERTICAL|wx.EXPAND,1)588 sizer.Add(self.pdfSel,1,wx.EXPAND,1) 589 589 lblsizr.Add(sizer,0,wx.EXPAND) 590 590 sizer = wx.BoxSizer(wx.HORIZONTAL) … … 624 624 lblsizr.Add(sizer,0,wx.EXPAND,0) 625 625 626 mnsizer.Add(lblsizr,0,wx. ALIGN_CENTER|wx.EXPAND,1)626 mnsizer.Add(lblsizr,0,wx.EXPAND,1) 627 627 628 628 # buttons on bottom -
trunk/GSASIIconstrGUI.py
r4635 r4672 3517 3517 moves = wx.StaticText(ResidueRBDisplay,wx.ID_ANY, 3518 3518 atms[:-1],size=(200,20)) 3519 seqSizer.Add(moves,1, WACV|wx.EXPAND|wx.RIGHT)3519 seqSizer.Add(moves,1,wx.EXPAND|wx.RIGHT) 3520 3520 return seqSizer 3521 3521 -
trunk/GSASIIctrlGUI.py
r4671 r4672 1124 1124 else: 1125 1125 line = wx.StaticLine(parent, size=(-1,3), style=wx.LI_HORIZONTAL) 1126 sizer.Add(line, 0, wx.EXPAND|wx.AL IGN_CENTER|wx.ALL, 5)1126 sizer.Add(line, 0, wx.EXPAND|wx.ALL, 5) 1127 1127 1128 1128 ################################################################################ … … 1621 1621 topSizer = wx.BoxSizer(wx.HORIZONTAL) 1622 1622 topSizer.Add(wx.StaticText(self,wx.ID_ANY,title,size=(-1,35)), 1623 1,wx.ALL|wx.EXPAND |WACV,1)1623 1,wx.ALL|wx.EXPAND,1) 1624 1624 if filterBox: 1625 1625 self.timer = wx.Timer() … … 2262 2262 h = max(35,17*int(len(title)/26.+1)) # adjust height of title box with guessed # of lines 2263 2263 topSizer.Add(wx.StaticText(self,wx.ID_ANY,title,size=(-1,h)), 2264 1,wx.ALL|wx.EXPAND |WACV,1)2264 1,wx.ALL|wx.EXPAND,1) 2265 2265 if filterBox: 2266 2266 self.timer = wx.Timer() … … 2781 2781 btnsizer.Add((-1,-1),1, wx.EXPAND, 1) 2782 2782 btnsizer.Add(hlp,0,wx.ALIGN_RIGHT|wx.ALL) 2783 mainSizer.Add(btnsizer,0,wx. ALIGN_CENTER|wx.EXPAND)2783 mainSizer.Add(btnsizer,0,wx.EXPAND) 2784 2784 promptSizer = wx.FlexGridSizer(0,2,5,5) 2785 2785 promptSizer.AddGrowableCol(1,1) … … 2790 2790 self.Indx[valItem.GetId()] = prompt 2791 2791 valItem.Bind(wx.EVT_TEXT,self.newValue) 2792 promptSizer.Add(valItem,1, WACV|wx.EXPAND,1)2792 promptSizer.Add(valItem,1,wx.EXPAND,1) 2793 2793 mainSizer.Add(promptSizer,1,wx.ALL|wx.EXPAND,1) 2794 2794 btnsizer = wx.BoxSizer(wx.HORIZONTAL) … … 2804 2804 btn.Bind(wx.EVT_BUTTON,self.onExpand) 2805 2805 btnsizer.Add(btn,0,wx.ALIGN_RIGHT) 2806 mainSizer.Add(btnsizer,0,wx. ALIGN_CENTER|wx.EXPAND)2806 mainSizer.Add(btnsizer,0,wx.EXPAND) 2807 2807 self.SetSizer(mainSizer) 2808 2808 self.Fit() … … 2939 2939 colData = wx.TextCtrl(panel,value='\n'.join(self.ColumnData[icol]),size=(120,-1), 2940 2940 style=wx.TE_MULTILINE|wx.TE_READONLY|wx.TE_DONTWRAP) 2941 colSizer.Add(colData,1,wx.ALL| WACV|wx.EXPAND,1)2941 colSizer.Add(colData,1,wx.ALL|wx.EXPAND,1) 2942 2942 colSizer.Add(wx.StaticText(panel,label=' Modify by:'),0,WACV) 2943 2943 mod = wx.TextCtrl(panel,size=(120,-1),value='',style=wx.TE_PROCESS_ENTER) … … 2946 2946 Indx[mod.GetId()] = [icol,colData] 2947 2947 colSizer.Add(mod,0,WACV) 2948 columnsSizer.Add(colSizer,0,wx.ALL| WACV|wx.EXPAND,10)2948 columnsSizer.Add(colSizer,0,wx.ALL|wx.EXPAND,10) 2949 2949 Sizer.Add(columnsSizer,1,wx.ALL|wx.EXPAND,1) 2950 2950 Sizer.Add(wx.StaticText(panel,label=' For modify by, enter arithmetic string eg. "-12345.67". "+", "-", "*", "/", "**" all allowed'),0) … … 3162 3162 #btnsizer.AddButton(btn) 3163 3163 btnsizer.Realize() 3164 sizer.Add(btnsizer, 0, wx. ALIGN_CENTER_VERTICAL|wx.EXPAND|wx.ALL, 5)3164 sizer.Add(btnsizer, 0, wx.EXPAND|wx.ALL, 5) 3165 3165 dlg.SetSizer(sizer) 3166 3166 sizer.Fit(dlg) … … 3375 3375 wid.SetBackgroundColour(DULL_YELLOW) 3376 3376 wid.SetMinSize((50,-1)) 3377 self.GBsizer.Add(wid,(0,i),flag=wx. ALIGN_CENTER|wx.EXPAND)3377 self.GBsizer.Add(wid,(0,i),flag=wx.EXPAND) 3378 3378 self.chceDict = {} 3379 3379 for row,nam in enumerate(self.keylist): … … 3449 3449 wid.SetBackgroundColour(DULL_YELLOW) 3450 3450 wid.SetMinSize((50,-1)) 3451 self.GBsizer.Add(wid,(0,i),flag=wx. ALIGN_CENTER|wx.EXPAND)3451 self.GBsizer.Add(wid,(0,i),flag=wx.EXPAND) 3452 3452 colList = [str(i) for i in range(self.maxcol+2)] 3453 3453 for wid in self.chceDict: … … 5715 5715 self.docinfo = wx.StaticText(self, wx.ID_ANY, "") 5716 5716 self.doclblsizr.Add(self.docinfo, 0, wx.ALIGN_LEFT|wx.ALL, 5) 5717 self.sizer.Add(self.doclblsizr, 0, wx. ALIGN_LEFT|wx.EXPAND|wx.ALL, 5)5717 self.sizer.Add(self.doclblsizr, 0, wx.EXPAND|wx.ALL, 5) 5718 5718 btnsizer = wx.BoxSizer(wx.HORIZONTAL) 5719 5719 self.saveBtn = wx.Button(self,-1,"Save current settings") … … 5939 5939 5940 5940 line = wx.StaticLine(pnl,-1, size=(-1,3), style=wx.LI_HORIZONTAL) 5941 sizer.Add(line, 0, wx.EXPAND|wx.AL IGN_CENTER|wx.ALL, 10)5941 sizer.Add(line, 0, wx.EXPAND|wx.ALL, 10) 5942 5942 5943 5943 self.text = wx.StaticText(pnl, wx.ID_ANY, "") 5944 sizer.Add(self.text, 0, wx. ALIGN_LEFT|wx.EXPAND|wx.ALL, 5)5944 sizer.Add(self.text, 0, wx.EXPAND|wx.ALL, 5) 5945 5945 5946 5946 line = wx.StaticLine(pnl,-1, size=(-1,3), style=wx.LI_HORIZONTAL) 5947 sizer.Add(line, 0, wx.EXPAND|wx.AL IGN_CENTER|wx.ALL, 10)5947 sizer.Add(line, 0, wx.EXPAND|wx.ALL, 10) 5948 5948 sizer.Add( 5949 5949 wx.StaticText( … … 6977 6977 sizer.Add(wx.StaticText(mnpnl, wx.ID_ANY,'Read from: '),0,wx.ALIGN_CENTER_VERTICAL) 6978 6978 fInp3 = ValidatedTxtCtrl(mnpnl,Settings,'indir',size=(300,-1),OnLeave=TestInput) 6979 sizer.Add(fInp3,1,wx. ALIGN_CENTER_VERTICAL|wx.EXPAND)6979 sizer.Add(fInp3,1,wx.EXPAND) 6980 6980 btn3 = wx.Button(mnpnl, wx.ID_ANY, "Browse") 6981 6981 btn3.Bind(wx.EVT_BUTTON, OnBrowse) … … 6987 6987 sizer.Add(wx.StaticText(mnpnl, wx.ID_ANY,'Instrument parameter file from: '),0,wx.ALIGN_CENTER_VERTICAL) 6988 6988 fInp4 = ValidatedTxtCtrl(mnpnl,Settings,'instfile',size=(300,-1),OnLeave=TestInput) 6989 sizer.Add(fInp4,1,wx. ALIGN_CENTER_VERTICAL|wx.EXPAND)6989 sizer.Add(fInp4,1,wx.EXPAND) 6990 6990 btn4 = wx.Button(mnpnl, wx.ID_ANY, "Browse") 6991 6991 btn4.Bind(wx.EVT_BUTTON, OnBrowse) -
trunk/GSASIIddataGUI.py
r4669 r4672 1030 1030 topSizer.Add(wx.StaticText(DData,wx.ID_ANY,' Histogram data for '+PhaseName+':'),0,wx.LEFT,5) 1031 1031 # add help button to bring up help web page - at right sede of window 1032 topSizer.Add((-1,-1),1, WACV|wx.EXPAND)1032 topSizer.Add((-1,-1),1,wx.EXPAND) 1033 1033 topSizer.Add(G2G.HelpButton(DData,helpIndex=G2frame.dataWindow.helpKey)) 1034 mainSizer.Add(topSizer,0, WACV|wx.EXPAND)1034 mainSizer.Add(topSizer,0,wx.EXPAND) 1035 1035 if G2frame.hist: 1036 1036 topSizer = wx.FlexGridSizer(1,2,5,5) -
trunk/GSASIIexprGUI.py
r4594 r4672 207 207 if VarLabel: 208 208 label = wx.StaticText(self, wx.ID_ANY, VarLabel + ' = ') 209 self.exsizer.Add(label, 0, wx.ALL|wx.EXPAND |WACV, 0)209 self.exsizer.Add(label, 0, wx.ALL|wx.EXPAND, 0) 210 210 elif depVarDict: 211 211 self.depParmLists = IndexParmDict(self.depVarDict,False) … … 220 220 choice.SetSelection(wx.NOT_FOUND) 221 221 choice.Bind(wx.EVT_CHOICE,self.OnDepChoice) 222 self.exsizer.Add(choice, 0, wx.ALL|wx.EXPAND |WACV, 0)222 self.exsizer.Add(choice, 0, wx.ALL|wx.EXPAND, 0) 223 223 self.exsizer.Add((5,5)) 224 224 self.depLabel = wx.StaticText(self, wx.ID_ANY, ' ') 225 self.exsizer.Add(self.depLabel, 0, wx.ALL|wx.EXPAND |WACV, 0)225 self.exsizer.Add(self.depLabel, 0, wx.ALL|wx.EXPAND, 0) 226 226 label = wx.StaticText(self, wx.ID_ANY, ' = ') 227 self.exsizer.Add(label, 0, wx.ALL|wx.EXPAND |WACV, 0)227 self.exsizer.Add(label, 0, wx.ALL|wx.EXPAND, 0) 228 228 229 229 #self.exCtrl = wx.TextCtrl(self, wx.ID_ANY, size=(150,-1),style=wx.TE_PROCESS_ENTER) … … 233 233 self.exCtrl.Bind(wx.EVT_COMBOBOX, self.OnValidate) 234 234 self.exCtrl.Bind(wx.EVT_TEXT_ENTER, self.OnValidate) 235 self.exsizer.Add(self.exCtrl, 1, wx.ALL|wx.EXPAND |WACV, 0)235 self.exsizer.Add(self.exCtrl, 1, wx.ALL|wx.EXPAND, 0) 236 236 #self.mainsizer.Add(self.exCtrl, 0, wx.ALL|wx.EXPAND, 5) 237 237 self.mainsizer.Add(self.exsizer, 0, wx.ALL|wx.EXPAND, 5) … … 260 260 else: 261 261 self.ExtraBtn = None 262 bSizer.Add((1,1), 1, wx.AL IGN_CENTER|wx.ALL|wx.EXPAND, 0)262 bSizer.Add((1,1), 1, wx.ALL|wx.EXPAND, 0) 263 263 self.OKbtn = wx.Button(self, wx.ID_OK) 264 264 self.OKbtn.SetDefault() … … 521 521 Siz = wx.BoxSizer(wx.VERTICAL) 522 522 errMsg1 = wx.StaticText(self.errbox, wx.ID_ANY,"") 523 Siz.Add(errMsg1, 0, wx. ALIGN_LEFT|wx.LEFT|wx.EXPAND, 5)523 Siz.Add(errMsg1, 0, wx.LEFT|wx.EXPAND, 5) 524 524 errMsg2 = wx.StaticText(self.errbox, wx.ID_ANY,"\n\n") 525 525 font1 = wx.Font(errMsg2.GetFont().GetPointSize(), 526 526 wx.MODERN, wx.NORMAL, wx.NORMAL, False) 527 527 errMsg2.SetFont(font1) 528 Siz.Add(errMsg2, 0, wx. ALIGN_LEFT|wx.LEFT|wx.EXPAND, 5)528 Siz.Add(errMsg2, 0, wx.LEFT|wx.EXPAND, 5) 529 529 errMsg3 = wx.StaticText(self.errbox, wx.ID_ANY,"") 530 Siz.Add(errMsg3, 0, wx. ALIGN_LEFT|wx.LEFT|wx.EXPAND, 5)530 Siz.Add(errMsg3, 0, wx.LEFT|wx.EXPAND, 5) 531 531 self.errbox.SetSizer(Siz,True) 532 532 Siz.Fit(self.errbox) … … 570 570 wx.StaticText(self.varbox,wx.ID_ANY, 571 571 'Assignment of variables to labels:'), 572 0,wx.EXPAND |wx.ALIGN_CENTER,0)572 0,wx.EXPAND,0) 573 573 GridSiz = wx.FlexGridSizer(0,5,2,2) 574 574 GridSiz.Add( … … 610 610 # var name/var assignment 611 611 if self.varSelect.get(v) is None: 612 GridSiz.Add((-1,-1),0,wx. ALIGN_LEFT|wx.EXPAND,0)612 GridSiz.Add((-1,-1),0,wx.EXPAND,0) 613 613 elif self.varSelect.get(v) == 0: 614 614 wid = G2G.ValidatedTxtCtrl(self.varbox,self.varName,v,size=(50,-1)) 615 GridSiz.Add(wid,0,wx. ALIGN_LEFT|wx.EXPAND,0)615 GridSiz.Add(wid,0,wx.EXPAND,0) 616 616 else: 617 617 wid = wx.StaticText(self.varbox,wx.ID_ANY,self.varName[v]) … … 620 620 # value 621 621 if self.varSelect.get(v) is None: 622 GridSiz.Add((-1,-1),0,wx. ALIGN_RIGHT|wx.EXPAND,0)622 GridSiz.Add((-1,-1),0,wx.EXPAND,0) 623 623 elif self.varSelect.get(v) == 0: 624 624 wid = G2G.ValidatedTxtCtrl(self.varbox,self.varValue,v,size=(75,-1)) 625 GridSiz.Add(wid,0,wx. ALIGN_LEFT|wx.EXPAND,0)625 GridSiz.Add(wid,0,wx.EXPAND,0) 626 626 wid.Bind(wx.EVT_CHAR,self.OnChar) 627 627 else: … … 642 642 self.varRefflag[v] = self.varRefflag.get(v,True) 643 643 wid = G2G.G2CheckBox(self.varbox,'',self.varRefflag,v) 644 GridSiz.Add(wid,0,wx. ALIGN_LEFT|wx.EXPAND,0)644 GridSiz.Add(wid,0,wx.EXPAND,0) 645 645 else: 646 646 wid = (-1,-1) 647 GridSiz.Add(wid,0,wx. ALIGN_LEFT|wx.EXPAND,0)647 GridSiz.Add(wid,0,wx.EXPAND,0) 648 648 649 649 Siz.Add(GridSiz) -
trunk/GSASIIimgGUI.py
r4671 r4672 2056 2056 lbl = wx.StaticText(parent=G2frame.dataWindow,label=' Spot masks(on plot LB drag to move, shift-LB drag to resize, RB to delete)') 2057 2057 lbl.SetBackgroundColour(wx.Colour(200,200,210)) 2058 mainSizer.Add(lbl,0,wx.EXPAND |wx.ALIGN_CENTER,0)2058 mainSizer.Add(lbl,0,wx.EXPAND,0) 2059 2059 colTypes = [wg.GRID_VALUE_STRING,wg.GRID_VALUE_FLOAT+':10,2',wg.GRID_VALUE_BOOL] 2060 2060 colIds = ['position, mm','diameter, mm','Delete?'] … … 2076 2076 lbl = wx.StaticText(parent=G2frame.dataWindow,label=' Ring masks') 2077 2077 lbl.SetBackgroundColour(wx.Colour(200,200,210)) 2078 mainSizer.Add(lbl,0,wx.EXPAND |wx.ALIGN_CENTER,0)2078 mainSizer.Add(lbl,0,wx.EXPAND,0) 2079 2079 littleSizer = wx.FlexGridSizer(0,3,0,5) 2080 2080 littleSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label=' 2-theta,deg'),0,WACV) … … 2098 2098 lbl = wx.StaticText(parent=G2frame.dataWindow,label=' Arc masks') 2099 2099 lbl.SetBackgroundColour(wx.Colour(200,200,210)) 2100 mainSizer.Add(lbl,0,wx.EXPAND |wx.ALIGN_CENTER,0)2100 mainSizer.Add(lbl,0,wx.EXPAND,0) 2101 2101 littleSizer = wx.FlexGridSizer(0,4,0,5) 2102 2102 littleSizer.Add(wx.StaticText(parent=G2frame.dataWindow,label=' 2-theta,deg'),0,WACV) … … 2128 2128 lbl = wx.StaticText(parent=G2frame.dataWindow,label=' X line masks') 2129 2129 lbl.SetBackgroundColour(wx.Colour(200,200,210)) 2130 mainSizer.Add(lbl,0,wx.EXPAND |wx.ALIGN_CENTER,0)2130 mainSizer.Add(lbl,0,wx.EXPAND,0) 2131 2131 littleSizer = wx.FlexGridSizer(0,2,0,5) 2132 2132 for i in range(len(Xlines)): … … 2141 2141 lbl = wx.StaticText(parent=G2frame.dataWindow,label=' Y line masks') 2142 2142 lbl.SetBackgroundColour(wx.Colour(200,200,210)) 2143 mainSizer.Add(lbl,0,wx.EXPAND |wx.ALIGN_CENTER,0)2143 mainSizer.Add(lbl,0,wx.EXPAND,0) 2144 2144 littleSizer = wx.FlexGridSizer(0,2,0,5) 2145 2145 for i in range(len(Ylines)): … … 2155 2155 label=' Polygon masks (on plot LB vertex drag to move, RB vertex drag to insert)') 2156 2156 lbl.SetBackgroundColour(wx.Colour(200,200,210)) 2157 mainSizer.Add(lbl,0,wx.EXPAND |wx.ALIGN_CENTER,0)2157 mainSizer.Add(lbl,0,wx.EXPAND,0) 2158 2158 littleSizer = wx.FlexGridSizer(0,2,0,5) 2159 2159 for i in range(len(Polygons)): … … 2172 2172 label=' Frame mask (on plot LB vertex drag to move, RB vertex drag to insert)') 2173 2173 lbl.SetBackgroundColour(wx.Colour(200,200,210)) 2174 mainSizer.Add(lbl,0,wx.EXPAND |wx.ALIGN_CENTER,0)2174 mainSizer.Add(lbl,0,wx.EXPAND,0) 2175 2175 littleSizer = wx.FlexGridSizer(0,2,0,5) 2176 2176 frameList = [] … … 2992 2992 sizer.Add(wx.StaticText(mnpnl, wx.ID_ANY,'Write to: '),0,WACV) 2993 2993 fInp3 = G2G.ValidatedTxtCtrl(mnpnl,self.params,'outdir',notBlank=False,size=(300,-1)) 2994 sizer.Add(fInp3,1, WACV|wx.EXPAND)2994 sizer.Add(fInp3,1,wx.EXPAND) 2995 2995 btn3 = wx.Button(mnpnl, wx.ID_ANY, "Browse") 2996 2996 btn3.Bind(wx.EVT_BUTTON, OnBrowse) … … 3048 3048 fInp4 = G2G.ValidatedTxtCtrl(mnpnl,self.params,'pdfprm',notBlank=True,size=(300,-1), 3049 3049 OnLeave=scanPDFprm) 3050 sizer.Add(fInp4,1, WACV|wx.EXPAND)3050 sizer.Add(fInp4,1,wx.EXPAND) 3051 3051 btn4 = wx.Button(mnpnl, wx.ID_ANY, "Browse") 3052 3052 btn4.Bind(wx.EVT_BUTTON, OnBrowse) 3053 3053 sizer.Add(btn4,0,wx.ALIGN_RIGHT|WACV) 3054 3054 lblsizr.Add(sizer,0,wx.EXPAND) 3055 mnsizer.Add(lblsizr,0,wx. ALIGN_CENTER|wx.EXPAND,1)3055 mnsizer.Add(lblsizr,0,wx.EXPAND,1) 3056 3056 # buttons on bottom 3057 3057 mnsizer.Add(wx.StaticText(mnpnl, wx.ID_ANY,'AutoIntegration controls'),0,wx.TOP,5) -
trunk/GSASIIphsGUI.py
r4669 r4672 2031 2031 isoSel.Bind(wx.EVT_COMBOBOX,OnIsotope) 2032 2032 Indx[isoSel.GetId()] = elem 2033 elemSizer.Add(isoSel,1, WACV|wx.EXPAND)2033 elemSizer.Add(isoSel,1,wx.EXPAND) 2034 2034 elemSizer.Add(wx.StaticText(General,label=' No. per cell'),0,WACV) 2035 2035 for elem in generalData['AtomTypes']: … … 2228 2228 btnsizer.AddButton(btn) 2229 2229 btnsizer.Realize() 2230 sizer.Add(btnsizer, 0, wx. ALIGN_CENTER_VERTICAL|wx.EXPAND|wx.ALL, 5)2230 sizer.Add(btnsizer, 0, wx.EXPAND|wx.ALL, 5) 2231 2231 dlg.SetSizer(sizer) 2232 2232 sizer.Fit(dlg) … … 5164 5164 topSizer.Add(wx.StaticText(G2frame.FRMC,label=' RMCProfile setup:'),0,WACV) 5165 5165 # add help button to bring up help web page - at right sede of window 5166 topSizer.Add((-1,-1),1, WACV|wx.EXPAND)5166 topSizer.Add((-1,-1),1,wx.EXPAND) 5167 5167 topSizer.Add(G2G.HelpButton(G2frame.FRMC,helpIndex=G2frame.dataWindow.helpKey)) 5168 mainSizer.Add(topSizer,0, WACV|wx.EXPAND)5168 mainSizer.Add(topSizer,0,wx.EXPAND) 5169 5169 # mainSizer.Add(wx.StaticText(G2frame.FRMC,label=' RMCProfile setup:')) 5170 5170 if not data['RMC']['RMCProfile']: -
trunk/GSASIIpwd.py
r4671 r4672 1348 1348 else: 1349 1349 bet = G2mth.getPinkbeta(parmDict,tth) 1350 bet = max(0. 0001,bet)1350 bet = max(0.1,bet) 1351 1351 sigName = 'sig'+str(iPeak) 1352 1352 if sigName in varyList: -
trunk/GSASIIstrMath.py
r4671 r4672 3183 3183 def GetPinkReflAlpBet(refl,im,hfx,parmDict): 3184 3184 tanPos = tand(refl[5+im]/2.0) 3185 alp = parmDict[hfx+'alpha-0']+parmDict[hfx+'alpha-0']*tanPos3186 bet = parmDict[hfx+'beta-0']+parmDict[hfx+'beta-1']*tanPos3185 alp = max(0.1,parmDict[hfx+'alpha-0']+parmDict[hfx+'alpha-1']*tanPos) 3186 bet = max(0.001,parmDict[hfx+'beta-0']+parmDict[hfx+'beta-1']*tanPos) 3187 3187 return alp,bet 3188 3188 … … 3312 3312 Lorenz = 1./(2.*sind(refl[5+im]/2.)**2*cosd(refl[5+im]/2.)) #Lorentz correction 3313 3313 refl[6+im:8+im] = GetReflSigGamCW(refl,im,wave,G,GB,phfx,calcControls,parmDict) #peak sig & gam 3314 refl[12+im:14+im] = GetPinkReflAlpBet(refl,im,hfx,parmDict) #TODO - skip if alp, bet tabulated?3314 refl[12+im:14+im] = GetPinkReflAlpBet(refl,im,hfx,parmDict) 3315 3315 refl[11+im],refl[14+im],refl[15+im],refl[16+im] = GetIntensityCorr(refl,im,Uniq,G,g,pfx,phfx,hfx,SGData,calcControls,parmDict) 3316 3316 refl[11+im] *= Vst*Lorenz -
trunk/fprime.py
r4365 r4672 158 158 self.Results = wx.TextCtrl( parent=panel,style=wx.TE_MULTILINE|wx.TE_DONTWRAP ) 159 159 self.Results.SetEditable(False) 160 mainSizer.Add(self.Results,1,wx. ALIGN_CENTER_HORIZONTAL|wx.EXPAND)160 mainSizer.Add(self.Results,1,wx.EXPAND) 161 161 mainSizer.Add((10,15),0) 162 162 163 163 selSizer = wx.BoxSizer(wx.HORIZONTAL) 164 164 selSizer.Add((5,10),0) 165 selSizer.Add(wx.StaticText(parent=panel, label='Wavelength:'),0, 166 wx.ALIGN_CENTER_VERTICAL|wx.EXPAND) 165 selSizer.Add(wx.StaticText(parent=panel, label='Wavelength:'),0,wx.EXPAND) 167 166 selSizer.Add((5,10),0) 168 167 self.SpinText1 = wx.TextCtrl(id=wxID_SPINTEXT1, parent=panel, … … 172 171 self.SpinText1.Bind(wx.EVT_TEXT_ENTER, self.OnSpinText1, id=wxID_SPINTEXT1) 173 172 174 selSizer.Add(wx.StaticText(parent=panel, label='Energy:'),0, 175 wx.ALIGN_CENTER_VERTICAL|wx.EXPAND) 173 selSizer.Add(wx.StaticText(parent=panel, label='Energy:'),0,wx.EXPAND) 176 174 selSizer.Add((5,10),0) 177 175 self.SpinText2 = wx.TextCtrl(id=wxID_SPINTEXT2, parent=panel, … … 193 191 minValue=int(1000.*self.Wmin), parent=panel,style=wx.SL_HORIZONTAL, 194 192 value=int(self.Wave*1000.), ) 195 slideSizer.Add(self.slider1,1,wx.EXPAND |wx.ALIGN_RIGHT)193 slideSizer.Add(self.slider1,1,wx.EXPAND) 196 194 self.slider1.Bind(wx.EVT_SLIDER, self.OnSlider1, id=wxID_FPRIMESLIDER1) 197 195 mainSizer.Add(slideSizer,0,wx.EXPAND) … … 200 198 choiceSizer = wx.BoxSizer(wx.HORIZONTAL) 201 199 choiceSizer.Add((5,10),0) 202 choiceSizer.Add(wx.StaticText(parent=panel, label='Plot scales:'), 203 0,wx.ALIGN_CENTER_VERTICAL|wx.EXPAND) 200 choiceSizer.Add(wx.StaticText(parent=panel, label='Plot scales:'),0,wx.EXPAND) 204 201 choiceSizer.Add((5,10),0) 205 202
Note: See TracChangeset
for help on using the changeset viewer.
