Changeset 2915
- Timestamp:
- Jul 7, 2017 2:37:33 PM (6 years ago)
- Location:
- branch/2frame
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branch/2frame/GSASIIIO.py
r2909 r2915 625 625 finally: 626 626 wx.EndBusyCursor() 627 G2frame.Status.SetStatusText('Mouse RB click item to refresh/raise; RB drag/drop to reorder')627 G2frame.Status.SetStatusText('Mouse RB drag/drop to reorder',0) 628 628 629 629 def ProjFileSave(G2frame): -
branch/2frame/GSASIIconstrGUI.py
r2914 r2915 1118 1118 1119 1119 def SetStatusLine(text): 1120 G2frame.GetStatusBar().SetStatusText(text )1120 G2frame.GetStatusBar().SetStatusText(text,1) 1121 1121 1122 1122 G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.ConstraintMenu) … … 2082 2082 2083 2083 def SetStatusLine(text): 2084 G2frame.GetStatusBar().SetStatusText(text )2084 G2frame.GetStatusBar().SetStatusText(text,1) 2085 2085 2086 2086 G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.RigidBodyMenu) -
branch/2frame/GSASIIdataGUI.py
r2914 r2915 69 69 70 70 # define Ids for wx menu items 71 commonTrans = {'abc':np.eye(3),'a-cb':np.array([[1.,0.,0.],[0.,0.,-1.],[0.,1.,0.]]), 72 'ba-c':np.array([[0.,1.,0.],[1.,0.,0.],[0.,0.,-1.]]),'-cba':np.array([[0.,0.,-1.],[0.,1.,0.],[1.,0.,0.]]), 73 'bca':np.array([[0.,1.,0.],[0.,0.,1.],[1.,0.,0.]]),'cab':np.array([[0.,0.,1.],[1.,0.,0.],[0.,1.,0.]]), 74 'R->H':np.array([[1.,-1.,0.],[0.,1.,-1.],[1.,1.,1.]]),'H->R':np.array([[2./3,1./3,1./3],[-1./3,1./3,1./3],[-1./3,-2./3,1./3]]), 75 'P->A':np.array([[-1.,0.,0.],[0.,-1.,1.],[0.,1.,1.]]),'R->O':np.array([[-1.,0.,0.],[0.,-1.,0.],[0.,0.,1.]]), 76 'P->B':np.array([[-1.,0.,1.],[0.,-1.,0.],[1.,0.,1.]]),'B->P':np.array([[-.5,0.,.5],[0.,-1.,0.],[.5,0.,.5]]), 77 'P->C':np.array([[1.,1.,0.],[1.,-1.,0.],[0.,0.,-1.]]),'C->P':np.array([[.5,.5,0.],[.5,-.5,0.],[0.,0.,-1.]]), 78 'P->F':np.array([[-1.,1.,1.],[1.,-1.,1.],[1.,1.,-1.]]),'F->P':np.array([[0.,.5,.5],[.5,0.,.5],[.5,.5,0.]]), 79 'P->I':np.array([[0.,1.,1.],[1.,0.,1.],[1.,1.,0.]]),'I->P':np.array([[-.5,.5,.5],[.5,-.5,.5],[.5,.5,-.5]]), 80 'A->P':np.array([[-1.,0.,0.],[0.,-.5,.5],[0.,.5,.5]]),'O->R':np.array([[-1.,0.,0.],[0.,-1.,0.],[0.,0.,1.]]), 81 'abc*':np.eye(3), } 82 commonNames = ['abc','bca','cab','a-cb','ba-c','-cba','P->A','A->P','P->B','B->P','P->C','C->P', 83 'P->I','I->P','P->F','F->P','H->R','R->H','R->O','O->R','abc*','setting 1->2'] #don't put any new ones after the setting one! 71 84 def Define_wxId(*args): 72 85 '''routine to create unique global wx Id symbols in current module. … … 112 125 113 126 ''' 114 commonTrans = {'abc':np.eye(3),'a-cb':np.array([[1.,0.,0.],[0.,0.,-1.],[0.,1.,0.]]),115 'ba-c':np.array([[0.,1.,0.],[1.,0.,0.],[0.,0.,-1.]]),'-cba':np.array([[0.,0.,-1.],[0.,1.,0.],[1.,0.,0.]]),116 'bca':np.array([[0.,1.,0.],[0.,0.,1.],[1.,0.,0.]]),'cab':np.array([[0.,0.,1.],[1.,0.,0.],[0.,1.,0.]]),117 'R->H':np.array([[1.,-1.,0.],[0.,1.,-1.],[1.,1.,1.]]),'H->R':np.array([[2./3,1./3,1./3],[-1./3,1./3,1./3],[-1./3,-2./3,1./3]]),118 'P->A':np.array([[-1.,0.,0.],[0.,-1.,1.],[0.,1.,1.]]),'R->O':np.array([[-1.,0.,0.],[0.,-1.,0.],[0.,0.,1.]]),119 'P->B':np.array([[-1.,0.,1.],[0.,-1.,0.],[1.,0.,1.]]),'B->P':np.array([[-.5,0.,.5],[0.,-1.,0.],[.5,0.,.5]]),120 'P->C':np.array([[1.,1.,0.],[1.,-1.,0.],[0.,0.,-1.]]),'C->P':np.array([[.5,.5,0.],[.5,-.5,0.],[0.,0.,-1.]]),121 'P->F':np.array([[-1.,1.,1.],[1.,-1.,1.],[1.,1.,-1.]]),'F->P':np.array([[0.,.5,.5],[.5,0.,.5],[.5,.5,0.]]),122 'P->I':np.array([[0.,1.,1.],[1.,0.,1.],[1.,1.,0.]]),'I->P':np.array([[-.5,.5,.5],[.5,-.5,.5],[.5,.5,-.5]]),123 'A->P':np.array([[-1.,0.,0.],[0.,-.5,.5],[0.,.5,.5]]),'O->R':np.array([[-1.,0.,0.],[0.,-1.,0.],[0.,0.,1.]]),124 'abc*':np.eye(3), }125 commonNames = ['abc','bca','cab','a-cb','ba-c','-cba','P->A','A->P','P->B','B->P','P->C','C->P',126 'P->I','I->P','P->F','F->P','H->R','R->H','R->O','O->R','abc*','setting 1->2'] #don't put any new ones after the setting one!127 127 128 128 def __init__(self,parent,data): … … 2842 2842 self.MacroStatusList = [] # logging 2843 2843 self.Status = self.CreateStatusBar() 2844 self.Status.SetFieldsCount(2) 2844 2845 # Bob: note different ways to display the SplitterWindow. I like the 3d effect on the Mac 2845 2846 # as it makes the splitter bar a bit easier to "grab" -- this might need to be platform selected. … … 2855 2856 self.dataWindow.SetSizer(dataSizer) 2856 2857 self.mainPanel.SplitVertically(self.treePanel, self.dataWindow, 200) 2858 self.Status.SetStatusWidths([200,-1]) # make these match? 2857 2859 2858 2860 wxID_PATTERNTREE = wx.NewId() … … 6035 6037 6036 6038 if 'SVD' in data['deriv type']: 6037 G2frame.GetStatusBar().SetStatusText('Hessian SVD not recommended for initial refinements; use analytic Hessian or Jacobian' )6039 G2frame.GetStatusBar().SetStatusText('Hessian SVD not recommended for initial refinements; use analytic Hessian or Jacobian',1) 6038 6040 else: 6039 G2frame.GetStatusBar().SetStatusText('' )6041 G2frame.GetStatusBar().SetStatusText('',1) 6040 6042 G2frame.dataWindow.ClearData() 6041 6043 G2frame.dataWindow.SetupScrolling() … … 6886 6888 if G2frame.dataDisplay: 6887 6889 G2frame.dataDisplay.Destroy() 6888 G2frame.GetStatusBar().SetStatusText("Select column to export; Double click on column to plot data; on row for Covariance" )6890 G2frame.GetStatusBar().SetStatusText("Select column to export; Double click on column to plot data; on row for Covariance",1) 6889 6891 sampleParms = GetSampleParms() 6890 6892 … … 6944 6946 #G2frame.dataWindow.SetLabel(G2frame.GetLabel().split('||')[0]+' || '+'Sequential refinement results') 6945 6947 G2frame.SetTitle('Sequential refinement results') 6946 G2frame.GetStatusBar().SetStatusText('' )6948 G2frame.GetStatusBar().SetStatusText('',1) 6947 6949 G2frame.Bind(wx.EVT_MENU, OnRenameSelSeq, id=wxID_RENAMESEQSEL) 6948 6950 G2frame.Bind(wx.EVT_MENU, OnSaveSelSeq, id=wxID_SAVESEQSEL) -
branch/2frame/GSASIIddataGUI.py
r2911 r2915 855 855 useBox.Add(lebail,0,WACV) 856 856 if UseList[G2frame.hist]['LeBail']: 857 G2frame.SetStatusText('To reset LeBail, cycle LeBail check box.' )857 G2frame.SetStatusText('To reset LeBail, cycle LeBail check box.',1) 858 858 bottomSizer.Add(useBox,0,WACV|wx.TOP|wx.BOTTOM|wx.LEFT,5) 859 859 … … 961 961 # Beginning of UpdateDData execution here 962 962 ###################################################################### 963 G2frame.SetStatusText('' )963 G2frame.SetStatusText('',1) 964 964 keyList = G2frame.GetHistogramNames(['PWDR','HKLF']) 965 965 UseList = data['Histograms'] -
branch/2frame/GSASIIimgGUI.py
r2911 r2915 164 164 165 165 def OnCalibrate(event): 166 G2frame.GetStatusBar().SetStatusText('Select > 4 points on 1st used ring; LB to pick (shift key to force pick), RB on point to delete else RB to finish' )166 G2frame.GetStatusBar().SetStatusText('Select > 4 points on 1st used ring; LB to pick (shift key to force pick), RB on point to delete else RB to finish',1) 167 167 G2frame.ifGetRing = True 168 168 … … 1564 1564 G2frame.Bind(wx.EVT_MENU, OnNewFrameMask, id=G2gd.wxID_NEWMASKFRAME) 1565 1565 if G2frame.MaskKey == 'f': 1566 G2frame.GetStatusBar().SetStatusText('Frame mask active - LB pick next point, RB close polygon' )1566 G2frame.GetStatusBar().SetStatusText('Frame mask active - LB pick next point, RB close polygon',1) 1567 1567 elif G2frame.MaskKey == 'p': 1568 G2frame.GetStatusBar().SetStatusText('Polygon mask active - LB pick next point, RB close polygon' )1568 G2frame.GetStatusBar().SetStatusText('Polygon mask active - LB pick next point, RB close polygon',1) 1569 1569 elif G2frame.MaskKey == 'a': 1570 G2frame.GetStatusBar().SetStatusText('Arc mask active - LB pick arc location' )1570 G2frame.GetStatusBar().SetStatusText('Arc mask active - LB pick arc location',1) 1571 1571 elif G2frame.MaskKey == 'r': 1572 G2frame.GetStatusBar().SetStatusText('Ring mask active - LB pick ring location' )1572 G2frame.GetStatusBar().SetStatusText('Ring mask active - LB pick ring location',1) 1573 1573 else: 1574 G2frame.GetStatusBar().SetStatusText("To add mask: press a,r,s,p or f on 2D image for arc/ring/spot/polygon/frame" )1574 G2frame.GetStatusBar().SetStatusText("To add mask: press a,r,s,p or f on 2D image for arc/ring/spot/polygon/frame",1) 1575 1575 mainSizer = G2frame.dataWindow.GetSizer() 1576 1576 mainSizer.Add((5,10),0) … … 2143 2143 G2frame.Bind(wx.EVT_MENU, OnStrStaSample, id=G2gd.wxID_STRSTSAMPLE) 2144 2144 if G2frame.StrainKey == 'a': #probably doesn't happen 2145 G2frame.GetStatusBar().SetStatusText('Add strain ring active - LB pick d-zero value' )2145 G2frame.GetStatusBar().SetStatusText('Add strain ring active - LB pick d-zero value',1) 2146 2146 else: 2147 G2frame.GetStatusBar().SetStatusText("To add strain data: On 2D Powder Image, key a:add ring" )2147 G2frame.GetStatusBar().SetStatusText("To add strain data: On 2D Powder Image, key a:add ring",1) 2148 2148 2149 2149 mainSizer = G2frame.dataWindow.GetSizer() -
branch/2frame/GSASIIphsGUI.py
r2913 r2915 336 336 :param phase: phase data 337 337 338 #NB: commonNames & commonTrans defined at top of this file338 #NB: commonNames & commonTrans defined in GSASIIdataGUI = G2gd 339 339 ''' 340 340 def __init__(self,parent,phase): … … 375 375 self.Phase['General']['SGData'] = SGData 376 376 else: 377 if self.Common == commonNames[-1]: #change setting377 if self.Common == G2gd.commonNames[-1]: #change setting 378 378 self.Vec = G2spc.spg2origins[self.oldSpGrp] 379 379 self.newSpGrp = self.oldSpGrp 380 380 else: 381 self.Trans = commonTrans[self.Common]381 self.Trans = G2gd.commonTrans[self.Common] 382 382 if 'R' == self.Common[-1]: 383 383 self.newSpGrp += ' r' … … 447 447 commonSizer.Add(wx.StaticText(self.panel,label=' Common transformations: '),0,WACV) 448 448 if self.oldSpGrp not in G2spc.spg2origins: 449 common = wx.ComboBox(self.panel,value=self.Common,choices= commonNames[:-1],449 common = wx.ComboBox(self.panel,value=self.Common,choices=G2gd.commonNames[:-1], 450 450 style=wx.CB_READONLY|wx.CB_DROPDOWN) 451 451 else: 452 common = wx.ComboBox(self.panel,value=self.Common,choices= commonNames,452 common = wx.ComboBox(self.panel,value=self.Common,choices=G2gd.commonNames, 453 453 style=wx.CB_READONLY|wx.CB_DROPDOWN) 454 454 common.Bind(wx.EVT_COMBOBOX,OnCommon) … … 2319 2319 G2G.HorizontalLine(mainSizer,General) 2320 2320 mainSizer.Add(MCSASizer()) 2321 G2frame.GetStatusBar().SetStatusText('' )2321 G2frame.GetStatusBar().SetStatusText('',1) 2322 2322 SetPhaseWindow(General,mainSizer,Scroll=Scroll) 2323 2323 … … 2619 2619 if not (event.AltDown() or (event.ShiftDown() and event.ControlDown())): 2620 2620 Atoms.frm = -1 2621 G2frame.GetStatusBar().SetStatusText('' )2621 G2frame.GetStatusBar().SetStatusText('',1) 2622 2622 if r < 0 and c < 0: 2623 2623 if Atoms.IsSelection(): … … 2648 2648 Atoms.SelectRow(r,True) 2649 2649 n = colLabels.index('Name') 2650 G2frame.GetStatusBar().SetStatusText('Atom '+atomData[r][n]+' is to be moved' )2650 G2frame.GetStatusBar().SetStatusText('Atom '+atomData[r][n]+' is to be moved',1) 2651 2651 else: #move it 2652 2652 item = atomData.pop(Atoms.frm) 2653 2653 atomData.insert(r,item) 2654 2654 Atoms.frm = -1 2655 G2frame.GetStatusBar().SetStatusText('' )2655 G2frame.GetStatusBar().SetStatusText('',1) 2656 2656 wx.CallAfter(Paint) 2657 2657 else: … … 2815 2815 Types = Types[:7]+3*[wg.GRID_VALUE_FLOAT+':10,4',]+Types[7:] 2816 2816 SGData = data['General']['SGData'] 2817 G2frame.GetStatusBar().SetStatusText('' )2817 G2frame.GetStatusBar().SetStatusText('',1) 2818 2818 if SGData['SGPolax']: 2819 G2frame.GetStatusBar().SetStatusText('Warning: The location of the origin is arbitrary in '+SGData['SGPolax'] )2819 G2frame.GetStatusBar().SetStatusText('Warning: The location of the origin is arbitrary in '+SGData['SGPolax'],1) 2820 2820 Atoms.Bind(wg.EVT_GRID_CELL_CHANGE, ChangeAtomCell) 2821 2821 Atoms.Bind(wg.EVT_GRID_CELL_LEFT_DCLICK, AtomTypeSelect) … … 3128 3128 atom = atomData[ind] 3129 3129 if atom[ci+8] in rbAtmDict: 3130 G2frame.GetStatusBar().SetStatusText('**** ERROR - atom is in a rigid body and can not be deleted ****' )3130 G2frame.GetStatusBar().SetStatusText('**** ERROR - atom is in a rigid body and can not be deleted ****',1) 3131 3131 else: 3132 3132 if atom[ci+8] in HydIds: #remove Hs from Hatom update dict … … 4314 4314 if len(Layers['Layers']): 4315 4315 layerNames = [layer['Name'] for layer in Layers['Layers']] 4316 G2frame.GetStatusBar().SetStatusText('' )4316 G2frame.GetStatusBar().SetStatusText('',1) 4317 4317 layerData = G2frame.layerData 4318 4318 if layerData.GetSizer(): … … 4617 4617 Indx = {} 4618 4618 waveData = G2frame.waveData 4619 G2frame.GetStatusBar().SetStatusText('' )4619 G2frame.GetStatusBar().SetStatusText('',1) 4620 4620 generalData = data['General'] 4621 4621 SGData = generalData['SGData'] … … 4983 4983 'atNames':atNames,'rbRef':[0,1,2,False],'rbSeq':[],'SelSeq':[0,0],'useCount':0} 4984 4984 RBData['RBIds']['Residue'].append(rbId) 4985 G2frame.GetStatusBar().SetStatusText('New rigid body UNKRB added to set of Residue rigid bodies' )4985 G2frame.GetStatusBar().SetStatusText('New rigid body UNKRB added to set of Residue rigid bodies',1) 4986 4986 4987 4987 ################################################################################ … … 5122 5122 5123 5123 # UpdateDrawAtoms executable code starts here 5124 G2frame.GetStatusBar().SetStatusText('' )5124 G2frame.GetStatusBar().SetStatusText('',1) 5125 5125 generalData = data['General'] 5126 5126 SetupDrawingData() … … 5233 5233 if indx: 5234 5234 if len(indx) > 1: 5235 G2frame.GetStatusBar().SetStatusText('Select Custom Color, change color, Add to Custom Colors, then OK' )5235 G2frame.GetStatusBar().SetStatusText('Select Custom Color, change color, Add to Custom Colors, then OK',1) 5236 5236 else: 5237 G2frame.GetStatusBar().SetStatusText('Change color, Add to Custom Colors, then OK' )5237 G2frame.GetStatusBar().SetStatusText('Change color, Add to Custom Colors, then OK',1) 5238 5238 atomData = data['Drawing']['Atoms'] 5239 5239 cx,ct,cs,ci = data['Drawing']['atomPtrs'] … … 5262 5262 drawAtoms.ClearSelection() 5263 5263 dlg.Destroy() 5264 G2frame.GetStatusBar().SetStatusText('' )5264 G2frame.GetStatusBar().SetStatusText('',1) 5265 5265 G2plt.PlotStructure(G2frame,data) 5266 5266 … … 6077 6077 drawingData = data['Drawing'] 6078 6078 6079 G2frame.GetStatusBar().SetStatusText('' )6079 G2frame.GetStatusBar().SetStatusText('',1) 6080 6080 if drawOptions.GetSizer(): 6081 6081 drawOptions.GetSizer().Clear(True) … … 6344 6344 # UpdateTexture executable starts here 6345 6345 if Texture.GetSizer(): Texture.GetSizer().Clear(True) 6346 G2frame.GetStatusBar().SetStatusText('' )6346 G2frame.GetStatusBar().SetStatusText('',1) 6347 6347 generalData = data['General'] 6348 6348 SGData = generalData['SGData'] … … 6544 6544 6545 6545 def OnDataUse(event): 6546 hist = G2frame.hist6546 # hist = G2frame.hist 6547 6547 if data['Histograms']: 6548 6548 dlg = G2G.G2MultiChoiceDialog(G2frame, 'Use histograms', … … 7030 7030 7031 7031 def VecrbSizer(RBObj): 7032 G2frame.GetStatusBar().SetStatusText('NB: Rotation vector is in crystallographic space' )7032 G2frame.GetStatusBar().SetStatusText('NB: Rotation vector is in crystallographic space',1) 7033 7033 7034 7034 def OnDelVecRB(event): … … 7106 7106 if 'macro' in general['Type']: 7107 7107 atomStyle = 'sticks' 7108 G2frame.GetStatusBar().SetStatusText('' )7108 G2frame.GetStatusBar().SetStatusText('',1) 7109 7109 mainSizer = wx.BoxSizer(wx.VERTICAL) 7110 7110 if not data['RBModels']: … … 7131 7131 G2frame.bottomSizer.Add(ResrbSizer(rbObj)) 7132 7132 mainSizer.Add(G2frame.bottomSizer) 7133 G2frame.GetStatusBar().SetStatusText('NB: Rotation vector is in crystallographic space' )7133 G2frame.GetStatusBar().SetStatusText('NB: Rotation vector is in crystallographic space',1) 7134 7134 G2plt.PlotStructure(G2frame,data) 7135 7135 if 'Vector' in data['RBModels'] and len(data['RBModels']['Vector']): … … 7174 7174 def OnRBAssign(event): 7175 7175 7176 G2frame.GetStatusBar().SetStatusText('' )7176 G2frame.GetStatusBar().SetStatusText('',1) 7177 7177 RBData = G2frame.GPXtree.GetItemPyData( 7178 7178 G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Rigid bodies')) … … 7998 7998 # if 'macro' in general['Type']: 7999 7999 # atomStyle = 'sticks' 8000 G2frame.GetStatusBar().SetStatusText('' )8000 G2frame.GetStatusBar().SetStatusText('',1) 8001 8001 mainSizer = wx.BoxSizer(wx.VERTICAL) 8002 8002 if not data['MCSA']['Models']: … … 8239 8239 8240 8240 # FillPawleyReflectionsGrid executable starts here 8241 G2frame.GetStatusBar().SetStatusText('To delete a Pawley reflection: select row & press Delete' )8241 G2frame.GetStatusBar().SetStatusText('To delete a Pawley reflection: select row & press Delete',1) 8242 8242 generalData = data['General'] 8243 8243 if 'Pawley ref' in data: … … 8551 8551 G2plt.PlotStructure(G2frame,data) 8552 8552 8553 G2frame.GetStatusBar().SetStatusText('' )8553 G2frame.GetStatusBar().SetStatusText('',1) 8554 8554 if 'Map Peaks' in data: 8555 G2frame.GetStatusBar().SetStatusText('Double click any column heading to sort' )8555 G2frame.GetStatusBar().SetStatusText('Double click any column heading to sort',1) 8556 8556 mapPeaks = data['Map Peaks'] 8557 8557 rowLabels = [] -
branch/2frame/GSASIIpwdGUI.py
r2913 r2915 812 812 # beginning of UpdatePeakGrid init 813 813 #====================================================================== 814 G2frame.GetStatusBar().SetStatusText('Global refine: select refine column & press Y or N' )814 G2frame.GetStatusBar().SetStatusText('Global refine: select refine column & press Y or N',1) 815 815 G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.PeakMenu) 816 816 G2frame.Bind(wx.EVT_MENU, OnAutoSearch, id=G2gd.wxID_AUTOSEARCH) … … 1968 1968 if 'P' in insVal['Type']: #powder data menu commands 1969 1969 G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.InstMenu) 1970 G2frame.GetStatusBar().SetStatusText('NB: Azimuth is used for polarization only' )1970 G2frame.GetStatusBar().SetStatusText('NB: Azimuth is used for polarization only',1) 1971 1971 G2frame.Bind(wx.EVT_MENU,OnCalibrate,id=G2gd.wxID_INSTCALIB) 1972 1972 G2frame.Bind(wx.EVT_MENU,OnLoad,id=G2gd.wxID_INSTLOAD) … … 3107 3107 G2frame.GPXtree.SetItemPyData(sub, \ 3108 3108 G2obj.SetNewPhase(Name=PhaseName,SGData=SGData,cell=cell[1:],Super=ssopt)) 3109 G2frame.GetStatusBar().SetStatusText('Change space group from '+str(controls[13])+' if needed' )3109 G2frame.GetStatusBar().SetStatusText('Change space group from '+str(controls[13])+' if needed',1) 3110 3110 finally: 3111 3111 dlg.Destroy() … … 3491 3491 G2frame.SetTitle('Reflection List for '+phaseName) 3492 3492 if HKLF: 3493 G2frame.GetStatusBar().SetStatusText('abs(DF)/sig > 10 red; > 3 yellow; twin < 0 (user rejected) red; twin=0 (sp. gp. absent) red' )3493 G2frame.GetStatusBar().SetStatusText('abs(DF)/sig > 10 red; > 3 yellow; twin < 0 (user rejected) red; twin=0 (sp. gp. absent) red',1) 3494 3494 else: 3495 G2frame.GetStatusBar().SetStatusText('Prfo < 0. in red; if excluded Fosq in red & mul < 0' )3495 G2frame.GetStatusBar().SetStatusText('Prfo < 0. in red; if excluded Fosq in red & mul < 0',1) 3496 3496 itof = 0 3497 3497 if HKLF: … … 4609 4609 if 'Size' in data['Current']: 4610 4610 if 'MaxEnt' in data['Size']['Method']: 4611 G2frame.GetStatusBar().SetStatusText('Size distribution by Maximum entropy' )4611 G2frame.GetStatusBar().SetStatusText('Size distribution by Maximum entropy',1) 4612 4612 elif 'IPG' in data['Size']['Method']: 4613 G2frame.GetStatusBar().SetStatusText('Size distribution by Interior-Point Gradient' )4613 G2frame.GetStatusBar().SetStatusText('Size distribution by Interior-Point Gradient',1) 4614 4614 mainSizer.Add(SizeSizer()) 4615 4615 elif 'Particle' in data['Current']: … … 5365 5365 if item['Refine']: 5366 5366 G2frame.GetStatusBar().SetStatusText('Be sure Mult is close to anticipated value. '+ \ 5367 'Suggest setting Flat Bkg. to 0 before Optimize Mult' )5367 'Suggest setting Flat Bkg. to 0 before Optimize Mult',1) 5368 5368 5369 5369 def GetExposure(backFile): … … 5539 5539 G2frame.ErrorDialog('PDF error','Chemical formula not defined') 5540 5540 return 5541 G2frame.GetStatusBar().SetStatusText('' )5541 G2frame.GetStatusBar().SetStatusText('',1) 5542 5542 wx.BeginBusyCursor() 5543 5543 try: … … 5757 5757 olddata['Sample'] = sample 5758 5758 G2frame.GPXtree.SetItemPyData(G2gd.GetGPXtreeItemId(G2frame,id, 'PDF Controls'),olddata) 5759 G2frame.GetStatusBar().SetStatusText('PDF controls copied' )5759 G2frame.GetStatusBar().SetStatusText('PDF controls copied',1) 5760 5760 finally: 5761 5761 dlg.Destroy() … … 5841 5841 return 5842 5842 auxPlot = computePDF(G2frame,data) 5843 G2frame.GetStatusBar().SetStatusText('PDF computed' )5843 G2frame.GetStatusBar().SetStatusText('PDF computed',1) 5844 5844 for plot in auxPlot: 5845 5845 XY = np.array(plot[:2]) … … 5913 5913 else: 5914 5914 msg = '{}/{} PDFs computed'.format(N,len(Names)) 5915 G2frame.GetStatusBar().SetStatusText(msg )5915 G2frame.GetStatusBar().SetStatusText(msg,1) 5916 5916 print(msg) 5917 5917 # what item is being plotted? -- might be better to select from tree … … 6096 6096 olddata.update(copy.deepcopy(peaks)) 6097 6097 G2frame.GPXtree.SetItemPyData(G2gd.GetGPXtreeItemId(G2frame,id, 'PDF Peaks'),olddata) 6098 G2frame.GetStatusBar().SetStatusText('PDF peaks copied' )6098 G2frame.GetStatusBar().SetStatusText('PDF peaks copied',1) 6099 6099 finally: 6100 6100 dlg.Destroy()
Note: See TracChangeset
for help on using the changeset viewer.