babelplot 2025.5__tar.gz → 2025.7__tar.gz

{babelplot-2025.5 → babelplot-2025.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: babelplot
-Version: 2025.5
+Version: 2025.7
 Summary: A Meta Plotting Library That Speaks Several Backends
 Home-page: https://src.koda.cnrs.fr/eric.debreuve/babelplot/
 Author: Eric Debreuve

{babelplot-2025.5 → babelplot-2025.7}/package/babelplot/__init__.py

@@ -18,9 +18,9 @@ else:
         beartype_this_package()
 
 from babelplot.task.instantiation import NewFigure, NewPlot
+from babelplot.task.showing import ShowAllFigures
 from babelplot.type.dimension import dim_e
-from babelplot.type.figure import ShowAllFigures
-from babelplot.type.plot_definition import plot_e
+from babelplot.type.plot_type import plot_e
 from babelplot.version import __version__
 
 """

{babelplot-2025.5 → babelplot-2025.7}/package/babelplot/api/definition.py

@@ -5,7 +5,7 @@ SEE COPYRIGHT NOTICE BELOW
 """
 
 from babelplot.type.dimension import dim_e  # noqa
-from babelplot.type.plot_definition import plot_e  # noqa
+from babelplot.type.plot_type import plot_e  # noqa
 
 """
 COPYRIGHT NOTICE

{babelplot-2025.5 → babelplot-2025.7}/package/babelplot/api/help.py

@@ -4,7 +4,7 @@ Contributor(s): Eric Debreuve (eric.debreuve@cnrs.fr) since 2022
 SEE COPYRIGHT NOTICE BELOW
 """
 
-from babelplot.task.help import Main as PrintHelp  # noqa
+from babelplot.task.help import PrintHelp  # noqa
 from babelplot.task.help import PrintUsage  # noqa
 
 """

{babelplot-2025.5 → babelplot-2025.7}/package/babelplot/backend/catalog/bokeh_.py

@@ -7,12 +7,12 @@ SEE COPYRIGHT NOTICE BELOW
 import dataclasses as d
 import typing as h
 
-from babelplot.task.show_pyqt6 import Show
+from babelplot.task.showing import ShowHTMLWithPyQt
 from babelplot.type.dimension import dim_e
 from babelplot.type.figure import figure_t as base_figure_t
 from babelplot.type.frame import frame_t as base_frame_t
 from babelplot.type.plot import plot_t as base_plot_t
-from babelplot.type.plot_definition import PlotsFromTemplate, plot_e, plot_type_h
+from babelplot.type.plot_type import plot_e, plot_function_h
 from bokeh.embed import file_html as HTMLofBackendContent  # noqa
 from bokeh.layouts import column as NewBackendColLayout  # noqa
 from bokeh.layouts import grid as NewBackendGridLayout  # noqa
@@ -38,10 +38,7 @@ class frame_t(base_frame_t):
 
     def _NewPlot(
         self,
-        type_: plot_type_h | type[backend_plot_t],
-        plot_function: (
-            type[backend_plot_t] | h.Callable[..., backend_plot_t | h.Any] | None
-        ),
+        plot_function: plot_function_h,
         *args,
         title: str | None = None,  # If _, then it is swallowed by kwargs!
         **kwargs,
@@ -53,13 +50,6 @@ class frame_t(base_frame_t):
             backend_name=self.backend_name,
         )
 
-        if plot_function is None:
-            if hasattr(backend_frame_t, type_):
-                plot_function = getattr(backend_frame_t, type_)
-            else:
-                raise ValueError(f"{type_}: Unknown {NAME} graph object.")
-
-        output.backend_type = plot_function
         output.raw = plot_function(self.raw, *args, **kwargs)
 
         return output
@@ -69,8 +59,11 @@ class frame_t(base_frame_t):
 class figure_t(base_figure_t):
     layout: h.Any = None
 
-    _NewBackendFigure = backend_figure_t
-    _BackendShow = Show
+    _BackendShow = ShowHTMLWithPyQt
+
+    def _NewBackendFigure(self, *args, **kwargs) -> backend_figure_t:
+        """"""
+        return backend_figure_t(*args, **kwargs)
 
     def _NewFrame(
         self,
@@ -78,7 +71,7 @@ class figure_t(base_figure_t):
         col: int,
         *args,
         title: str | None = None,
-        dim: dim_e = dim_e.XY,  # If _, then it is swallowed by kwargs!
+        dim: dim_e = dim_e.XY,
         **kwargs,
     ) -> frame_t:
         """"""
@@ -116,7 +109,7 @@ class figure_t(base_figure_t):
         return HTMLofBackendContent(self.layout, INLINE)
 
 
-PLOTS = PlotsFromTemplate()
+PLOTS = plot_e.NewPlotsTemplate()
 PLOTS[plot_e.SCATTER][1] = backend_frame_t.scatter
 
 

{babelplot-2025.5 → babelplot-2025.7}/package/babelplot/backend/catalog/matplotlib_.py

@@ -10,12 +10,12 @@ import typing as h
 import matplotlib.pyplot as pypl  # noqa
 import numpy as nmpy
 import skimage.measure as msre
-from babelplot.type.base import backend_element_h
 from babelplot.type.dimension import dim_e
+from babelplot.type.ffp_base import backend_element_h
 from babelplot.type.figure import figure_t as base_figure_t
 from babelplot.type.frame import frame_t as base_frame_t
 from babelplot.type.plot import plot_t as base_plot_t
-from babelplot.type.plot_definition import PlotsFromTemplate, plot_e, plot_type_h
+from babelplot.type.plot_type import plot_e, plot_function_h, plot_type_h
 from logger_36 import L
 from matplotlib.artist import Artist as backend_plot_t  # noqa
 from matplotlib.container import Container as backend_plots_t  # noqa
@@ -36,7 +36,7 @@ array_t = nmpy.ndarray
 backend_frame_h = backend_frame_2d_t | backend_frame_3d_t
 
 
-def _DefaultProperties(type_: h.Callable, /) -> dict[str, h.Any]:
+def _DefaultProperties(type_: type[plot_type_h], /) -> dict[str, h.Any]:
     """"""
     name = type_.__name__
     properties = mlpl.rcParams.find_all(f"^{name}\\.")
@@ -102,10 +102,7 @@ class frame_t(base_frame_t):
 
     def _NewPlot(
         self,
-        type_: plot_type_h | type[backend_plot_t],
-        plot_function: (
-            type[backend_plot_t] | h.Callable[..., backend_plot_t | h.Any] | None
-        ),
+        plot_function: plot_function_h,
         *args,
         title: str | None = None,  # /!\ If _, then it is swallowed by kwargs!
         **kwargs,
@@ -117,18 +114,6 @@ class frame_t(base_frame_t):
             backend_name=self.backend_name,
         )
 
-        if plot_function is None:
-            # Next, priority is given to 2-D plots... which might be a problem if a 2-D and
-            # 3-D frame have plot types with the same name. For example, scatter in 2-D and
-            # 3-D.
-            if hasattr(backend_frame_2d_t, type_):
-                plot_function = getattr(backend_frame_2d_t, type_)
-            elif hasattr(backend_frame_3d_t, type_):
-                plot_function = getattr(backend_frame_3d_t, type_)
-            else:
-                raise ValueError(f"{type_}: Unknown {NAME} graph object.")
-
-        output.backend_type = plot_function
         output.raw = plot_function(self.raw, *args, **kwargs)
 
         return output
@@ -139,10 +124,13 @@ class figure_t(base_figure_t):
     _BackendSetProperty: h.ClassVar[h.Callable] = _SetProperty
     _BackendProperty: h.ClassVar[h.Callable] = _Property
 
-    @staticmethod
-    def _NewBackendFigure(*args, **kwargs) -> backend_figure_t:
+    def _NewBackendFigure(self, *args, **kwargs) -> backend_figure_t:
         """"""
-        return NewBackendFigure(*args, num=None, **kwargs)
+        output = NewBackendFigure(*args, num=None, **kwargs)
+
+        output.canvas.mpl_connect("close_event", lambda *_, **__: _OnCloseEvent(self))
+
+        return output
 
     def _NewFrame(
         self,
@@ -169,9 +157,7 @@ class figure_t(base_figure_t):
             )
             self.raw.add_axes(raw)
         else:
-            raise NotImplementedError(
-                f"{dim}: Dimension management not implemented yet"
-            )
+            raise NotImplementedError(f"Frame dimension {dim} not implemented.")
         if title is not None:
             raw.set_title(title)
 
@@ -181,22 +167,31 @@ class figure_t(base_figure_t):
 
     def AdjustLayout(self) -> None:
         """"""
-        raw = self.raw
+        figure_raw = self.raw
 
         if self.title is not None:
-            raw.suptitle(self.title)
+            figure_raw.suptitle(self.title)
         for frame in self.frames:
             if frame.title is not None:
                 frame.raw.set_title(frame.title)
             for plot in frame.plots:
                 if plot.title is not None:
-                    plot.raw.set_label(plot.title)
+                    plot_raw = plot.raw
+                    if isinstance(plot_raw, h.Sequence):
+                        plot_raw_s = plot_raw
+                    else:
+                        plot_raw_s = (plot_raw,)
+                    for plot_raw in plot_raw_s:
+                        if (
+                            SetLabel := getattr(plot_raw, "set_label", None)
+                        ) is not None:
+                            SetLabel(plot.title)
 
         if self.frames.__len__() < 2:
             return
 
-        grid_spec = grid_spec_t(*self.shape, figure=raw)
-        bottoms, tops, lefts, rights = grid_spec.get_grid_positions(raw)
+        grid_spec = grid_spec_t(*self.shape, figure=figure_raw)
+        bottoms, tops, lefts, rights = grid_spec.get_grid_positions(figure_raw)
 
         for frame, (row, col) in zip(self.frames, self.locations):
             left, bottom, width, height = (
@@ -207,27 +202,27 @@ class figure_t(base_figure_t):
             )
             frame.raw.set_position((left, bottom, width, height))
 
-    def _BackendShow(self) -> None:
+    def _BackendShow(self, modal: bool, /) -> None:
         """"""
         raw = self.raw
-
         raw.show()
 
-        event_manager = raw.canvas
-        event_manager.mpl_connect(
-            "close_event", lambda _: event_manager.stop_event_loop()
-        )
-        event_manager.start_event_loop()
+        if modal:
+            title = raw.get_suptitle()
+            if title.__len__() > 0:
+                title = f"{title} [MASTER FIGURE]"
+            else:
+                title = "MASTER FIGURE"
+            raw.suptitle(title)
 
+            raw.canvas.start_event_loop()
 
-def _Polygon(
-    frame: backend_frame_2d_t, xs: array_t, ys: array_t, *_, **kwargs
-) -> polygon_t:
-    """"""
-    output = polygon_t(nmpy.vstack((xs, ys)).T, **kwargs)
-    frame.add_patch(output)
 
-    return output
+def _OnCloseEvent(figure: figure_t, /) -> None:
+    """"""
+    # Hopefully, the event loop does not mind being stopped several times.
+    figure.raw.canvas.stop_event_loop()
+    figure.AcknowledgeClosure()
 
 
 def _Arrows2(frame: backend_frame_2d_t, *args, **kwargs) -> backend_plot_t:
@@ -276,6 +271,54 @@ def _Arrows3(frame: backend_frame_3d_t, *args, **kwargs) -> backend_plot_t:
     return frame.quiver(x, y, z, u, v, w, **kwargs)
 
 
+def _Bar3(frame: backend_frame_2d_t, *args, **kwargs) -> backend_plot_t:
+    """"""
+    if args.__len__() == 1:
+        counts = nmpy.asarray(args[0])
+        x, y = counts.shape
+    else:
+        x, y, counts = args
+        counts = nmpy.asarray(counts)
+    if isinstance(x, int):
+        x, y = nmpy.meshgrid(range(x), range(y), indexing="ij")
+    if counts.ndim == 1:
+        x = x.ravel()
+        y = y.ravel()
+
+    width = kwargs.get("width", 0.8)
+    depth = kwargs.get("depth", 0.8)
+    offset = kwargs.get("offset", 0.0)
+    kwargs = {
+        _key: _vle
+        for _key, _vle in kwargs.items()
+        if _key not in ("width", "depth", "offset")
+    }
+
+    return frame.bar3d(x, y, offset, width, depth, counts, **kwargs)
+
+
+def _BarH(frame: backend_frame_2d_t, *args, **kwargs) -> backend_plots_t:
+    """"""
+    if args.__len__() == 1:
+        counts = args[0]
+        positions = range(counts.__len__())
+    else:
+        positions, counts = args
+
+    return frame.barh(positions, counts, **kwargs)
+
+
+def _BarV(frame: backend_frame_2d_t, *args, **kwargs) -> backend_plots_t:
+    """"""
+    if args.__len__() == 1:
+        counts = args[0]
+        positions = range(counts.__len__())
+    else:
+        positions, counts = args
+
+    return frame.bar(positions, counts, **kwargs)
+
+
 def _ElevationSurface(frame: backend_frame_2d_t, *args, **kwargs) -> backend_plot_t:
     """"""
     if args.__len__() == 1:
@@ -327,52 +370,14 @@ def _Mesh(
     )
 
 
-def _BarH(frame: backend_frame_2d_t, *args, **kwargs) -> backend_plots_t:
-    """"""
-    if args.__len__() == 1:
-        counts = args[0]
-        positions = range(counts.__len__())
-    else:
-        positions, counts = args
-
-    return frame.barh(positions, counts, **kwargs)
-
-
-def _BarV(frame: backend_frame_2d_t, *args, **kwargs) -> backend_plots_t:
-    """"""
-    if args.__len__() == 1:
-        counts = args[0]
-        positions = range(counts.__len__())
-    else:
-        positions, counts = args
-
-    return frame.bar(positions, counts, **kwargs)
-
-
-def _Bar3(frame: backend_frame_2d_t, *args, **kwargs) -> backend_plot_t:
+def _Polygon(
+    frame: backend_frame_2d_t, xs: array_t, ys: array_t, *_, **kwargs
+) -> polygon_t:
     """"""
-    if args.__len__() == 1:
-        counts = nmpy.asarray(args[0])
-        x, y = counts.shape
-    else:
-        x, y, counts = args
-        counts = nmpy.asarray(counts)
-    if isinstance(x, int):
-        x, y = nmpy.meshgrid(range(x), range(y), indexing="ij")
-    if counts.ndim == 1:
-        x = x.ravel()
-        y = y.ravel()
-
-    width = kwargs.get("width", 0.8)
-    depth = kwargs.get("depth", 0.8)
-    offset = kwargs.get("offset", 0.0)
-    kwargs = {
-        _key: _vle
-        for _key, _vle in kwargs.items()
-        if _key not in ("width", "depth", "offset")
-    }
+    output = polygon_t(nmpy.vstack((xs, ys)).T, **kwargs)
+    frame.add_patch(output)
 
-    return frame.bar3d(x, y, offset, width, depth, counts, **kwargs)
+    return output
 
 
 def _Text2(frame: backend_frame_2d_t, text, x, y, *_, **kwargs) -> backend_plot_t:
@@ -385,26 +390,25 @@ def _Text3(frame: backend_frame_2d_t, text, x, y, z, *_, **kwargs) -> backend_pl
     return frame.text(x, y, z, text, **kwargs)
 
 
-PLOTS = PlotsFromTemplate()
+PLOTS = plot_e.NewPlotsTemplate()
 
-PLOTS[plot_e.SCATTER][1] = backend_frame_2d_t.scatter
-PLOTS[plot_e.POLYLINE][1] = backend_frame_2d_t.plot
-PLOTS[plot_e.POLYGON][1] = _Polygon
 PLOTS[plot_e.ARROWS][1] = _Arrows2
-PLOTS[plot_e.ISOSET][1] = _IsoContour
+PLOTS[plot_e.ARROWS][2] = _Arrows3
+PLOTS[plot_e.BAR3][2] = _Bar3
 PLOTS[plot_e.BARH][1] = _BarH
 PLOTS[plot_e.BARV][1] = _BarV
-PLOTS[plot_e.PIE][1] = backend_frame_2d_t.pie
-PLOTS[plot_e.IMAGE][1] = backend_frame_2d_t.matshow
-PLOTS[plot_e.TEXT][1] = _Text2
-
-PLOTS[plot_e.SCATTER][2] = backend_frame_3d_t.scatter
-PLOTS[plot_e.POLYLINE][2] = backend_frame_3d_t.plot
-PLOTS[plot_e.ARROWS][2] = _Arrows3
 PLOTS[plot_e.ELEVATION][2] = _ElevationSurface
+PLOTS[plot_e.IMAGE][1] = backend_frame_2d_t.matshow
+PLOTS[plot_e.ISOSET][1] = _IsoContour
 PLOTS[plot_e.ISOSET][2] = _IsoSurface
 PLOTS[plot_e.MESH][2] = _Mesh
-PLOTS[plot_e.BAR3][2] = _Bar3
+PLOTS[plot_e.PIE][1] = backend_frame_2d_t.pie
+PLOTS[plot_e.POLYGON][1] = _Polygon
+PLOTS[plot_e.POLYLINE][1] = backend_frame_2d_t.plot
+PLOTS[plot_e.POLYLINE][2] = backend_frame_3d_t.plot
+PLOTS[plot_e.SCATTER][1] = backend_frame_2d_t.scatter
+PLOTS[plot_e.SCATTER][2] = backend_frame_3d_t.scatter
+PLOTS[plot_e.TEXT][1] = _Text2
 PLOTS[plot_e.TEXT][2] = _Text3
 
 
@@ -415,7 +419,9 @@ TRANSLATIONS = {
     "color_max": "vmax",
     "color_min": "vmin",
     "color_scaling": "norm",
+    "colormap": "cmap",
     "depth_shade": "depthshade",
+    "opacity": "alpha",
     "plot_non_finite": "plotnonfinite",
     "size": "s",
     "width_edge": "linewidths",