Changeset 1381

Timestamp:

Jun 12, 2014 9:51:15 PM (9 years ago)

Author:

toby

Message:

fix blank initial GL window for structure

Location:

trunk

Files:

• GSASIIgrid.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (4 diffs)
• GSASIIplot.py (modified) (3 diffs)

trunk/GSASIIgrid.py

@@ -4968 +4968 @@
     sizer.Add(line, 0, wx.EXPAND|wx.ALIGN_CENTER|wx.ALL, 10)
 
+def HowDidIgetHere():
+    '''Show a traceback with calls that brought us to the current location.
+    Used for debugging.
+    '''
+    import traceback
+    print 70*'*'    
+    for i in traceback.format_list(traceback.extract_stack()[:-1]): print(i.strip.rstrip())
+    print 70*'*'    
+        
 if __name__ == '__main__':
     app = wx.PySimpleApp()

trunk/GSASIIphsGUI.py

@@ -5323 +5323 @@
             FillSelectPageMenu(G2frame.dataFrame.DataDrawOptions)
             UpdateDrawOptions()
-            wx.CallAfter(G2plt.PlotStructure,G2frame,data)
+            wx.CallAfter(G2plt.PlotStructure,G2frame,data,firstCall=True)
         elif text == 'Draw Atoms':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.DrawAtomsMenu)
@@ -5346 +5346 @@
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnDefineRB, id=G2gd.wxID_DRAWDEFINERB)
             UpdateDrawAtoms()
-            wx.CallAfter(G2plt.PlotStructure,G2frame,data)
+            wx.CallAfter(G2plt.PlotStructure,G2frame,data,firstCall=True)
         elif text == 'RB Models':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.RigidBodiesMenu)
@@ -5370 +5370 @@
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnPeaksClear, id=G2gd.wxID_PEAKSCLEAR)
             FillMapPeaksGrid()
-            wx.CallAfter(G2plt.PlotStructure,G2frame,data)
+            wx.CallAfter(G2plt.PlotStructure,G2frame,data,firstCall=True)
         elif text == 'MC/SA':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.MCSAMenu)
@@ -5380 +5380 @@
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnClearResults, id=G2gd.wxID_MCSACLEARRESULTS)
             UpdateMCSA()                        
-            wx.CallAfter(G2plt.PlotStructure,G2frame,data)
+            wx.CallAfter(G2plt.PlotStructure,G2frame,data,firstCall=True)
         elif text == 'Texture':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.TextureMenu)

trunk/GSASIIplot.py

@@ -3207 +3207 @@
 ################################################################################
             
-def PlotStructure(G2frame,data):
+def PlotStructure(G2frame,data,firstCall=False):
     '''Crystal structure plotting package. Can show structures as balls, sticks, lines,
     thermal motion ellipsoids and polyhedra
@@ -4139 +4139 @@
         Draw('focus')
         
+    # PlotStructure execution starts here
     try:
         plotNum = G2frame.G2plotNB.plotList.index(generalData['Name'])
@@ -4176 +4177 @@
         pass
     Draw('main')
-        
+    if firstCall: Draw('main') # draw twice the first time that graphics are displayed
+
 ################################################################################
 #### Plot Rigid Body