Changeset 922

Timestamp:

May 17, 2013 4:15:28 PM (9 years ago)

Author:

toby

Message:

prevent phase tab from multiple call by plot using CallAfter?

Location:

trunk

Files:

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

trunk/GSASIIphsGUI.py

@@ -10 +10 @@
 '''
 *GSASIIphsGUI: Phase GUI*
-=========================
+-------------------------
+
 Module to create the GUI for display of phase information
 in the data display window when a phase is selected.
@@ -2677 +2678 @@
             viewDir.Bind(wx.EVT_TEXT_ENTER,OnViewDir)
             viewDir.Bind(wx.EVT_KILL_FOCUS,OnViewDir)
+            G2frame.dataDisplay.viewDir = viewDir
             lineSizer.Add(viewDir,0,wx.ALIGN_CENTER_VERTICAL)
             showSizer.Add(lineSizer)
@@ -4433 +4435 @@
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.DataDrawOptions)
             UpdateDrawOptions()
-            G2plt.PlotStructure(G2frame,data)
+            #G2plt.PlotStructure(G2frame,data)
+            wx.CallAfter(G2plt.PlotStructure,G2frame,data)
         elif text == 'Draw Atoms':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.DrawAtomsMenu)
@@ -4483 +4486 @@
             G2frame.dataFrame.Bind(wx.EVT_MENU, OnPeaksClear, id=G2gd.wxID_PEAKSCLEAR)
             FillMapPeaksGrid()
-            G2plt.PlotStructure(G2frame,data)
+            #G2plt.PlotStructure(G2frame,data)
+            wx.CallAfter(G2plt.PlotStructure,G2frame,data)
         elif text == 'Texture':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.TextureMenu)

trunk/GSASIIplot.py

@@ -2881 +2881 @@
         if page:
             if G2frame.dataDisplay.GetPageText(page) == 'Draw Options':
-                panel = G2frame.dataDisplay.GetPage(page).GetChildren()[0].GetChildren()
-                names = [child.GetName() for child in panel]
-                panel[names.index('viewDir')].SetValue('%.3f %.3f %.3f'%(VD[0],VD[1],VD[2]))
+                G2frame.dataDisplay.viewDir.SetValue('%.3f %.3f %.3f'%(VD[0],VD[1],VD[2]))
                 
     def SetMapPeaksText(mapPeaks):