Updated to super plotnine 0.13.x (in middle)

Author: ponnhide

patchworklib/modified_plotnine.py

@@ -1,5 +1,117 @@
+import numpy as np 
+import itertools
+from plotnine.facets.strips import Strips
 from copy import deepcopy
 
+def make_figure(self, figure=None):
+    """
+    Create and return Matplotlib figure and subplot axes
+    """
+    num_panels = len(self.layout.layout)
+    axsarr = np.empty((self.nrow, self.ncol), dtype=object)
+
+    # Create figure & gridspec
+    if figure is None:
+        figure, gs = self._make_figure()
+    else:
+        _, gs = self._make_figure()
+    self.grid_spec = gs
+
+    # Create axes
+    it = itertools.product(range(self.nrow), range(self.ncol))
+    for i, (row, col) in enumerate(it):
+        axsarr[row, col] = figure.add_subplot(gs[i])
+
+    # Rearrange axes
+    # They are ordered to match the positions in the layout table
+    if self.dir == "h":
+        order: Literal["C", "F"] = "C"
+        if not self.as_table:
+            axsarr = axsarr[::-1]
+    elif self.dir == "v":
+        order = "F"
+        if not self.as_table:
+            axsarr = np.array([row[::-1] for row in axsarr])
+    else:
+        raise ValueError(f'Bad value `dir="{self.dir}"` for direction')
+
+    axs = axsarr.ravel(order)
+
+    # Delete unused axes
+    for ax in axs[num_panels:]:
+        figure.delaxes(ax)
+    axs = axs[:num_panels]
+    return figure, list(axs)
+
+def setup(self, figure, plot):
+    self.plot = plot
+    self.layout = plot.layout
+
+    if hasattr(plot, "figure"):
+        self.figure, self.axs = plot.figure, plot.axs
+    else:
+        self.figure, self.axs = self.make_figure(self, figure=figure)
+
+    self.coordinates = plot.coordinates
+    self.theme = plot.theme
+    self.layout.axs = self.axs
+    self.strips = Strips.from_facet(self)
+    return self.figure, self.axs
+
+def newdraw(self, return_ggplot=False, show: bool = False):
+    """
+    Render the complete plot
+
+    Parameters
+    ----------
+    show :
+        Whether to show the plot.
+
+    Returns
+    -------
+    :
+        Matplotlib figure
+    """
+    import matplotlib as mpl 
+    from plotnine._mpl.layout_engine import PlotnineLayoutEngine
+    from plotnine.ggplot import plot_context
+
+    # Do not draw if drawn already.
+    # This prevents a needless error when reusing
+    # figure & axes in the jupyter notebook.
+    if hasattr(self, "figure"):
+        return self.figure
+
+    # Prevent against any modifications to the users
+    # ggplot object. Do the copy here as we may/may not
+    # assign a default theme
+    self = deepcopy(self)
+    with plot_context(self, show=show):
+        self._build()
+
+        # setup
+        self.figure, self.axs = self.facet.setup(self)
+        self.guides._setup(self)
+        self.theme.setup(self)
+
+        # Drawing
+        self._draw_layers()
+        self._draw_panel_borders()
+        self._draw_breaks_and_labels()
+        self.guides.draw()
+        self._draw_figure_texts()
+        self._draw_watermarks()
+
+        # Artist object theming
+        self.theme.apply()
+        self.figure.set_layout_engine(PlotnineLayoutEngine(self))
+    if return_ggplot == True:
+        return self.figure, self 
+    else:
+        return self.figure 
+    return self.figure
+
+
 def draw(self, return_ggplot=False, show: bool = False):
     """
     Render the complete plot

patchworklib/patchworklib.py

@@ -210,7 +210,12 @@ def _reset_ggplot_legend(bricks):
         pass
 
 def overwrite_plotnine():
-    plotnine.ggplot.draw = mp9.draw
+    if StrictVersion(plotnine.__version__) >= StrictVersion("0.13"):
+        plotnine.ggplot.draw = mp9.newdraw
+        plotnine.facets.facet.setup = mp9.setup 
+        plotnine.facets.facet.make_figure = mp9.make_figure
+    else:
+        plotnine.ggplot.draw = mp9.draw
 
 def load_ggplot(ggplot=None, figsize=None):  
     """
@@ -277,8 +282,28 @@ def draw_labels(bricks, gori, gcp, figsize):
         else:
             xlabel = bricks.set_xlabel(labels.x, labelpad=pad_x, va="top")
             ylabel = bricks.set_ylabel(labels.y, labelpad=pad_y)    
+        
+        if StrictVersion(plotnine_version) >= StrictVersion("0.13"):
+            gori.theme.targets.axis_title_x = xlabel
+            gori.theme.targets.axis_title_y = ylabel
+            if 'axis_title_x' in gori.theme.themeables:
+                gori.theme.themeables['axis_title_x'].apply_figure(gori.figure, gori.theme.targets)
+                for ax in gori.axs:
+                    gori.theme.themeables['axis_title_x'].apply_ax(ax)
 
-        if StrictVersion(plotnine_version) >= StrictVersion("0.12"):
+            if 'axis_title_y' in gori.theme.themeables:
+                gori.theme.themeables['axis_title_y'].apply_figure(gori.figure, gori.theme.targets)
+                for ax in gori.axs:
+                    gori.theme.themeables['axis_title_y'].apply_ax(ax)
+
+            for key in gori.theme.themeables:
+                if "legend" in key:
+                    gori.theme.themeables[key].apply_figure(gori.figure, gori.theme.targets)
+                    for ax in gori.axs:
+                        gori.theme.themeables[key].apply_ax(ax) 
+           
+
+        elif StrictVersion(plotnine_version) >= StrictVersion("0.12"):
             gori.theme._targets['axis_title_x'] = xlabel
             gori.theme._targets['axis_title_y'] = ylabel
             if 'axis_title_x' in gori.theme.themeables:
@@ -415,8 +440,9 @@ def draw_title(bricks, gori, gcp, figsize):
                 x  = ha      
                 ha = "center"
 
-        except KeyError:
-            ha = 0.5
+        except Exception as e:
+            x = 0.5
+            ha = "center"
 
         try:
             va = get_property('plot_title', 'va')
@@ -440,7 +466,13 @@ def draw_title(bricks, gori, gcp, figsize):
         else:
             text = bricks._case.set_title(title, pad=pad, fontsize=fontsize, x=x, ha=ha, va=va)
 
-        if StrictVersion(plotnine_version) >= StrictVersion("0.12"):
+        if StrictVersion(plotnine_version) >= StrictVersion("0.13"):
+            gori.theme.targets.plot_title = text
+            gori.theme.themeables['plot_title'].apply_figure(gori.figure, gori.theme.targets)
+            for ax in gori.axs:
+                gori.theme.themeables['plot_title'].apply_ax(ax)
+
+        elif StrictVersion(plotnine_version) >= StrictVersion("0.12"):
             gori.theme._targets['plot_title'] = text
             gori.theme.themeables['plot_title'].apply_figure(gori.figure, gori.theme._targets)
             for ax in gori.axs:
@@ -487,15 +519,23 @@ def draw_title(bricks, gori, gcp, figsize):
         strips = []
 
     ggplot._build()
-    axs = ggplot.facet.make_axes(
-        _basefigure,
-        ggplot.layout.layout,
-        ggplot.coordinates) 
+
+    if StrictVersion(plotnine_version) >= StrictVersion("0.13"):
+        ggplot.facet.make_figure = mp9.make_figure 
+        fig, axs = plotnine.facets.facet.setup(ggplot.facet, _basefigure, ggplot)
+    else:
+        axs = ggplot.facet.make_axes(
+            _basefigure,
+            ggplot.layout.layout,
+            ggplot.coordinates) 
 
     ggplot.figure = _basefigure
     ggplot.axs = axs
 
-    if StrictVersion(plotnine_version) >= StrictVersion("0.12"):
+    if StrictVersion(plotnine_version) >= StrictVersion("0.13"):
+        ggplot.theme = gcp.theme
+
+    elif StrictVersion(plotnine_version) >= StrictVersion("0.12"):
         ggplot.theme = gcp.theme
         ggplot.theme._targets = gcp.theme._targets
 
@@ -517,8 +557,12 @@ def draw_title(bricks, gori, gcp, figsize):
             ggplot.axs[i].spines[bar].set_ec(gcp.axs[i].spines[bar].get_ec())
             ggplot.axs[i].spines[bar].set_visible(gcp.axs[i].spines[bar].get_visible())
 
-    ggplot._setup_parameters()
-    ggplot.facet.strips.generate()  
+    if StrictVersion(plotnine_version) >= StrictVersion("0.13"):
+        ggplot.theme.setup(ggplot) 
+    else:
+        ggplot._setup_parameters()
+        ggplot.facet.strips.generate()  
+    
     for i in range(len(ggplot.facet.strips)):
         if StrictVersion(plotnine_version) >= StrictVersion("0.12"):
             ggplot.facet.strips[i].position = strips[i].draw_info.position
@@ -550,6 +594,10 @@ def draw_title(bricks, gori, gcp, figsize):
         for i, l in enumerate(ggplot.layers, start=1):
             l.zorder = i + 10
             l.draw(ggplot.layout, ggplot.coordinates)
+        
+        if StrictVersion(plotnine_version) >= StrictVersion("0.13"):
+            ggplot._draw_panel_borders()
+            ggplot.facet.theme = ggplot.theme
         ggplot._draw_breaks_and_labels()
         ggplot._draw_watermarks() 
         new = themeable.from_class_name
@@ -583,7 +631,7 @@ def draw_title(bricks, gori, gcp, figsize):
 
         if StrictVersion(plotnine_version) >= StrictVersion("0.9"):
             xl, yl = draw_labels(ax, ggplot, gcp, figsize) 
-            draw_legend(ax, ggplot, gcp, figsize)
+            draw_legend(ax, ggplot, gcp, figsize) #0.13 makes Erros here.
             draw_title(ax,  ggplot, gcp, figsize)
 
         elif StrictVersion("0.8") <= StrictVersion(plotnine_version) < StrictVersion("0.9"):
@@ -2449,7 +2497,7 @@ def get_outer_corner(self):
 
         return min(x0_list), max(x1_list), min(y0_list), max(y1_list)
 
-    def savefig(self, fname=None, transparent=None, quick=True, _ggplot=False, **kwargs):
+    def savefig(self, fname=None, transparent=False, quick=True, _ggplot=False, **kwargs):
         """
         
         Save figure. 
@@ -2586,13 +2634,13 @@ def __sub__(self, other):
 
     def _repr_png_(self):
         buf = io.BytesIO()
-        self.savefig(buf, "png")
+        self.savefig(buf, format="png", dpi=300, transparent=False)
         return buf.getvalue()
 
-    def _repr_pdf_(self):
-        buf = io.BytesIO()
-        self.savefig(buf, "pdf")
-        return buf.getvalue()
+    #def _repr_pdf_(self):
+    #    buf = io.BytesIO()
+    #    self.savefig(buf, format="pdf", transparent=False)
+    #    return buf.getvalue()
 
 #class Brick(axes.Axes): 
 class pBrick: 
@@ -2892,7 +2940,7 @@ def get_outer_corner(self, labes=None):
             self._outer_flag = True
             return self._outer_corner
 
-    def savefig(self, fname=None, transparent=None, quick=True, _ggplot=False, **kwargs):
+    def savefig(self, fname=None, transparent=False, quick=True, _ggplot=False, **kwargs):
         """
 
         Save figure.
@@ -3078,13 +3126,13 @@ def __sub__(self, other):
 
     def _repr_png_(self):
         buf = io.BytesIO()
-        self.savefig(buf, "png")
+        self.savefig(buf, format="png", dpi=300, transparent=False)
         return buf.getvalue()
 
-    def _repr_pdf_(self):
-        buf = io.BytesIO()
-        self.savefig(buf, "pdf")
-        return buf.getvalue()
+    #def _repr_pdf_(self):
+    #    buf = io.BytesIO()
+    #    self.savefig(buf, format="pdf", transparent=False)
+    #    return buf.getvalue()
 
 class Brick(pBrick, axes.Axes):
     def __getattribute__(self, name):
@@ -3519,4 +3567,4 @@ def resize(self, direction):
 
 if StrictVersion(plotnine.__version__) >= StrictVersion("0.12"):
     overwrite_plotnine()
-
+