Changeset 2211
- Timestamp:
- Apr 13, 2016 3:16:53 PM (7 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIgrid.py
r2198 r2211 165 165 '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]]), 166 166 '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]]), 167 '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]]), } 168 commonNames = ['abc','bca','cab','a-cb','ba-c','-cba','P->A','A->P', 169 'P->B','B->P','P->C','C->P','P->I','I->P','P->F','F->P','P->R','R->P','R->O','O->R'] 167 '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]]), 168 'abc*':np.eye(3), } 169 commonNames = ['abc','bca','cab','a-cb','ba-c','-cba','P->A','A->P','P->B','B->P','P->C','C->P', 170 'P->I','I->P','P->F','F->P','P->R','R->P','R->O','O->R','abc*',] 170 171 171 172 # Should SGMessageBox, SymOpDialog, DisAglDialog be moved? … … 372 373 for fld in Flds: fld = fld.strip() 373 374 SpcGp = ' '.join(Flds) 375 if SpcGp == self.SpGrp: #didn't change it! 376 return 374 377 # try a lookup on the user-supplied name 375 378 SpGrpNorm = G2spc.StandardizeSpcName(SpcGp) … … 388 391 text,table = G2spc.SGPrint(SGData) 389 392 self.Phase['General']['SGData'] = SGData 390 self.SpGrp = Sp Grp393 self.SpGrp = SpcGp 391 394 SGTxt.SetValue(self.Phase['General']['SGData']['SpGrp']) 392 395 msg = 'Space Group Information' … … 478 481 479 482 def GetSelection(self): 480 self.Phase['General']['Name'] += ' %s'%(self. SpGrp)483 self.Phase['General']['Name'] += ' %s'%(self.Common) 481 484 self.Phase['General']['Cell'][1:] = G2lat.TransformCell(self.oldCell[:6],self.Trans) 482 485 return self.Phase,self.Trans,self.Vec … … 703 706 commonSizer = wx.BoxSizer(wx.HORIZONTAL) 704 707 commonSizer.Add(wx.StaticText(self.panel,label=' Common transformations: '),0,WACV) 705 common = wx.ComboBox(self.panel,value=self.Common,choices=commonNames ,708 common = wx.ComboBox(self.panel,value=self.Common,choices=commonNames[:-1], #not the last one! 706 709 style=wx.CB_READONLY|wx.CB_DROPDOWN) 707 710 common.Bind(wx.EVT_COMBOBOX,OnCommon) -
trunk/GSASIIphsGUI.py
r2210 r2211 1227 1227 dlg.Destroy() 1228 1228 phaseName = newPhase['General']['Name'] 1229 print phaseName 1229 1230 sub = G2frame.PatternTree.AppendItem(parent= 1230 G2gd.GetPatternTreeItemId(G2frame,G2frame.root,'Phases'),text= PhaseName)1231 G2gd.GetPatternTreeItemId(G2frame,G2frame.root,'Phases'),text=phaseName) 1231 1232 G2frame.PatternTree.SetItemPyData(sub,newPhase) 1232 1233 -
trunk/GSASIIplot.py
r2209 r2211 1113 1113 RenderDots(HKL,RC) 1114 1114 time0 = time.time() 1115 #if Page.context: Page.canvas.SetCurrent(Page.context) # wx 2.9 fix1115 if Page.context: Page.canvas.SetCurrent(Page.context) # wx 2.9 fix 1116 1116 Page.canvas.SwapBuffers() 1117 1117 … … 4960 4960 G2frame.G2plotNB.status.SetStatusText('New quaternion: %.2f+, %.2fi+ ,%.2fj+, %.2fk'%(Q[0],Q[1],Q[2],Q[3]),1) 4961 4961 Draw('move') 4962 4963 4962 4964 4963 def OnMouseWheel(event): … … 5657 5656 RenderBackbone(Backbone,BackboneColor,bondR) 5658 5657 # print time.time()-time0 5659 #if Page.context: Page.canvas.SetCurrent(Page.context) # wx 2.9 fix5658 if Page.context: Page.canvas.SetCurrent(Page.context) # wx 2.9 fix 5660 5659 Page.canvas.SwapBuffers() 5661 5660 … … 5712 5711 except: 5713 5712 pass 5714 Draw('main')5713 wx.CallAfter(Draw,'main') 5715 5714 if firstCall: Draw('main') # draw twice the first time that graphics are displayed 5716 5715 … … 5964 5963 RenderBonds(x,y,z,Bonds[iat],0.05,color) 5965 5964 RenderLabel(x,y,z,' '+atNames[iat],matRot) 5966 #if Page.context: Page.canvas.SetCurrent(Page.context) # wx 2.9 fix5965 if Page.context: Page.canvas.SetCurrent(Page.context) # wx 2.9 fix 5967 5966 Page.canvas.SwapBuffers() 5968 5967 … … 6350 6349 if Page.labels: 6351 6350 RenderLabel(x,y,z,' '+AtNames[iat],matRot) 6352 #if Page.context: Page.canvas.SetCurrent(Page.context) # wx 2.9 fix6351 if Page.context: Page.canvas.SetCurrent(Page.context) # wx 2.9 fix 6353 6352 Page.canvas.SwapBuffers() 6354 6353 -
trunk/GSASIIpwdGUI.py
r2202 r2211 3209 3209 refList = data[1]['RefList'] 3210 3210 else: #powder data is a dict of dicts; each same structure as SC 2nd dict 3211 refList = np.array(data[phaseName]['RefList']) 3211 if 'RefList' in data[phaseName]: 3212 refList = np.array(data[phaseName]['RefList']) 3213 else: 3214 wx.MessageBox('No reflection list - do Refine first',caption='Reflection plotting') 3215 return 3212 3216 FoMax = np.max(refList.T[8+Super]) 3213 3217 Hmin = np.array([int(np.min(refList.T[0])),int(np.min(refList.T[1])),int(np.min(refList.T[2]))]) … … 3233 3237 refList = data[1]['RefList'] 3234 3238 else: #powder data is a dict of dicts; each same structure as SC 2nd dict 3235 refList = np.array(data[phaseName]['RefList']) 3239 if 'RefList' in data[phaseName]: 3240 refList = np.array(data[phaseName]['RefList']) 3241 else: 3242 wx.MessageBox('No reflection list - do Refine first',caption='Reflection plotting') 3243 return 3236 3244 refList.T[3+Super] = np.where(refList.T[4+Super]<dMin,-refList.T[3+Super],refList.T[3+Super]) 3237 3245 FoMax = np.max(refList.T[8+Super])
Note: See TracChangeset
for help on using the changeset viewer.