Changeset 440 for trunk/GSASIIpwdGUI.py

Timestamp:

Dec 11, 2011 1:55:19 PM (11 years ago)

Author:

vondreele

Message:

fix the mustrain ve microstrain title problem = GSASII.py
take wx,CallAfter? back out of most places - caused problems
get aniso size/mustrain ellipsoid around the right way to match ellipsoid model - exchanged sin & cos.

File:

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

trunk/GSASIIpwdGUI.py

@@ -98 +98 @@
         finally:
             dlg.Destroy()
-        wx.CallAfter(UpdatePeakGrid,self,peaks)
-#        UpdatePeakGrid(self,peaks)
+        UpdatePeakGrid(self,peaks)
         G2plt.PlotPatterns(self)
         
@@ -123 +122 @@
         finally:
             wx.EndBusyCursor()    
-        wx.CallAfter(UpdatePeakGrid,self,peaks)
-#        UpdatePeakGrid(self,peaks)
+        UpdatePeakGrid(self,peaks)
         G2plt.PlotPatterns(self)
         print 'finished'
@@ -143 +141 @@
                 peak[4] = Inst['U']*tand(peak[0]/2.0)**2+Inst['V']*tand(peak[0]/2.0)+Inst['W']
                 peak[6] = Inst['X']/cosd(peak[0]/2.0)+Inst['Y']*tand(peak[0]/2.0)
-        wx.CallAfter(UpdatePeakGrid,self,peaks)
-#        UpdatePeakGrid(self,peaks)
+        UpdatePeakGrid(self,peaks)
                 
     def RefreshPeakGrid(event):
@@ -280 +277 @@
                 del(item[-1])
         self.PatternTree.SetItemPyData(BackId,data)
-        wx.CallAfter(UpdateBackgroundGrid,self,data)
-#        UpdateBackgroundGrid(self,data)
+        UpdateBackgroundGrid(self,data)
         
     def OnBakVal(event):
@@ -456 +452 @@
         data = updateData(insVal,insRef)
         RefreshInstrumentGrid(event,doAnyway=True)          #to get peaks updated
-        wx.CallAfter(UpdateInstrumentGrid,self,data)
-#        UpdateInstrumentGrid(self,data)
+        UpdateInstrumentGrid(self,data)
         
     def OnInstCopy(event):
@@ -494 +489 @@
             data[2] = data[2][:2]+data[2][4:]
             data[3] = data[3][:1]+['Lam',]+data[3][4:]            
-        wx.CallAfter(UpdateInstrumentGrid,self,data)
-#        UpdateInstrumentGrid(self,data)
+        UpdateInstrumentGrid(self,data)
                 
     def OnNewType(event):
         insVal['Type'] = typePick.GetValue()
         data = updateData(insVal,insRef)
-        wx.CallAfter(UpdateInstrumentGrid,self,data)
-#        UpdateInstrumentGrid(self,data)
+        UpdateInstrumentGrid(self,data)
         
     def OnLamPick(event):
@@ -508 +501 @@
         insVal['Lam2'] = waves[lamType][1]
         data = updateData(insVal,insRef)
-        wx.CallAfter(UpdateInstrumentGrid,self,data)
-#        UpdateInstrumentGrid(self,data)
+        UpdateInstrumentGrid(self,data)
                  
     def OnRatValue(event):
@@ -786 +778 @@
             data['Transparency'] = [0.0,False]
         self.dataDisplay.Destroy()
-        wx.CallAfter(UpdateSampleGrid,self,data)
-#        UpdateSampleGrid(self,data)
+        UpdateSampleGrid(self,data)
         
     def OnParmRef(event):
@@ -885 +876 @@
             data.append([peak[0],peak[2],True,False,0,0,0,dsp,0.0])
         self.PatternTree.SetItemPyData(IndexId,data)
-        wx.CallAfter(UpdateIndexPeaksGrid,self,data)
-#        UpdateIndexPeaksGrid(self,data)
+        UpdateIndexPeaksGrid(self,data)
         
     def KeyEditPickGrid(event):
@@ -1016 +1006 @@
     def OnBravSel(event):
         controls[5] = bravSel.GetString(bravSel.GetSelection())       
-        wx.CallAfter(UpdateUnitCellsGrid,self,data)
-#        UpdateUnitCellsGrid(self,data)
+        UpdateUnitCellsGrid(self,data)
         
     def OnCellChange(event):
@@ -1093 +1082 @@
         data = [controls,bravais,cells,dmin]
         self.PatternTree.SetItemPyData(UnitCellsId,data)
-        wx.CallAfter(UpdateUnitCellsGrid,self,data)
-#        UpdateUnitCellsGrid(self,data)
+        UpdateUnitCellsGrid(self,data)
         
     def CopyUnitCell(event):
@@ -1107 +1095 @@
         controls[12] = G2lat.calc_V(G2lat.cell2A(controls[6:12]))
         self.PatternTree.SetItemPyData(UnitCellsId,[controls,bravais,cells,dmin])
-        wx.CallAfter(UpdateUnitCellsGrid,self,data)
-#        UpdateUnitCellsGrid(self,data)
+        UpdateUnitCellsGrid(self,data)
         
         self.dataFrame.RefineCell.Enable(True)
@@ -1153 +1140 @@
         self.PatternTree.SetItemPyData(G2gd.GetPatternTreeItemId(self,PatternId, 'Unit Cells List'),data)
         self.HKL = G2lat.GenHBravais(dmin,ibrav,Aref)
-        wx.CallAfter(UpdateUnitCellsGrid,self,data)
-#        UpdateUnitCellsGrid(self,data)
+        UpdateUnitCellsGrid(self,data)
         print "%s%10.3f" % ('refinement M20 = ',M20)
         print 'unindexed lines = ',X20
@@ -1196 +1182 @@
             self.dataFrame.IndexPeaks.Enable(True)
             self.dataFrame.MakeNewPhase.Enable(True)
-            wx.CallAfter(UpdateUnitCellsGrid,self,data)
-#            UpdateUnitCellsGrid(self,data)
+            UpdateUnitCellsGrid(self,data)
                 
     def RefreshUnitCellsGrid(event):
@@ -1492 +1477 @@
             Obj.SetValue(fmt%(value))
             data[fileKey][itemKey] = value
-            wx.CallAfter(UpdatePDFGrid,self,data)
-#            UpdatePDFGrid(self,data)
+            UpdatePDFGrid(self,data)
         
         def OnValueChange(event):
@@ -1778 +1762 @@
             data['Form Vol'] = max(10.0,SumElementVolumes())
         PE.Destroy()
-        wx.CallAfter(UpdatePDFGrid,self,data)
-#        UpdatePDFGrid(self,data)
+        UpdatePDFGrid(self,data)
         
     def OnDeleteElement(event):
@@ -1788 +1771 @@
             del ElList[dlg.GetDeleteElement()]
         dlg.Destroy()
-        wx.CallAfter(UpdatePDFGrid,self,data)
-#        UpdatePDFGrid(self,data)
+        UpdatePDFGrid(self,data)
                 
     def ComputePDF(Data):