Changeset 3591 for trunk/GSASIIphsGUI.py
- Timestamp:
- Sep 11, 2018 4:13:58 PM (4 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIphsGUI.py
r3590 r3591 572 572 self.panel = wx.Panel(self) 573 573 Indx = {} 574 Mstr = [' Mx ',' My ',' Mz']574 Mstr = [' Mx',' My',' Mz'] 575 575 mainSizer = wx.BoxSizer(wx.VERTICAL) 576 576 577 mainSizer.Add(wx.StaticText(self.panel,label=' Name, x, y, z, allowed moments :'),0,WACV)577 mainSizer.Add(wx.StaticText(self.panel,label=' Name, x, y, z, allowed moments, mag. site sym:'),0,WACV) 578 578 atmSizer = wx.FlexGridSizer(0,2,5,5) 579 579 for iuse,[use,atom,mxyz] in enumerate(zip(self.Use,self.Atoms,self.atMxyz)): 580 mstr = [' __ ',' __ ',' __']581 for i,mx in enumerate(mxyz ):580 mstr = [' ---',' ---',' ---'] 581 for i,mx in enumerate(mxyz[1]): 582 582 if mx: 583 583 mstr[i] = Mstr[i] … … 587 587 useChk.Bind(wx.EVT_CHECKBOX, OnUseChk) 588 588 atmSizer.Add(useChk,0,WACV) 589 text = ' %5s %10.5f %10.5f %10.5f %4s %4s %4s '%(atom[0],atom[3],atom[4],atom[5],mstr[0],mstr[1],mstr[2])589 text = ' %5s %10.5f %10.5f %10.5f (%s,%s,%s) %s '%(atom[0],atom[3],atom[4],atom[5],mstr[0],mstr[1],mstr[2],mxyz[0]) 590 590 atmSizer.Add(wx.StaticText(self.panel,label=text),0,WACV) 591 591 mainSizer.Add(atmSizer) … … 2415 2415 SytSym,Mul,Nop,dupDir = G2spc.SytSym(atom[3:6],SGData) 2416 2416 CSI = G2spc.GetCSpqinel(SGData['SpnFlp'],dupDir) 2417 atMxyz.append(CSI[0]) 2417 MagSytSym = G2spc.MagSytSym(SytSym,dupDir,SGData) 2418 atMxyz.append([MagSytSym,CSI[0]]) 2418 2419 dlg = UseMagAtomDialog(G2frame,SGData['MagSpGrp'],Atoms,atCodes,atMxyz,ifDelete=False) 2419 2420 try: 2420 if dlg.ShowModal() == wx.ID_YES: 2421 opt = dlg.ShowModal() 2422 if opt == wx.ID_YES: 2421 2423 newPhase['Atoms'],atCodes = dlg.GetSelection() 2422 2424 generalData['Lande g'] = len(generalData['AtomTypes'])*[2.,] 2423 2425 break 2426 else: 2427 return 2424 2428 finally: 2425 2429 dlg.Destroy() … … 2489 2493 Atms.append(atom) 2490 2494 AtCods.append(atCodes[ia]) 2491 atMxyz.append(CSI[0]) 2495 MagSytSym = G2spc.MagSytSym(SytSym,dupDir,SGData) 2496 atMxyz.append([MagSytSym,CSI[0]]) 2492 2497 dlg = UseMagAtomDialog(G2frame,magchoice['Name'],Atms,AtCods,atMxyz,ifDelete=True) 2493 2498 try:
Note: See TracChangeset
for help on using the changeset viewer.