Merge pull request #44 from janssen/master

actually draw background in Agg version; update to use new matplotlib…

Author: matham

backend_kivy.py

@@ -299,7 +299,8 @@ def close(event):
 from kivy.clock import Clock
 from distutils.version import LooseVersion
 
-_mpl_1_5 = LooseVersion(matplotlib.__version__) >= LooseVersion('1.5.0')
+_mpl_ge_1_5 = LooseVersion(matplotlib.__version__) >= LooseVersion('1.5.0')
+_mpl_ge_2_0 = LooseVersion(matplotlib.__version__) >= LooseVersion('2.0.0rc1')
 
 import numpy as np
 import io
@@ -477,7 +478,10 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
         for i, (path, transform) in enumerate(self._iter_collection_raw_paths(
             master_transform, paths, all_transforms)):
             transform = Affine2D(transform.get_matrix()).scale(1.0, -1.0)
-            polygons = path.to_polygons(transform)
+            if _mpl_ge_2_0:
+                polygons = path.to_polygons(transform, closed_only=False)
+            else:
+                polygons = path.to_polygons(transform)
             path_codes.append(polygons)
         # Apply the styles and rgbFace to each one of the raw paths from
         # the list. Additionally a transformation is being applied to
@@ -549,7 +553,7 @@ def get_graphics(self, gc, polygons, points_line, rgbFace, closed=False):
                         mode=str("triangle_fan")
                     ))
         instruction_group.add(Color(*gc.get_rgb()))
-        if _mpl_1_5 and closed:
+        if _mpl_ge_1_5 and not _mpl_ge_2_0 and closed:
             points_poly_line = points_line[:-2]
         else:
             points_poly_line = points_line
@@ -590,7 +594,10 @@ def draw_image(self, gc, x, y, im):
                 Color(1.0, 1.0, 1.0, 1.0)
                 Rectangle(texture=texture, pos=(x, y), size=(w, h))
         else:
-            polygons = clippath.to_polygons(clippath_trans)
+            if _mpl_ge_2_0:
+                polygons = clippath.to_polygons(clippath_trans, closed_only=False)
+            else:
+                polygons = clippath.to_polygons(clippath_trans)
             list_canvas_instruction = self.get_path_instructions(gc, polygons,
                                                 rgbFace=(1.0, 1.0, 1.0, 1.0))
             for widget, instructions in list_canvas_instruction:
@@ -650,11 +657,12 @@ def draw_text(self, gc, x, y, s, prop, angle, ismath=False, mtext=None):
             self.draw_mathtext(gc, x, y, s, prop, angle)
         else:
             font = resource_find(prop.get_name() + ".ttf")
+            color = gc.get_rgb()
             if font is None:
-                plot_text = CoreLabel(font_size=prop.get_size_in_points())
+                plot_text = CoreLabel(font_size=prop.get_size_in_points(), color=color)
             else:
                 plot_text = CoreLabel(font_size=prop.get_size_in_points(),
-                                font_name=prop.get_name())
+                                font_name=prop.get_name(), color=color)
             plot_text.text = six.text_type("{}".format(s))
             if prop.get_style() == 'italic':
                 plot_text.italic = True
@@ -680,7 +688,7 @@ def draw_mathtext(self, gc, x, y, s, prop, angle):
         w = ftimage.get_width()
         h = ftimage.get_height()
         texture = Texture.create(size=(w, h))
-        if _mpl_1_5:
+        if _mpl_ge_1_5:
             texture.blit_buffer(ftimage.as_rgba_str()[0][0], colorfmt='rgba',
                                 bufferfmt='ubyte')
         else:
@@ -698,8 +706,12 @@ def draw_path(self, gc, path, transform, rgbFace=None):
            rendering. Paths are received in matplotlib coordinates. The
            aesthetics is defined by the `GraphicsContextKivy` gc.
         '''
-        polygons = path.to_polygons(transform, self.widget.width,
-                                    self.widget.height)
+        if _mpl_ge_2_0:
+            polygons = path.to_polygons(transform, self.widget.width,
+                                        self.widget.height, closed_only=False)
+        else:
+            polygons = path.to_polygons(transform, self.widget.width,
+                                        self.widget.height)
         list_canvas_instruction = self.get_path_instructions(gc, polygons,
                                     closed=True, rgbFace=rgbFace)
         for widget, instructions in list_canvas_instruction:
@@ -726,7 +738,10 @@ def draw_markers(self, gc, marker_path, marker_trans, path,
         list_instructions = self._markers.get(dictkey)
         # creating a list of instructions for the specific marker.
         if list_instructions is None:
-            polygons = marker_path.to_polygons(marker_trans)
+            if _mpl_ge_2_0:
+                polygons = marker_path.to_polygons(marker_trans, closed_only=False)
+            else:
+                polygons = marker_path.to_polygons(marker_trans)
             self._markers[dictkey] = self.get_path_instructions(gc,
                                         polygons, rgbFace=rgbFace)
         # Traversing all the positions where a marker should be rendered
@@ -748,7 +763,7 @@ def _convert_path(self, path, transform=None, clip=None, simplify=None,
             clip = (0.0, 0.0, self.width, self.height)
         else:
             clip = None
-        if _mpl_1_5:
+        if _mpl_ge_1_5:
             return _path.convert_to_string(
                 path, transform, clip, simplify, sketch, 6,
                 [b'M', b'L', b'Q', b'C', b'z'], False).decode('ascii')
@@ -992,7 +1007,7 @@ def _get_style_dict(self, rgbFace):
             if self.get_joinstyle() != 'round':
                 attrib['line-linejoin'] = self.get_joinstyle()
             if self.get_capstyle() != 'butt':
-                attrib['line-linecap'] = _capstyle_d[self.get_capstyle()]
+                attrib['line-linecap'] = _capd[self.get_capstyle()]
         return attrib
 
 
@@ -1174,9 +1189,9 @@ def _on_size_changed(self, *args):
         '''
         w, h = self.size
         dpival = self.figure.dpi
-        winch = w / dpival
-        hinch = h / dpival
-        self.figure.set_size_inches(winch, hinch)
+        winch = float(w) / dpival
+        hinch = float(h) / dpival
+        self.figure.set_size_inches(winch, hinch, forward=False)
         self.resize_event()
         self.draw()
 
@@ -1238,13 +1253,14 @@ def show(self):
         pass
 
     def get_window_title(self):
-        return EventLoop.window.title
+        return Window.title
 
     def set_window_title(self, title):
-        EventLoop.window.title = title
+        Window.title = title
 
     def resize(self, w, h):
-        Window.size(w, h)
+        if (w > 0) and (h > 0):
+            Window.size = w, h
 
     def _get_toolbar(self):
         if rcParams['toolbar'] == 'toolbar2':

backend_kivyagg.py

@@ -196,7 +196,10 @@ def draw(self):
             buf_rgba = reg.to_string()
         texture = Texture.create(size=(w, h))
         texture.flip_vertical()
+        color = self.figure.get_facecolor()
         with self.canvas:
+            Color(*color)
+            Rectangle(pos=self.pos, size=(w, h))
             Color(1.0, 1.0, 1.0, 1.0)
             self.img_rect = Rectangle(texture=texture, pos=self.pos,
                                       size=(w, h))

examples/test_backend.py

@@ -37,7 +37,7 @@ def motionnotify(event):
 
 
 def resize(event):
-    print('resize from mpl ', event)
+    print('resize from mpl ', event.width, event.height)
 
 
 def scroll(event):