Changeset 443 for sans/utils/bt5/bt5plot2/bt5plot2

Timestamp:

Nov 12, 2008 2:07:10 PM (14 years ago)

Author:

ajj

Message:

Handle plot removal, deal with rescaling on plot removal.

File:

• sans/utils/bt5/bt5plot2/bt5plot2 (modified) (3 diffs)

sans/utils/bt5/bt5plot2/bt5plot2

@@ -156 +156 @@
             model[path][4] = self.axis.plot(model[path][3][0],model[path][3][1], 'bo')
         
-        self.axis.autoscale_view()
-        self.canvas.draw()
+        self.rescale_and_redraw()
+        #self.canvas.draw()
         return
 
@@ -252 +252 @@
         for line in model[path][4]:
                 self.axis.lines.remove(line)
-                
+        
+        
+        
+        #self.canvas.draw()     
         self.rescale_and_redraw()
         return
@@ -294 +297 @@
 
         for line in self.axis.lines:
-             xdata.extend(line.get_xdata())
-             ydata.extend(line.get_ydata())
-
-        xmin = float(min(xdata)*0.95)
-        xmax = float(max(xdata)*1.05)
-        ymin = float(min(ydata)*0.95)
-        ymax = float(max(ydata)*1.05)   
-
+                if self.axis.get_xscale() == 'log':
+                        xdata.extend([xval for xval in line.get_xdata() if xval > 0])
+                else:
+                        xdata.extend(line.get_xdata())
+                if self.axis.get_yscale() == 'log':
+                        ydata.extend([xval for xval in line.get_ydata() if xval > 0])
+                else:
+                        ydata.extend(line.get_ydata())
+      
+        #set limits
+        xmin = float(min(xdata))
+        xmax = float(max(xdata))
+        ymin = float(min(ydata))
+        ymax = float(max(ydata))        
+
+        #adjust for size of markers (sort of)
+        xmin = xmin - 0.1*abs(xmin)
+        xmax = xmax + 0.1*abs(xmax)
+        ymin = ymin - 0.1*abs(ymin)
+        ymax = ymax + 0.1*abs(ymax)
+                
         self.axis.set_xlim(xmin,xmax)
         self.axis.set_ylim(ymin,ymax)
         
-        self.axis.autoscale_view()
+        #self.axis.autoscale_view()
         self.canvas.draw()