Changeset 2174 for trunk/GSASIIphsGUI.py

Timestamp:

Mar 16, 2016 1:25:24 PM (8 years ago)

Author:

vondreele

Message:

fix image integrate and integrate all with dark & background images
trap bad G2frame.PickId? (there may be more!)
fix cleanup after DIFFax crash & other stacking fault fixes

File:

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

trunk/GSASIIphsGUI.py

@@ -2411 +2411 @@
             Obj = event.GetEventObject()
             data['Layers']['Laue'] = Obj.GetValue()
-            UpdateLayerData()
+            wx.CallAfter(UpdateLayerData)
         
         def OnToler(event): #used when Laue = unknown
@@ -2427 +2427 @@
                 [['mmm'],8,zip([" a = "," b = "," c = "],["%.5f","%.5f","%.5f"],[True,True,True],[0,1,2,])],
                 [['2/m(ab)','2/m(c)','-1','axial','unknown'],10,zip([" a = "," b = "," c = "," gamma = "],
-                    ["%.5f","%.5f","%.5f","%.3f"],[True,True,True,True],[0,1,2,3])]]
+                    ["%.5f","%.5f","%.5f","%.3f"],[True,True,True,True],[0,1,2,5])]]
                 
             def OnCellRef(event):
@@ -2459 +2459 @@
                     cell[4] = cell[5] = cell[6] = 90.
                     Obj.SetValue("%.5f"%(cell[ObjId+1]))
-                elif laue in ['2/m']:
+                elif laue in ['2/m','-1']:
                     cell[4] = cell[5] = 90.
                     if ObjId != 3:
@@ -2467 +2467 @@
                         cell[6] = value
                         Obj.SetValue("%.3f"%(cell[6]))
-                else:
-                    cell[ObjId+1] = value
-                    if ObjId < 3:
-                        Obj.SetValue("%.5f"%(cell[1+ObjId]))
-                    else:
-                        Obj.SetValue("%.3f"%(cell[1+ObjId]))                        
                 cell[7] = G2lat.calc_V(G2lat.cell2A(cell[1:7]))
                 volVal.SetLabel(' Vol = %.3f'%(cell[7]))