Changeset 2186 for trunk/GSASIIpwdGUI.py

Timestamp:

Mar 31, 2016 9:50:12 AM (7 years ago)

Author:

vondreele

Message:

fix Bravais lattice name issues in Unit Cells & fix problem of uneditable unit cell values after Show HKLs

File:

• trunk/GSASIIpwdGUI.py (modified) (4 diffs)

trunk/GSASIIpwdGUI.py

@@ -2479 +2479 @@
             controls[7] = controls[8] = controls[6]
             controls[9] = controls[10] = controls[11] = 90.
-        elif controls[5] in ['R 3 m','P 6/m m m','I 4/m m m','P 4/m m m']:
+        elif controls[5] in ['R3m','P6/mmm','I4/mmm','P4/mmm']:
             controls[7] = controls[6]
             controls[9] = controls[10] = controls[11] = 90.
             if controls[5] in ['R3-H','P6/mmm']:
                 controls[11] = 120.
-        elif controls[5] in ['F m m m','I m m m','C m m m','P m m m']:
+        elif controls[5] in ['Fmmm','Immm','Cmmm','Pmmm']:
             controls[9] = controls[10] = controls[11] = 90.
-        elif controls[5] in ['C 2/m','P 2/m']:
+        elif controls[5] in ['C2/m','P2/m']:
             controls[9] = controls[11] = 90.  # b unique
         if len(controls) < 13: controls.append(0)
@@ -2612 +2612 @@
             if controls[5] in ['R3-H','P6/mmm']:
                 controls[11] = 120.
-        elif controls[5] in ['F m m m','I m m m','C m m m','P m m m']:
+        elif controls[5] in ['Fmmm','Immm','Cmmm','Pmmm']:
             controls[6+ObjId] = value
             Obj.SetValue("%.5f"%(controls[6+ObjId]))
             controls[9] = controls[10] = controls[11] = 90.0
-        elif controls[5] in ['C 2/m','P 2/m']:
+        elif controls[5] in ['C2/m','P2/m']:
             controls[9] = controls[11] = 90.0
             if ObjId != 3:
@@ -2675 +2675 @@
                 value = 90.
         SetCellValue(Obj,ObjId/2,value)
+        wx.CallAfter(UpdateUnitCellsGrid,G2frame,data)
         
     def OnHklShow(event):
@@ -2751 +2752 @@
             elif ibrav in ['R3-H','P6/mmm','I4/mmm','P4/mmm']:
                 print " %s%10.6f %s%10.6f %s%12.3f" % ('a =',cell[0],' c =',cell[2],' volume =',Vol)
-            elif ibrav in ['P 4/m m m','F m m m','I m m m','C m m m','P m m m']:
+            elif ibrav in ['P4/mmm','Fmmm','Immm','Cmmm','Pmmm']:
                 print " %s%10.6f %s%10.6f %s%10.6f %s%12.3f" % ('a =',cell[0],'b =',cell[1],'c =',cell[2],' volume =',Vol)
-            elif ibrav in ['C 2/m','P 2/m']:
+            elif ibrav in ['C2/m','P2/m']:
                 print " %s%10.6f %s%10.6f %s%10.6f %s%8.3f %s%12.3f" % ('a =',cell[0],'b =',cell[1],'c =',cell[2],'beta =',cell[4],' volume =',Vol)
             else: