marsilea 0.3.3__py3-none-any.whl → 0.3.5__py3-none-any.whl

marsilea/__init__.py

@@ -1,10 +1,12 @@
 """Create x-layout visualization"""
 
-__version__ = "0.3.3"
+__version__ = "0.3.5"
 
 import marsilea.plotter as plotter
 from ._deform import Deformation
-from .base import WhiteBoard, ClusterBoard, ZeroWidth, ZeroHeight
+from .base import (WhiteBoard, ClusterBoard,
+                   ZeroWidth, ZeroHeight,
+                   ZeroWidthCluster, ZeroHeightCluster)
 from .dataset import load_data
 from .dendrogram import Dendrogram, GroupDendrogram
 from .heatmap import Heatmap, SizedHeatmap, CatHeatmap

marsilea/base.py

@@ -80,7 +80,7 @@ class LegendMaker:
         """
         if name is None:
             name = str(uuid4())
-        self._user_legends[name] = legend
+        self._user_legends[name] = [legend]
 
     def add_legends(
             self,
@@ -1403,3 +1403,50 @@ class ClusterBoard(WhiteBoard):
         # add row and col dendrogram
         self._render_dendrogram()
         self._render_legend()
+
+
+class ZeroWidthCluster(ClusterBoard):
+    """
+    A utility class to initialize a canvas \
+    with zero width and cluster data
+
+    Parameters
+    ----------
+    cluster_data : ndarray
+        The cluster data
+    height : float
+        The height of the main canvas in inches
+    name : str
+        The name of the main canvas
+    margin : float, 4-tuple
+        The margin of the main canvas in inches
+
+    """
+
+    def __init__(self, cluster_data, height, name=None, margin=0.2):
+        super().__init__(cluster_data=cluster_data, width=0, height=height,
+                         name=name, margin=margin, init_main=False)
+
+
+class ZeroHeightCluster(ClusterBoard):
+    """
+    A utility class to initialize a canvas \
+    with zero height and cluster data
+
+    Parameters
+    ----------
+    cluster_data : ndarray
+        The cluster data
+    width : float
+        The width of the main canvas in inches
+    name : str
+        The name of the main canvas
+    margin : float, 4-tuple
+        The margin of the main canvas in inches
+
+
+    """
+
+    def __init__(self, cluster_data, width, name=None, margin=0.2):
+        super().__init__(cluster_data=cluster_data, width=width, height=0,
+                         name=name, margin=margin, init_main=False)

marsilea/layers.py

@@ -360,6 +360,7 @@ class Marker(Piece):
         self.size = size
         m = MarkerStyle(marker)
         self.path = m.get_path().transformed(m.get_transform())
+        self.marker = marker
 
     def draw(self, x, y, w, h, ax):
         c = self.draw_center(x, y, w, h)

marsilea/plotter/_seaborn.py

@@ -2,7 +2,7 @@ import pandas as pd
 import seaborn
 from legendkit import CatLegend
 from seaborn import color_palette
-from typing import Mapping
+from typing import Mapping, Sequence
 
 from .base import StatsBase
 from ..utils import ECHARTS16
@@ -51,6 +51,8 @@ class _SeabornBase(StatsBase):
             #     kwargs['palette'] = "dark:C0"
             if palette is not None:
                 kwargs["palette"] = palette
+                if isinstance(palette, Sequence):
+                    self.set_params({"palette": palette})
 
         kwargs.pop("x", None)
         kwargs.pop("y", None)
@@ -80,6 +82,7 @@ class _SeabornBase(StatsBase):
         ax = spec.ax
         data = spec.data
         gp = spec.group_params
+
         if gp is None:
             gp = {}
         x, y = "var", "value"
@@ -106,6 +109,9 @@ class _SeabornBase(StatsBase):
                 x, y = y, x
             self.kws["x"] = x
             self.kws["y"] = y
+            if spec.params is not None:
+                palette = [p.get("palette", "C0") for p in spec.params]
+                self.kws["palette"] = palette
             options = {**self.kws, **gp}
             if options.get("palette") is not None:
                 options["hue"] = "var"

marsilea/plotter/area.py

@@ -26,6 +26,20 @@ class Area(StatsBase):
         Additional configurations for the area plot, \
         see :func:`matplotlib.pyplot.fill_between`
 
+    Examples
+    --------
+    .. plot::
+        :context: close-figs
+
+        import numpy as np
+        import matplotlib.pyplot as plt
+
+        from marsilea.plotter import Area
+
+        _, ax = plt.subplots()
+        data = np.random.randint(0, 10, 10) + 1
+        Area(data).render(ax)
+
     """
 
     def __init__(self, data, color=None, add_outline=True, alpha=.4,
@@ -46,6 +60,7 @@ class Area(StatsBase):
         self.kws = kwargs
 
         self.set_data(data)
+        self.set_label(label, label_loc, label_props)
         if group_kws is not None:
             self.set_group_params(group_kws)
 
@@ -56,7 +71,7 @@ class Area(StatsBase):
         if gp is None:
             gp = {}
 
-        fill_options = {'colo': self.color, 'alpha': self.alpha, **self.kws, **gp}
+        fill_options = {'color': self.color, 'alpha': self.alpha, **self.kws, **gp}
         line_options = {'color': self.linecolor, 'linewidth': self.linewidth, **gp}
 
         x = np.arange(len(data))

{marsilea-0.3.3.dist-info → marsilea-0.3.5.dist-info}/METADATA

@@ -1,12 +1,14 @@
 Metadata-Version: 2.1
 Name: marsilea
-Version: 0.3.3
+Version: 0.3.5
 Summary: Create x-layout visualization
 Author: Zhihang Zheng
 Author-email: Mr-Milk <yzheng@cemm.at>
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3
+Classifier: Framework :: Matplotlib
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: matplotlib>=3.6

{marsilea-0.3.3.dist-info → marsilea-0.3.5.dist-info}/RECORD

@@ -1,27 +1,27 @@
-marsilea/__init__.py,sha256=xgLPjY3onsVFvFuqNclgBCu1mnbLdstf0yXZ2zrT1rs,456
+marsilea/__init__.py,sha256=MK00zrdKPjFGFcfH0KfoZz9MZhkYffJ-QTwDtzELohs,533
 marsilea/_api.py,sha256=tymWZHfjhx8-0NNd9762znfdIu36NrARRweEIr5L1mA,283
 marsilea/_deform.py,sha256=SKXLvhyUrwTRAw7Fl--OpupDLk6T3S5DRfwCAdewHQs,14138
-marsilea/base.py,sha256=yxnuHZMa7xFBC0eerp4zkiQY5Mn1SsIK32B4TUwhuI4,44608
+marsilea/base.py,sha256=YQNgkLPX2RoQzhLdEaxf6ZLFECjAqXdye9G5XG64sAY,45869
 marsilea/dataset.py,sha256=a0mXjPu9_tRGHofnnQaTryFpxftkfqldq_ZLXMSBf7A,4410
 marsilea/dendrogram.py,sha256=WUnV2JMSY9mPt1sfkFAEikkl2ta7xHFD13teas_iZgE,14767
 marsilea/exceptions.py,sha256=Wxy31eCWkoXTPwqaa7R5F7cJ3uCtzqhJXmxVqqX8eAA,661
 marsilea/heatmap.py,sha256=lKGt0lTtziNFDsb_SBfFt3zoYzVYRzezc9aae5RxHyk,4168
-marsilea/layers.py,sha256=my_QcvKGsIu4BV6yKpUUs5v4bdAz915tmS-q48_rEGg,12134
+marsilea/layers.py,sha256=puXLlGGpEqAzaTqadpgpsYmIDPH33WyyHIuysRSqFZQ,12163
 marsilea/layout.py,sha256=X8MGPlAbbr7dcZiqW4pI7sEb8U3jVaiS7t1DKOqMYLI,27758
 marsilea/upset.py,sha256=12ExZ6yUQocd3bSLYtizEblJgILn_QCQaoeP-SP2q9E,30138
 marsilea/utils.py,sha256=IaAaOBdE668XuGiA-k_gmOtHYqfpIxPv_-molMSBPfs,2851
 marsilea/plotter/__init__.py,sha256=aEN-Yta4USY5_l-D97XYySALEgxMmFieA08DzK3xdB4,737
 marsilea/plotter/_images.py,sha256=BC9iyWBLVY-nmUW1pSZq06pwHZN1MrW2psMIDreLReg,3062
-marsilea/plotter/_seaborn.py,sha256=wC2sqVokSsk_uqYkjtg6HNrsifawLwqsQoDgJWIkSPs,7834
+marsilea/plotter/_seaborn.py,sha256=XePOYnIFf9lDXXZffSL-YKSV162hKOWsvuxAvH2oHQo,8111
 marsilea/plotter/_utils.py,sha256=Efhdk-TrrAanhbXRiEVWThMYvZ4vVHZMVYMs5X3JvIM,710
 marsilea/plotter/arc.py,sha256=iBAvQeYLMNaXsykkpE6BJN1CTaBNntlfispFV2LvSUE,8102
-marsilea/plotter/area.py,sha256=BYqi522L5h5fy5fmnI2_GZEzKR7NE2QFBJpMySmohT4,2244
+marsilea/plotter/area.py,sha256=UOI8xdXMORXdgEG7fT9Lmx3Zk0_7XZl9nMw9A_CZkKA,2590
 marsilea/plotter/bar.py,sha256=jbWukeTkUSge_TLC3ikJeg7GLHG4WuyN6EwIERvh0sc,11976
 marsilea/plotter/base.py,sha256=Kzp0474WlXQse5jK4kLPtkVQLH9zpEwYNocV4c0CD-A,19621
 marsilea/plotter/bio.py,sha256=_pZkGoAei7eirFCpu7AcZJhebBneNjUKcZlI36bpqUE,5044
 marsilea/plotter/mesh.py,sha256=JctVkK5xjsUnRjX2ik3ntL-k-Didi7OAUfdmgkZu6IQ,23116
 marsilea/plotter/text.py,sha256=oYJ5py3_nGHKi60DSVzFgPg4drnTSTw__IcYs0cut4M,36222
-marsilea-0.3.3.dist-info/LICENSE,sha256=2TLD8FnLJqXzg8YBRs7W3VZBwfWfp4ArDfBl-rn96Qc,1074
-marsilea-0.3.3.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-marsilea-0.3.3.dist-info/METADATA,sha256=3ey_r3Hu6oNLTT1RvARf5aGE-oDQcIckaoeO3nkTE34,3971
-marsilea-0.3.3.dist-info/RECORD,,
+marsilea-0.3.5.dist-info/LICENSE,sha256=2TLD8FnLJqXzg8YBRs7W3VZBwfWfp4ArDfBl-rn96Qc,1074
+marsilea-0.3.5.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+marsilea-0.3.5.dist-info/METADATA,sha256=WNby0TTARbfq5zrKSbelRLRchsPRURRraukRSnZYO64,4055
+marsilea-0.3.5.dist-info/RECORD,,