Changeset 50 for trunk/GSASIIplot.py

Timestamp:

Apr 21, 2010 10:55:25 AM (13 years ago)

Author:

vondreel

Message:

fix graphics zoom, redraw, home issues
now OK for powder, single crystal, image & transformed image plots

File:

• trunk/GSASIIplot.py (modified) (13 diffs)

trunk/GSASIIplot.py

@@ -56 +56 @@
         return page.figure
         
-def PlotSngl(self):
+def PlotSngl(self,newPlot=False):
     from matplotlib.patches import Circle
 
@@ -99 +99 @@
         plotNum = self.G2plotNB.plotList.index('Structure Factors')
         snglPage = self.G2plotNB.nb.GetPage(plotNum)
-        snglPlot = snglPage.figure.gca()
-        snglPlot.cla()
+        if not newPlot:
+            snglPlot = snglPage.figure.gca()          #get previous powder plot & get limits
+            xylim = snglPlot.get_xlim(),snglPlot.get_ylim()
+        snglPage.figure.clf()
+        snglPlot = snglPage.figure.gca()          #get a fresh plot after clf()
     except ValueError,error:
         snglPlot = self.G2plotNB.add('Structure Factors').gca()
@@ -164 +167 @@
     snglPlot.set_xlim((HKLmin[pzone[izone][0]],HKLmax[pzone[izone][0]]))
     snglPlot.set_ylim((HKLmin[pzone[izone][1]],HKLmax[pzone[izone][1]]))
-    snglPage.canvas.draw()
+    if not newPlot:
+        snglPage.toolbar.push_current()
+        snglPlot.set_xlim(xylim[0])
+        snglPlot.set_ylim(xylim[1])
+        xylim = []
+        snglPage.toolbar.push_current()
+        snglPage.toolbar.draw()
+    else:
+        snglPage.canvas.draw()
        
-def PlotImage(self):
+def PlotImage(self,newPlot=False):
     from matplotlib.patches import Ellipse,Arc
 
@@ -172 +183 @@
         imgPage.canvas.SetToolTipString('')
         size = len(self.ImageZ)
-        if (xlim[0] < event.xdata < xlim[1]) & (ylim[0] > event.ydata > ylim[1]):
+        if event.xdata and event.ydata:                 #avoid out of frame errors
             Data = self.PatternTree.GetItemPyData( \
                 G2gd.GetPatternTreeItemId(self,self.Image, 'Image Controls'))
@@ -287 +298 @@
         plotNum = self.G2plotNB.plotList.index('2D Powder Image')
         imgPage = self.G2plotNB.nb.GetPage(plotNum)
+        if not newPlot:
+            imgPlot = imgPage.figure.gca()          #get previous powder plot & get limits
+            xylim = imgPlot.get_xlim(),imgPlot.get_ylim()
         imgPage.figure.clf()
-        imgPlot = imgPage.figure.gca()
-        if imgPage.views:
-            imgPage.toolbar._views = copy.deepcopy(imgPage.views)
-        view = imgPage.toolbar._views.forward()
+        imgPlot = imgPage.figure.gca()          #get a fresh plot after clf()
         
     except ValueError,error:
@@ -301 +312 @@
         imgPage.canvas.mpl_connect('pick_event', OnImPick)
         imgPage.canvas.mpl_connect('button_release_event', OnImRelease)
-        imgPage.views = False
-        view = False
     imgPage.SetFocus()
         
@@ -319 +328 @@
     xlim = (-0.5,Xmax-.5)
     ylim = (Xmax-.5,-0.5,)
-    if self.Img:
-        xlim = self.Img.axes.get_xlim()
-        ylim = self.Img.axes.get_ylim()
     Imin,Imax = Data['range'][1]
     acolor = mpl.cm.get_cmap(Data['color'])
@@ -330 +336 @@
     self.Img = imgPlot.imshow(A,aspect='equal',cmap=acolor, \
         interpolation='nearest',vmin=Imin,vmax=Imax,extent=[0,Xmax,Xmax,0])
+
     imgPlot.plot(xcent,ycent,'x')
     if Data['showLines']:
@@ -371 +378 @@
         imgPlot.text(cent[0],cent[1],'+',color=col,ha='center',va='center')
     colorBar = imgPage.figure.colorbar(self.Img)
-    if view:
-        self.Img.axes.set_xlim(view[0][:2])
-        self.Img.axes.set_ylim(view[0][2:])
+    imgPlot.set_xlim(xlim)
+    imgPlot.set_ylim(ylim)
+    if not newPlot:
+        imgPage.toolbar.push_current()
+        imgPlot.set_xlim(xylim[0])
+        imgPlot.set_ylim(xylim[1])
+        xylim = []
+        imgPage.toolbar.push_current()
+        imgPage.toolbar.draw()
     else:
-        self.Img.axes.set_xlim(xlim)
-        self.Img.axes.set_ylim(ylim)
-    imgPage.canvas.draw()
+        imgPage.canvas.draw()
             
 def PlotPeakWidths(self):
@@ -531 +542 @@
         if xpos:                                        #avoid out of frame mouse position
             ypos = event.ydata
-            wave = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self,PatternId, 'Instrument Parameters'))[0][1]
+            wave = self.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(self, \
+            PatternId, 'Instrument Parameters'))[0][1]
             dsp = 0.0
             if abs(xpos) > 0.:
@@ -719 +731 @@
 
 
-def PlotTRImage(self):
+def PlotTRImage(self,newPlot=False):
             
     def OnMotion(event):
-        trimgPage.canvas.SetToolTipString('')
-        trimgPage.canvas.SetCursor(wx.CROSS_CURSOR)
+        Page.canvas.SetToolTipString('')
+        Page.canvas.SetCursor(wx.CROSS_CURSOR)
         azm = event.xdata
         tth = event.ydata
@@ -771 +783 @@
     try:
         plotNum = self.G2plotNB.plotList.index('2D Transformed Powder Image')
-        trimgPage = self.G2plotNB.nb.GetPage(plotNum)
-        trimgPage.figure.clf()
-        trimgPlot = trimgPage.figure.gca()
-        if trimgPage.views:
-            trimgPage.toolbar._views = copy.deepcopy(trimgPage.views)
-        view = trimgPage.toolbar._views.forward()
+        Page = self.G2plotNB.nb.GetPage(plotNum)
+        if not newPlot:
+            Plot = Page.figure.gca()          #get previous plot & get limits
+            xylim = Plot.get_xlim(),Plot.get_ylim()
+        Page.figure.clf()
+        Plot = Page.figure.gca()          #get a fresh plot after clf()
         
     except ValueError,error:
-        trimgPlot = self.G2plotNB.add('2D Transformed Powder Image').gca()
+        Plot = self.G2plotNB.add('2D Transformed Powder Image').gca()
         plotNum = self.G2plotNB.plotList.index('2D Transformed Powder Image')
-        trimgPage = self.G2plotNB.nb.GetPage(plotNum)
-        trimgPage.canvas.mpl_connect('motion_notify_event', OnMotion)
-        trimgPage.canvas.mpl_connect('pick_event', OnPick)
-        trimgPage.canvas.mpl_connect('button_release_event', OnRelease)
-        trimgPage.views = False
+        Page = self.G2plotNB.nb.GetPage(plotNum)
+        Page.canvas.mpl_connect('motion_notify_event', OnMotion)
+        Page.canvas.mpl_connect('pick_event', OnPick)
+        Page.canvas.mpl_connect('button_release_event', OnRelease)
+        Page.views = False
         view = False
-    trimgPage.SetFocus()
+    Page.SetFocus()
         
     data = self.PatternTree.GetItemPyData(self.PickId)
@@ -796 +808 @@
     V = np.arange(Imin,Imax,step)
     acolor = mpl.cm.get_cmap('Paired')
-    trimgPlot.set_xlabel('azimuth',fontsize=12)
-    trimgPlot.set_ylabel('2-theta',fontsize=12)
-    trimgPlot.contour(self.TA[1],self.TA[0],image,V,cmap=acolor)
+    Plot.set_xlabel('azimuth',fontsize=12)
+    Plot.set_ylabel('2-theta',fontsize=12)
+    Plot.contour(self.TA[1],self.TA[0],image,V,cmap=acolor)
     if data['showLines']:
         IOtth = data['IOtth']
         LRAzim = data['LRazimuth']                  #NB: integers
-        trimgPlot.plot([LRAzim[0],LRAzim[1]],[IOtth[0],IOtth[0]],picker=True)
-        trimgPlot.plot([LRAzim[0],LRAzim[1]],[IOtth[1],IOtth[1]],picker=True)
-        trimgPlot.plot([LRAzim[0],LRAzim[0]],[IOtth[0],IOtth[1]],picker=True)
-        trimgPlot.plot([LRAzim[1],LRAzim[1]],[IOtth[0],IOtth[1]],picker=True)
-    trimgPage.canvas.draw()
+        Plot.plot([LRAzim[0],LRAzim[1]],[IOtth[0],IOtth[0]],picker=True)
+        Plot.plot([LRAzim[0],LRAzim[1]],[IOtth[1],IOtth[1]],picker=True)
+        Plot.plot([LRAzim[0],LRAzim[0]],[IOtth[0],IOtth[1]],picker=True)
+        Plot.plot([LRAzim[1],LRAzim[1]],[IOtth[0],IOtth[1]],picker=True)
+    if not newPlot:
+        Page.toolbar.push_current()
+        Plot.set_xlim(xylim[0])
+        Plot.set_ylim(xylim[1])
+        xylim = []
+        Page.toolbar.push_current()
+        Page.toolbar.draw()
+    else:
+        Page.canvas.draw()