Changeset 1281

Timestamp:

Apr 17, 2014 4:09:14 PM (9 years ago)

Author:

vondreele

Message:

fix a problem with plot focus change event & SASD Model GUIs

Location:

trunk

Files:

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

trunk/GSASIIgrid.py

@@ -4103 +4103 @@
         data = G2frame.PatternTree.GetItemPyData(item)
         G2pdG.UpdateModelsGrid(G2frame,data)
-        G2plt.PlotPatterns(G2frame,plotType='SASD')
         if len(data['Size']['Distribution']):
             G2plt.PlotSASDSizeDist(G2frame)
+        G2plt.PlotPatterns(G2frame,plotType='SASD')
     elif G2frame.PatternTree.GetItemText(item) == 'Substances':
         G2frame.PatternId = G2frame.PatternTree.GetItemParent(item)

trunk/GSASIIplot.py

@@ -689 +689 @@
         G2frame.itemPicked = None    
 
-    xylim = []
     try:
         plotNum = G2frame.G2plotNB.plotList.index('Powder Patterns')
@@ -712 +711 @@
         Page.canvas.mpl_connect('button_release_event', OnRelease)
         Page.canvas.mpl_connect('button_press_event',OnPress)
-    Page.SetFocus()
+    if plottype == 'PWDR':  # avoids a very nasty clash with KILL_FOCUS in SASD TextCtrl?
+        Page.SetFocus()
     G2frame.G2plotNB.status.DestroyChildren()
     if G2frame.Contour:
@@ -1022 +1022 @@
         Plot.set_xlim(xylim[0])
         Plot.set_ylim(xylim[1])
-        xylim = []
+#        xylim = []
         Page.toolbar.push_current()
         Page.toolbar.draw()