Changeset 3302

Timestamp:

Mar 2, 2018 1:44:14 PM (4 years ago)

Author:

vondreele

Message:

mag sym fixes

Location:

trunk

Files:

• GSASIIconstrGUI.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (3 diffs)
• GSASIIspc.py (modified) (1 diff)

trunk/GSASIIconstrGUI.py

@@ -1214 +1214 @@
     oAcof = G2lat.cell2A(oldPhase['General']['Cell'][1:7])
     nAcof = G2lat.cell2A(newPhase['General']['Cell'][1:7])
-    item = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Constraints') 
+    item = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Constraints')
+    if not item:
+        return
     constraints = G2frame.GPXtree.GetItemPyData(item)
 #    GSASIIpath.IPyBreak()

trunk/GSASIIphsGUI.py

@@ -1812 +1812 @@
                     return
                 Obj = event.GetEventObject()
-                isym = Indx[Obj.GetId()]
+                isym = Indx[Obj.GetId()]+1
                 spCode = {'red':-1,'black':1}                    
                 SGData['SGSpin'][isym] = spCode[Obj.GetValue()]
@@ -2705 +2705 @@
             if 'Mx' in colLabels:
                 colM = colLabels.index('Mx')
-                atTypes = generalData['AtomTypes']
-                Lande = generalData['Lande g']
-                AtInfo = dict(zip(atTypes,Lande))
+#                atTypes = generalData['AtomTypes']
+#                Lande = generalData['Lande g']
+#                AtInfo = dict(zip(atTypes,Lande))
             attr = wx.grid.GridCellAttr()
             attr.IncRef()               #fix from Jim Hester
@@ -2754 +2754 @@
                         CSI = G2spc.GetCSpqinel(SytSym,SpnFlp,dupDir)
 #                    print (SytSym,Nop,SpnFlp[Nop],CSI,dupDir)
+#                    print('CSI:',CSI)
+                    saveCSI = 0
                     for i in range(3):
                         ci = i+colM
                         Atoms.SetCellStyle(row,ci,VERY_LIGHT_GREY,True)
                         Atoms.SetCellTextColour(row,ci,VERY_LIGHT_GREY)
-                        if CSI and CSI[1][i] and AtInfo and AtInfo[atomData[row][colType]]:
-                            Atoms.SetCellStyle(row,ci,WHITE,False)
+                        if CSI and CSI[1][i]:       # and AtInfo and AtInfo[atomData[row][colType]]:
+                            if saveCSI != CSI[0][i]:
+                                Atoms.SetCellStyle(row,ci,WHITE,False)
+                                saveCSI = CSI[0][i]
                             Atoms.SetCellTextColour(row,ci,BLACK)
                 if 'X' in rbExcl:

trunk/GSASIIspc.py

@@ -2179 +2179 @@
     "returns Mxyz terms, multipliers, GUI flags"
     CSI = [[1,2,3],[1.0,1.0,1.0]]
-    if siteSym.strip() in ['-1','m3m']:
-        if SpnFlp[len(SpnFlp)//2] < 0:
-            return [[0,0,0],[0.,0.,0.]]
-        else:
-            return [[1,1,1],[1.,1.,1.]]
     for opr in dupDir:
         indx = GetNXUPQsym(opr)