Changeset 1907

Timestamp:

Jun 24, 2015 12:23:55 PM (7 years ago)

Author:

vondreele

Message:

comment out the G2plotNB.clear in OnRefine? so that the new plot will have the same limits as the old one before refinement

Location:

trunk

Files:

• GSASII.py (modified) (2 diffs)
• GSASIIgrid.py (modified) (1 diff)
• GSASIIplot.py (modified) (2 diffs)

trunk/GSASII.py

@@ -3483 +3483 @@
                 dlg.Destroy()
                 return
-
         self.OnFileSave(event)
         # check that constraints are OK here
@@ -3528 +3527 @@
                     self.PatternTree.DeleteChildren(self.root)
                     if self.HKL: self.HKL = []
-                    if self.G2plotNB.plotList:
-                        self.G2plotNB.clear()
+#                    if self.G2plotNB.plotList:
+#                        self.G2plotNB.clear()
                     G2IO.ProjFileOpen(self)
                     item, cookie = self.PatternTree.GetFirstChild(self.root)

trunk/GSASIIgrid.py

@@ -2849 +2849 @@
     G2frame.PatternTree.SetItemPyData(item,data)
     if kind in ['PWDR','SASD']:
-        G2plt.PlotPatterns(G2frame,plotType=kind,newPlot=True)
+        if 'xylim' in dir(G2frame):
+            NewPlot = False
+        else:
+
+            NewPlot = True
+        G2plt.PlotPatterns(G2frame,plotType=kind,newPlot=NewPlot)
     elif kind == 'HKLF':
         Name = G2frame.PatternTree.GetItemText(item)

trunk/GSASIIplot.py

@@ -1420 +1420 @@
         plotNum = G2frame.G2plotNB.plotList.index('Powder Patterns')
         Page = G2frame.G2plotNB.nb.GetPage(plotNum)
-        if not newPlot:
-            Plot = Page.figure.gca()          #get previous powder plot & get limits
-            xylim = Plot.get_xlim(),Plot.get_ylim()
+        Plot = Page.figure.gca()          #get previous powder plot & get limits
+        G2frame.xylim = Plot.get_xlim(),Plot.get_ylim()
         Page.figure.clf()
         Plot = Page.figure.gca()          #get a fresh plot after clf()
@@ -1870 +1869 @@
     if not newPlot:
         Page.toolbar.push_current()
-        Plot.set_xlim(xylim[0])
-        Plot.set_ylim(xylim[1])
+        Plot.set_xlim(G2frame.xylim[0])
+        Plot.set_ylim(G2frame.xylim[1])
 #        xylim = []
         Page.toolbar.push_current()
         Page.toolbar.draw()
     else:
+        G2frame.xylim = Plot.get_xlim(),Plot.get_ylim()
         Page.canvas.draw()
     olderr = np.seterr(invalid='ignore') #ugh - this removes a matplotlib error for mouse clicks in log plots