Changeset 4375

Timestamp:

Mar 19, 2020 1:17:28 PM (4 years ago)

Author:

vondreele

Message:

try to rationalize plot & data window behavior - put data window on top more consistently

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (3 diffs)

trunk/GSASIIdataGUI.py

@@ -8508 +8508 @@
             G2frame.RefList = list(data.keys())[0]
         G2pdG.UpdateReflectionGrid(G2frame,data)
-        wx.CallAfter(G2plt.PlotPatterns,G2frame)
+        G2plt.PlotPatterns(G2frame)
     elif G2frame.GPXtree.GetItemText(item) == 'Reflection List':    #HKLF reflections
         G2frame.PatternId = G2frame.GPXtree.GetItemParent(item)

trunk/GSASIIphsGUI.py

@@ -11054 +11054 @@
         elif text == 'Data':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.DataMenu)
+            G2plt.PlotSizeStrainPO(G2frame,data,hist='',Start=True)            
             G2ddG.UpdateDData(G2frame,DData,data)
-            wx.CallAfter(G2plt.PlotSizeStrainPO,G2frame,data,hist='',Start=True)            
         elif text == 'Atoms':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.AtomsMenu)
@@ -11074 +11074 @@
         elif text == 'Draw Options':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.DataDrawOptions)
+            G2plt.PlotStructure(G2frame,data,firstCall=True)
             UpdateDrawOptions()
-            wx.CallAfter(G2plt.PlotStructure,G2frame,data,firstCall=True)
         elif text == 'Draw Atoms':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.DrawAtomsMenu)
+            G2plt.PlotStructure(G2frame,data,firstCall=True)
             UpdateDrawAtoms()
-            wx.CallAfter(G2plt.PlotStructure,G2frame,data,firstCall=True)
         elif text == 'RB Models':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.RigidBodiesMenu)
@@ -11085 +11085 @@
         elif text == 'Map peaks':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.MapPeaksMenu)
+            G2plt.PlotStructure(G2frame,data,firstCall=True)
             FillMapPeaksGrid()
-            wx.CallAfter(G2plt.PlotStructure,G2frame,data,firstCall=True)
         elif text == 'MC/SA':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.MCSAMenu)
+            G2plt.PlotStructure(G2frame,data,firstCall=True)
             UpdateMCSA()                        
-            wx.CallAfter(G2plt.PlotStructure,G2frame,data,firstCall=True)
         elif text == 'Texture':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.TextureMenu)
+            G2plt.PlotTexture(G2frame,data,Start=True)            
             UpdateTexture()                        
-            wx.CallAfter(G2plt.PlotTexture,G2frame,data,Start=True)            
         elif text == 'Pawley reflections':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataWindow.PawleyMenu)