marsilea 0.3.6__py3-none-any.whl → 0.4.1__py3-none-any.whl

marsilea/__init__.py

@@ -1,6 +1,6 @@
 """Declarative creation of composable visualization"""
 
-__version__ = "0.3.6"
+__version__ = "0.4.1"
 
 import marsilea.plotter as plotter
 from ._deform import Deformation

marsilea/base.py

@@ -15,7 +15,7 @@ from matplotlib.figure import Figure
 
 from ._deform import Deformation
 from .dendrogram import Dendrogram
-from .exceptions import SplitTwice
+from .exceptions import SplitTwice, DuplicatePlotter
 from .layout import CrossLayout, CompositeCrossLayout
 from .plotter import RenderPlan, Title, SizedMesh
 from .utils import pairwise, batched, get_plot_name, _check_side
@@ -67,21 +67,22 @@ class LegendMaker:
         """
         raise NotImplementedError("Should be implemented in derived class")
 
-    def custom_legend(self, legend, name=None):
+    def custom_legend(self, legend_func, name=None):
         """Add a custom legend
 
         Parameters
         ----------
 
-        legend : `Artist <matplotlib.artist.Artists>`
-            A legend object
+        legend_func : Callable
+            A function that return the legend object,
+            the legend must be an `Artist <matplotlib.artist.Artists>`
         name : str, optional
             The name of the legend
 
         """
         if name is None:
             name = str(uuid4())
-        self._user_legends[name] = [legend]
+        self._user_legends[name] = legend_func
 
     def add_legends(
         self,
@@ -159,7 +160,8 @@ class LegendMaker:
         self.layout.remove_legend_ax()
 
     def _legends_drawer(self, ax):
-        legends = {**self.get_legends(), **self._user_legends}
+        user_legends = {k: [v()] for k, v in self._user_legends.items()}
+        legends = {**self.get_legends(), **user_legends}
 
         # force to remove all legends before drawing
         # In case some legends are added implicitly
@@ -330,6 +332,8 @@ class WhiteBoard(LegendMaker):
             If True, the legend will be included when calling :meth:`~marsilea.base.LegendMaker.add_legends`
 
         """
+        if plot.name is not None:
+            raise DuplicatePlotter(plot)
         plot_name = get_plot_name(name, side, plot.__class__.__name__)
         self._legend_switch[plot_name] = legend
 
@@ -819,6 +823,9 @@ class ClusterBoard(WhiteBoard):
         )
         self._row_den = []
         self._col_den = []
+        cluster_data = np.asarray(cluster_data)
+        if cluster_data.ndim != 2:
+            raise ValueError("Cluster data must be 2D array")
         self._cluster_data = cluster_data
         self._deform = Deformation(cluster_data)
 
@@ -1041,7 +1048,8 @@ class ClusterBoard(WhiteBoard):
         warnings.warn(
             DeprecationWarning(
                 "`hsplit` will be deprecated in v0.5.0, use `cut_rows` or `group_rows` instead"
-            )
+            ),
+            stacklevel=2,
         )
         if self._split_row:
             raise SplitTwice(axis="horizontally")
@@ -1108,7 +1116,8 @@ class ClusterBoard(WhiteBoard):
         warnings.warn(
             DeprecationWarning(
                 "`vsplit` will be deprecated in v0.5.0, use `cut_cols` or `group_cols` instead"
-            )
+            ),
+            stacklevel=2,
         )
         if self._split_col:
             raise SplitTwice(axis="vertically")
@@ -1293,20 +1302,20 @@ class ClusterBoard(WhiteBoard):
         if deform.is_col_split:
             for plan in self._col_plan:
                 if plan.allow_split:
-                    if deform.is_col_cluster:
-                        group_ratios = None
-                    else:
-                        group_ratios = plan.get_split_regroup()
+                    # if deform.is_col_cluster:
+                    #     group_ratios = None
+                    # else:
+                    group_ratios = plan.get_split_regroup()
                     self.layout.vsplit(plan.name, w_ratios, wspace, group_ratios)
 
         # split row axes
         if deform.is_row_split:
             for plan in self._row_plan:
                 if plan.allow_split:
-                    if deform.is_row_cluster:
-                        group_ratios = None
-                    else:
-                        group_ratios = plan.get_split_regroup()
+                    # if deform.is_row_cluster:
+                    #     group_ratios = None
+                    # else:
+                    group_ratios = plan.get_split_regroup()
                     self.layout.hsplit(plan.name, h_ratios, hspace, group_ratios)
 
     def _render_dendrogram(self):

marsilea/exceptions.py

@@ -6,6 +6,18 @@ class DuplicateName(Exception):
         return f"Axes with name `{self.name}` already exists."
 
 
+class DuplicatePlotter(Exception):
+
+    def __init__(self, plotter):
+        self.plotter = plotter
+
+    def __str__(self):
+        name = self.plotter.__class__.__name__
+        return (f"You have added `{name}` "
+                f"to the `{self.plotter.side}`, "
+                f"please create a new `{name}` if you want to add it again.")
+
+
 class SplitTwice(Exception):
     def __init__(self, axis="col"):
         self.axis = axis

marsilea/plotter/base.py

@@ -538,6 +538,10 @@ class RenderPlan:
         self._split_regroup = ratio
 
     def get_split_regroup(self):
+        if self._split_regroup is None:
+            return None
+        if self.is_flank:
+            return self._split_regroup[::-1]
         return self._split_regroup
 
 

marsilea/utils.py

@@ -74,7 +74,10 @@ def get_colormap(cmap):
     try:
         return mpl.colormap.get(cmap)
     except AttributeError:
-        return mpl.cm.get_cmap(cmap)
+        try:
+            return mpl.cm.get_cmap(cmap)
+        except AttributeError:
+            return mpl.cm.ColormapRegistry.get_cmap(cmap)
 
 
 def get_canvas_size_by_data(

{marsilea-0.3.6.dist-info → marsilea-0.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: marsilea
-Version: 0.3.6
+Version: 0.4.1
 Summary: Declarative creation of composable visualization
 Author: Zhihang Zheng
 Author-email: Mr-Milk <yzheng@cemm.at>

{marsilea-0.3.6.dist-info → marsilea-0.4.1.dist-info}/RECORD

@@ -1,15 +1,15 @@
-marsilea/__init__.py,sha256=TJ1LRb_ML9gOV-uhUijRCVqEkCZkrCk0MFgrmB5z574,541
+marsilea/__init__.py,sha256=9DU80xdR6t2bZPgh2LbIhQXiEN_WCSu-kRQN8tpSGRk,541
 marsilea/_api.py,sha256=tymWZHfjhx8-0NNd9762znfdIu36NrARRweEIr5L1mA,283
 marsilea/_deform.py,sha256=SKXLvhyUrwTRAw7Fl--OpupDLk6T3S5DRfwCAdewHQs,14138
-marsilea/base.py,sha256=wgKuOp8GKttwqC6_YdtR7RzFdxbOc-7iVjTlY0T0h44,46192
+marsilea/base.py,sha256=HSY25Ax39Vj80FxSZkg4es0YklNtFJ_DgfQzbFIJseI,46637
 marsilea/dataset.py,sha256=a0mXjPu9_tRGHofnnQaTryFpxftkfqldq_ZLXMSBf7A,4410
 marsilea/dendrogram.py,sha256=WUnV2JMSY9mPt1sfkFAEikkl2ta7xHFD13teas_iZgE,14767
-marsilea/exceptions.py,sha256=Wxy31eCWkoXTPwqaa7R5F7cJ3uCtzqhJXmxVqqX8eAA,661
+marsilea/exceptions.py,sha256=kIXDRF8Fy-BkNqeMbLqde06PaWESuKiGCMGyDpVpWIE,1006
 marsilea/heatmap.py,sha256=lKGt0lTtziNFDsb_SBfFt3zoYzVYRzezc9aae5RxHyk,4168
 marsilea/layers.py,sha256=puXLlGGpEqAzaTqadpgpsYmIDPH33WyyHIuysRSqFZQ,12163
 marsilea/layout.py,sha256=X8MGPlAbbr7dcZiqW4pI7sEb8U3jVaiS7t1DKOqMYLI,27758
 marsilea/upset.py,sha256=U1Rsmo1WpCAV9z3LBlE2L4T0nAW9ols8Z36fXzmXycw,30388
-marsilea/utils.py,sha256=IaAaOBdE668XuGiA-k_gmOtHYqfpIxPv_-molMSBPfs,2851
+marsilea/utils.py,sha256=hp241iWBZX1JO-xqMWJ_oGa5D7y-6ETwYHvWxCYO9Us,2957
 marsilea/plotter/__init__.py,sha256=n1E53C5oqnsHZcXAtN6HgZsZdcAvANONNx-fupTxzN0,738
 marsilea/plotter/_images.py,sha256=RWCI4FhcxJZimLrhdy9CHw3ri1kweGRICUyByE4wzmg,3065
 marsilea/plotter/_seaborn.py,sha256=aK0EnboshfNCNvNjsIc7dxDE_4KBKi4HMUt7CKWt_6U,8188
@@ -17,11 +17,11 @@ marsilea/plotter/_utils.py,sha256=Efhdk-TrrAanhbXRiEVWThMYvZ4vVHZMVYMs5X3JvIM,71
 marsilea/plotter/arc.py,sha256=PFXlJ0TBIJ1mEB-lIl-Zs2UdEXkLSwDlRJbsSa5Ss5U,8165
 marsilea/plotter/area.py,sha256=zjjAhvgKHYe9rqzcseqZqhwfpgvzm0w2FRJ_vr9Fxm4,2650
 marsilea/plotter/bar.py,sha256=TeX6li--kE9NtqCRflDTX0jkG1-uIq0Dn8ILKSv-AuA,12080
-marsilea/plotter/base.py,sha256=0UiJqNefv9mieMB0ICpKQ2rXqGaFYigqyxQe4BzBP24,20321
+marsilea/plotter/base.py,sha256=NgaoFnbMS6Mj4BghVcGaSYYN8A9e3DD_rRomDIm4C5c,20456
 marsilea/plotter/bio.py,sha256=_pZkGoAei7eirFCpu7AcZJhebBneNjUKcZlI36bpqUE,5044
 marsilea/plotter/mesh.py,sha256=ArioOXZJpD1T2wrYDmm_cFQpUmq_3q7W_qrJ_zCX3zU,23793
 marsilea/plotter/text.py,sha256=oYJ5py3_nGHKi60DSVzFgPg4drnTSTw__IcYs0cut4M,36222
-marsilea-0.3.6.dist-info/LICENSE,sha256=2TLD8FnLJqXzg8YBRs7W3VZBwfWfp4ArDfBl-rn96Qc,1074
-marsilea-0.3.6.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-marsilea-0.3.6.dist-info/METADATA,sha256=COXhGBcv1dJZ9uI_TuMX3FV5dun7yTkAkw0orGCeFjQ,4074
-marsilea-0.3.6.dist-info/RECORD,,
+marsilea-0.4.1.dist-info/LICENSE,sha256=2TLD8FnLJqXzg8YBRs7W3VZBwfWfp4ArDfBl-rn96Qc,1074
+marsilea-0.4.1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+marsilea-0.4.1.dist-info/METADATA,sha256=Ve7H7WVLlM0KAY01MhecegkMBYL9vP99vznsTt42_BY,4074
+marsilea-0.4.1.dist-info/RECORD,,