Ticket #3392: matplotlib-sage.3.patch

a/sage/plot/axes.py

@@ -245 +245 @@
-        return oppaxis, step, tslminor, tslmajor 
-
-    def _draw_axes(self, subplot, axes, xmin, xmax, ymin, ymax, x_axis_ypos, y_axis_xpos):
-patch
+lin
-        if isinstance(axes, (list, tuple)) and len(axes) == 2 and \
-        (axes[0] in [True, False]) and (axes[1] in [True, False]): 
-            self.__draw_x_axis = axes[0]
-            self.__draw_y_axis = axes[1]
-            #draw the x-axes?
-            if self.__draw_x_axis:
-patches.
+
-                                 color=self.__color, linewidth=float(self.__linewidth)))
-            #draw y axis line?
-            if self.__draw_y_axis:
-patches.
+
-                                  color=self.__color, linewidth=float(self.__linewidth)))
-        else: #draw them both
-patches.
+
-                             color=self.__color, linewidth=float(self.__linewidth)))
-patches.
+
-                              color=self.__color, linewidth=float(self.__linewidth)))
-
-    def _draw_axes_labels(self, subplot, axes_labels, xmin, xmax, ymin, ymax, xstep, ystep, x_axis_ypos, y_axis_xpos, pad=0.2):
@@ -310 +310 @@
-        xlabel : "where the xlabel is drawn" 
-
-        """
-patch
+lin
-        xmin = float(xmin); xmax=float(xmax); ymin=float(ymin); ymax=float(ymax)
-        yspan = ymax - ymin
-        xspan = xmax - xmin
@@ -338 +338 @@
-            s = self._format_tick_string(x)
-            subplot.text(x, xlabel, s, fontsize=int(self.__fontsize), horizontalalignment="center", 
-                        color=self.__tick_label_color, verticalalignment="top")
-patches.
+
-                        color=self.__color, linewidth=float(self.__linewidth)))
-
-        #now draw the x-axis minor tick marks
-        for x in xtslminor:
-patches.
+
-                        color=self.__color, linewidth=float(self.__linewidth)))
-
-        #the y-axis ticks and labels
@@ -354 +354 @@
-            s = self._format_tick_string(y)
-            subplot.text(ylabel, y, s, fontsize=int(self.__fontsize), verticalalignment="center",
-                        color=self.__tick_label_color, horizontalalignment="right")
-patches.
+
-                    color=self.__color, linewidth=float(self.__linewidth)))
-            
-        #now draw the x-axis minor tick marks
-        for y in ytslminor:
-patches.
+
-                color=self.__color, linewidth=float(self.__linewidth)))
-
-        # now draw the x and y axis labels
@@ -375 +375 @@
-        Draw a frame around a graphic at the given
-        (scaled out) x and y min and max values.
-        """
-patch
+lin
-        #border horizontal axis:
-        #bottom:
-patches.
+
-                                        color=self.__color, linewidth=float(self.__linewidth)))
-        #top:
-patches.
+
-                                        color=self.__color, linewidth=float(self.__linewidth)))
-        #border vertical axis:
-        #left:
-patches.
+
-                                        color=self.__color, linewidth=float(self.__linewidth)))
-        #right:
-patches.
+
-                                        color=self.__color, linewidth=float(self.__linewidth)))
-
-
@@ -403 +403 @@
-        centered axes with no tick marks.
-
-        """
-patch
+lin
-        xmin = float(xmin); xmax=float(xmax); ymin=float(ymin); ymax=float(ymax)
-        yspan = ymax - ymin
-        xspan = xmax - xmin
@@ -431 +431 @@
-        #these are the centered axes, like in regular plot, but with no ticks
-        if axes_with_no_ticks:
-            #the x axis line
-patches.
+
-                                            color=self.__color, linewidth=float(self.__linewidth)))
-
-            #the y axis line
-patches.
+
-                                            color=self.__color, linewidth=float(self.__linewidth)))
-           
-        #the x-axis ticks and labels
@@ -447 +447 @@
-
-        #now draw the x-axis minor tick marks
-        for x in xtslminor:
-patches.
+
-                        color=self.__color, linewidth=float(self.__linewidth)))
-patches.
+
-                        color=self.__color, linewidth=float(self.__linewidth)))
-
-
@@ -462 +462 @@
-            
-        #now draw the x-axis minor tick marks
-        for y in ytslminor:
-patches.
+
-                color=self.__color, linewidth=float(self.__linewidth)))
-patches.
+
-                color=self.__color, linewidth=float(self.__linewidth)))
-
-    def _adjustments_for_frame(self, xmin, xmax, ymin, ymax):
@@ -501 +501 @@
-        the ith row and jth column of the matrix.
-
-        """
-patch
+lin
-        xmax = int(xmax)
-        ymax = int(ymax)
-
@@ -558 +558 @@
-                         horizontalalignment="center", verticalalignment="top")
-            subplot.text(xr, -2*xlabel + ymaxs, s, fontsize=int(self.__fontsize),
-                         horizontalalignment="center", verticalalignment="top")
-patches.
+
-                        color=self.__color, linewidth=float(self.__linewidth)))
-patches.
+
-                        color=self.__color, linewidth=float(self.__linewidth)))
-                    
-        #the y-axis ticks and labels
@@ -571 +571 @@
-                         verticalalignment="center", horizontalalignment="right")
-            subplot.text(-2*ylabel + xmaxs, yr, s, fontsize=int(self.__fontsize), 
-                         verticalalignment="center", horizontalalignment="left")
-patches.
+
-                color=self.__color, linewidth=float(self.__linewidth)))
-patches.
+
-                color=self.__color, linewidth=float(self.__linewidth)))
-
-class GridLines(SageObject):
@@ -799 +799 @@
-        xlines, ylines = new_gridlines
-
-        # draw the grid lines
-patch
+lin
-        # horizontal lines
-        for (yval, ykwds) in ylines:
-            subplot.add_line(
-patches.
+
-                    )
-        # vertical lines
-        for (xval, xkwds) in xlines:
-            subplot.add_line(
-patches.
+
-                    )
-
-    def _get_ticks_locations(self, interval, ticks="major"):

a/sage/plot/plot.py

@@ -2059 +2059 @@
-        This implicitly calls this function:
-            sage: line([(1,2), (3,-4), (2, 5), (1,2)])
-        """
-patches as patch
+lines as lin
-        options = dict(self.options())
-        del options['alpha']
-        del options['thickness']
-        del options['rgbcolor']
-patches.
+
-        options = self.options()
-        a = float(options['alpha'])
-        p.set_alpha(a)