marsilea 0.5.2__py3-none-any.whl → 0.5.4__py3-none-any.whl

marsilea/__init__.py

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

marsilea/layers.py

@@ -1,7 +1,10 @@
+from __future__ import annotations
+
 import numpy as np
 from legendkit import ListLegend
 from matplotlib import pyplot as plt
 from matplotlib.artist import Artist
+from matplotlib.axes import Axes
 from matplotlib.collections import PathCollection
 from matplotlib.lines import Line2D
 from matplotlib.markers import MarkerStyle
@@ -14,6 +17,25 @@ from .layout import close_ticks
 from .plotter import RenderPlan
 
 
+def add_artists(ax: Axes, artists: Artist | Iterable[Artist]):
+    """Adds one or more Matplotlib artists to an Axes object.
+
+    Parameters
+    ----------
+    ax : matplotlib.axes.Axes
+        The Matplotlib Axes object to which the artists will be added.
+    artists : matplotlib.artist.Artist or Iterable[matplotlib.artist.Artist]
+        A single Matplotlib Artist instance or an iterable
+        containing multiple Artist instances to be added to the Axes.
+
+    """
+    if isinstance(artists, Artist):  # add one artist
+        ax.add_artist(artists)
+    else:  # add multiple artists
+        for art in artists:
+            ax.add_artist(art)
+
+
 class LayersMesh(RenderPlan):
     """The mesh that draw customized elements in multi-layers
 
@@ -186,7 +208,7 @@ class LayersMesh(RenderPlan):
                                 self.height,
                                 ax,
                             )
-                            ax.add_artist(art)
+                            add_artists(ax, art)
         else:
             for iy, row in enumerate(data):
                 for ix, v in enumerate(row):
@@ -198,7 +220,7 @@ class LayersMesh(RenderPlan):
                         self.height,
                         ax,
                     )
-                    ax.add_artist(art)
+                    add_artists(ax, art)
         ax.invert_yaxis()
 
 
@@ -253,7 +275,7 @@ class Piece:
         cy = y + h / 2.0
         return cx, cy
 
-    def draw(self, x, y, w, h, ax) -> Artist:
+    def draw(self, x, y, w, h, ax) -> Artist | Iterable[Artist]:
         raise NotImplementedError
 
     def legend(self, x, y, w, h) -> Artist:
@@ -388,4 +410,4 @@ def preview(piece: Piece, figsize=(1, 1)):
     arts = piece.draw(0, 0, 1, 1, ax)
     ax.set_xlim(0, 1)
     ax.set_ylim(0, 1)
-    ax.add_artist(arts)
+    add_artists(ax, arts)

marsilea/plotter/mesh.py

@@ -483,8 +483,6 @@ class SizedMesh(MeshBase):
         >>> h.add_right(mesh, size=0.2, pad=0.05)
         >>> h.render()
 
-
-
     """
 
     def __init__(
@@ -550,6 +548,9 @@ class SizedMesh(MeshBase):
                         render_colors.append(c)
                     self.cmap = ListedColormap(render_colors)
                     self.color2d = encode_numeric(color, encoder)
+                    if self.norm is None:
+                        vs = encoder.values()
+                        self.norm = Normalize(vmin=min(vs), vmax=max(vs))
                 else:
                     self._process_cmap(color, vmin, vmax, cmap, norm, center)
                     self.color2d = color
@@ -636,9 +637,8 @@ class SizedMesh(MeshBase):
             linewidths=self.linewidth,
             marker=self.marker,
         )
-
         if self.color is not None:
-            options["c"] = self.color
+            options["c"] = color
         else:
             options.update(dict(c=color, norm=self.norm, cmap=self.cmap))
         self._collections = ax.scatter(xv, yv, **options, **self.kwargs)

{marsilea-0.5.2.dist-info → marsilea-0.5.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: marsilea
-Version: 0.5.2
+Version: 0.5.4
 Summary: Declarative creation of composable visualizations
 Project-URL: Home, https://github.com/Marsilea-viz/marsilea
 Project-URL: Documentation, https://marsilea.readthedocs.io

{marsilea-0.5.2.dist-info → marsilea-0.5.4.dist-info}/RECORD

@@ -1,4 +1,4 @@
-marsilea/__init__.py,sha256=0fpp21uDy2gLto0wOvlbShNTZS-1M9twBFuFumSwwlw,595
+marsilea/__init__.py,sha256=Ml3xgdyN-IinhsaejVadUjIURHJzg8fhi2Y_uERAuI8,595
 marsilea/_api.py,sha256=tymWZHfjhx8-0NNd9762znfdIu36NrARRweEIr5L1mA,283
 marsilea/_deform.py,sha256=QRz4OGXMsQzbiIkC3ASzZayMPhHhoFsEK38oBzSeQG8,14440
 marsilea/base.py,sha256=CmzuwFu0JzgkNpPdI1SqAnkUxINShjT73hrJpksKjhE,46872
@@ -6,7 +6,7 @@ marsilea/dataset.py,sha256=Qh8k1DhTiwP_Me709CkpNwRaYLDzlenRTIk0U6D58_g,4631
 marsilea/dendrogram.py,sha256=Ung43zseybZKzTEvH5P_ge3WGfsr7i7qsX7YEVDlC74,15590
 marsilea/exceptions.py,sha256=wN5ElUZxuaJKSnnwWdkNx6P-Oc16dzSuaRPbRKWIBEM,1046
 marsilea/heatmap.py,sha256=8Wo1NxFTBp1a7NOISmer0yQYWWgf51Xsvjav1h1vTYk,4316
-marsilea/layers.py,sha256=puXLlGGpEqAzaTqadpgpsYmIDPH33WyyHIuysRSqFZQ,12163
+marsilea/layers.py,sha256=w_yvghwYAO112mVvp1krjUjEIQYq_1nz2uCsTUJdB-Y,12909
 marsilea/layout.py,sha256=yNuGvIDfWjbCksQZO-4aUWSA78LJwBBKF5Z5cthC6fM,39741
 marsilea/upset.py,sha256=9m4Los-yVvVZOEHg6X-yfOdLA9eUBQdK1A_BkOaLIMA,30602
 marsilea/utils.py,sha256=y_KYs4ToiuKEsiBdmcIVtmxMXFpD4wKiJ0k7iBa11z8,2854
@@ -19,13 +19,13 @@ marsilea/plotter/bar.py,sha256=RWDsNbyCUKbybpsBOgbl43lVZc_ynZmTOevE-CtJ5KE,12354
 marsilea/plotter/base.py,sha256=b_NmrW_oNPc-HwQsjx1NsC2lknYK6qSaDp_7SxeoUEM,18938
 marsilea/plotter/bio.py,sha256=34tucmxs4LM3TFZoGsrjnXTolyrzYaHVEiRe4dzDH68,5040
 marsilea/plotter/images.py,sha256=gb0xIQhUch3rNAt3FfvuUoamSGEynoBBBky2eE754ec,9560
-marsilea/plotter/mesh.py,sha256=4jTa05GQsxStDur6FkrNGXAIHUsoipFEDydP8CMCExE,24376
+marsilea/plotter/mesh.py,sha256=D6snenMjQ-rM9g3O4PGelSiaBNKmY2OPZU5onILlmO0,24530
 marsilea/plotter/range.py,sha256=sXWKrvpq7nU7giiHPjayM7h9Q7gblhjXxHm8ioB3cm4,3770
 marsilea/plotter/text.py,sha256=6S4mnAxLJLMkduKiyor03lPd86oTOJ5TojVREA9oU6s,37466
 oncoprinter/__init__.py,sha256=efshcAD1h9s-NVJj4HLU9-hXc_LtTeIrNYqLHl-sm_g,106
 oncoprinter/core.py,sha256=5KPnKW5ivlxPp14uJd0OtfTv-pXV2UEym8EbII2VCcw,11846
 oncoprinter/preset.py,sha256=mBk2tFCqoTj_1ZZKRYuv4j2I3NTBa6Swc9wjzbmxRVw,8238
-marsilea-0.5.2.dist-info/METADATA,sha256=ItfPnIgJLjJRHgNax36iPM48Wwb7DHUvg-P-UZkyMS8,7265
-marsilea-0.5.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-marsilea-0.5.2.dist-info/licenses/LICENSE,sha256=RhHHDuP61qzKmfHtOQUVLZfCgMkKx9PXzxzkLtmAjHo,1078
-marsilea-0.5.2.dist-info/RECORD,,
+marsilea-0.5.4.dist-info/METADATA,sha256=9SS9_JT6N9FRdBenz-95mnzFY5LVal4lhMocoyvcUsA,7265
+marsilea-0.5.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+marsilea-0.5.4.dist-info/licenses/LICENSE,sha256=RhHHDuP61qzKmfHtOQUVLZfCgMkKx9PXzxzkLtmAjHo,1078
+marsilea-0.5.4.dist-info/RECORD,,