Changeset 1691

Timestamp:

Mar 5, 2015 4:52:02 PM (10 years ago)

Author:

toby

Message:

Change CallAfter? to CallLater? to avoid crashes on Mac

Location:

trunk

Files:

• GSASIIddataGUI.py (modified) (11 diffs)
• GSASIIphsGUI.py (modified) (4 diffs)

trunk/GSASIIddataGUI.py ¶

@@ -78 +78 @@
             Obj = event.GetEventObject()
             generalData['Data plot type'] = Obj.GetStringSelection()
-            wx.CallAfter(UpdateDData,G2frame,DData,data)
+            wx.CallLater(100,UpdateDData,G2frame,DData,data)
             G2plt.PlotSizeStrainPO(G2frame,data)
             
@@ -155 +155 @@
         hist = Indx[Obj.GetId()]
         UseList[hist]['Show'] = Obj.GetValue()
-        wx.CallAfter(UpdateDData,G2frame,DData,data)
+        wx.CallLater(100,UpdateDData,G2frame,DData,data)
         G2plt.PlotSizeStrainPO(G2frame,data)
         
@@ -178 +178 @@
                     for sel in dlg.GetSelections():
                         UseList[keyList[sel]].update(copy.deepcopy(copyDict))
-                    wx.CallAfter(UpdateDData,G2frame,DData,data)
+                    wx.CallLater(100,UpdateDData,G2frame,DData,data)
             finally:
                 dlg.Destroy()
@@ -247 +247 @@
                                 for bab in babNames:
                                     UseList[item][name][bab][1] = copy.deepcopy(copyDict[name][bab])                                              
-                    wx.CallAfter(UpdateDData,G2frame,DData,data)
+                    wx.CallLater(100,UpdateDData,G2frame,DData,data)
             finally:
                 dlg.Destroy()
@@ -274 +274 @@
         UseList[hist]['Size'][0] = Obj.GetValue()
         G2plt.PlotSizeStrainPO(G2frame,data)
-        wx.CallAfter(UpdateDData,G2frame,DData,data)
+        wx.CallLater(100,UpdateDData,G2frame,DData,data)
         
     def OnSizeRef(event):
@@ -335 +335 @@
                 UseList[item]['Size'][4][i+3] = 0.0
         G2plt.PlotSizeStrainPO(G2frame,data)
-        wx.CallAfter(UpdateDData,G2frame,DData,data)
+        wx.CallLater(100,UpdateDData,G2frame,DData,data)
             
     def OnStrainType(event):
@@ -341 +341 @@
         hist = Indx[Obj.GetId()]
         UseList[hist]['Mustrain'][0] = Obj.GetValue()
-        wx.CallAfter(UpdateDData,G2frame,DData,data)
+        wx.CallLater(100,UpdateDData,G2frame,DData,data)
         G2plt.PlotSizeStrainPO(G2frame,data)
         
@@ -406 +406 @@
                 UseList[item]['Mustrain'][4][i] = vals[i]
         G2plt.PlotSizeStrainPO(G2frame,data)
-        wx.CallAfter(UpdateDData,G2frame,DData,data)
+        wx.CallLater(100,UpdateDData,G2frame,DData,data)
             
     def OnHstrainRef(event):
@@ -455 +455 @@
         UseList[hist]['Pref.Ori.'][4] = Order
         UseList[hist]['Pref.Ori.'][5] = SetPOCoef(Order,hist)
-        wx.CallAfter(UpdateDData,G2frame,DData,data)
+        wx.CallLater(100,UpdateDData,G2frame,DData,data)
 
     def OnPOType(event):
@@ -464 +464 @@
         else:
             UseList[hist]['Pref.Ori.'][0] = 'SH'
-        wx.CallAfter(UpdateDData,G2frame,DData,data)            
+        wx.CallLater(100,UpdateDData,G2frame,DData,data)
 
     def OnPORef(event):
@@ -550 +550 @@
         item = Indx[Obj.GetId()]
         UseList[item[0]]['Extinction'][item[1]] = Obj.GetValue()
-        wx.CallAfter(UpdateDData,G2frame,DData,data)
+        wx.CallLater(100,UpdateDData,G2frame,DData,data)
             
     def checkAxis(axis):

trunk/GSASIIphsGUI.py ¶

@@ -3529 +3529 @@
             textureData['Order'] = int(Obj.GetValue())
             textureData['SH Coeff'][1] = SetSHCoef()
-            wx.CallAfter(UpdateTexture)
+            wx.CallLater(100,UpdateTexture)
             G2plt.PlotTexture(G2frame,data)
                         
@@ -3536 +3536 @@
             textureData['Model'] = Obj.GetValue()
             textureData['SH Coeff'][1] = SetSHCoef()
-            wx.CallAfter(UpdateTexture)
+            wx.CallLater(100,UpdateTexture)
             G2plt.PlotTexture(G2frame,data)
             
@@ -3546 +3546 @@
             Obj = event.GetEventObject()
             textureData['SHShow'] = Obj.GetValue()
-            wx.CallAfter(UpdateTexture)
+            wx.CallLater(100,UpdateTexture)
             
         def OnProjSel(event):
@@ -3584 +3584 @@
             Obj = event.GetEventObject()
             textureData['PlotType'] = Obj.GetValue()
-            wx.CallAfter(UpdateTexture)
+            wx.CallLater(100,UpdateTexture)
             G2plt.PlotTexture(G2frame,data)