Changeset 3302
- Timestamp:
- Mar 2, 2018 1:44:14 PM (5 years ago)
- Location:
- trunk
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASIIconstrGUI.py
r3239 r3302 1214 1214 oAcof = G2lat.cell2A(oldPhase['General']['Cell'][1:7]) 1215 1215 nAcof = G2lat.cell2A(newPhase['General']['Cell'][1:7]) 1216 item = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Constraints') 1216 item = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Constraints') 1217 if not item: 1218 return 1217 1219 constraints = G2frame.GPXtree.GetItemPyData(item) 1218 1220 # GSASIIpath.IPyBreak() -
trunk/GSASIIphsGUI.py
r3300 r3302 1812 1812 return 1813 1813 Obj = event.GetEventObject() 1814 isym = Indx[Obj.GetId()] 1814 isym = Indx[Obj.GetId()]+1 1815 1815 spCode = {'red':-1,'black':1} 1816 1816 SGData['SGSpin'][isym] = spCode[Obj.GetValue()] … … 2705 2705 if 'Mx' in colLabels: 2706 2706 colM = colLabels.index('Mx') 2707 atTypes = generalData['AtomTypes']2708 Lande = generalData['Lande g']2709 AtInfo = dict(zip(atTypes,Lande))2707 # atTypes = generalData['AtomTypes'] 2708 # Lande = generalData['Lande g'] 2709 # AtInfo = dict(zip(atTypes,Lande)) 2710 2710 attr = wx.grid.GridCellAttr() 2711 2711 attr.IncRef() #fix from Jim Hester … … 2754 2754 CSI = G2spc.GetCSpqinel(SytSym,SpnFlp,dupDir) 2755 2755 # print (SytSym,Nop,SpnFlp[Nop],CSI,dupDir) 2756 # print('CSI:',CSI) 2757 saveCSI = 0 2756 2758 for i in range(3): 2757 2759 ci = i+colM 2758 2760 Atoms.SetCellStyle(row,ci,VERY_LIGHT_GREY,True) 2759 2761 Atoms.SetCellTextColour(row,ci,VERY_LIGHT_GREY) 2760 if CSI and CSI[1][i] and AtInfo and AtInfo[atomData[row][colType]]: 2761 Atoms.SetCellStyle(row,ci,WHITE,False) 2762 if CSI and CSI[1][i]: # and AtInfo and AtInfo[atomData[row][colType]]: 2763 if saveCSI != CSI[0][i]: 2764 Atoms.SetCellStyle(row,ci,WHITE,False) 2765 saveCSI = CSI[0][i] 2762 2766 Atoms.SetCellTextColour(row,ci,BLACK) 2763 2767 if 'X' in rbExcl: -
trunk/GSASIIspc.py
r3300 r3302 2179 2179 "returns Mxyz terms, multipliers, GUI flags" 2180 2180 CSI = [[1,2,3],[1.0,1.0,1.0]] 2181 if siteSym.strip() in ['-1','m3m']:2182 if SpnFlp[len(SpnFlp)//2] < 0:2183 return [[0,0,0],[0.,0.,0.]]2184 else:2185 return [[1,1,1],[1.,1.,1.]]2186 2181 for opr in dupDir: 2187 2182 indx = GetNXUPQsym(opr)
Note: See TracChangeset
for help on using the changeset viewer.