plotlp 0.1.18__tar.gz → 0.1.19__tar.gz

{plotlp-0.1.18 → plotlp-0.1.19}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: plotlp
-Version: 0.1.18
+Version: 0.1.19
 Summary: A library wrapper around matplotlib for custom plots.
 Requires-Dist: corelp
 Requires-Dist: cycler

{plotlp-0.1.18 → plotlp-0.1.19}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "plotlp"
-version = "0.1.18"
+version = "0.1.19"
 description = "A library wrapper around matplotlib for custom plots."
 readme = "README.md"
 requires-python = ">=3.12"

{plotlp-0.1.18 → plotlp-0.1.19}/src/plotlp/modules/StyledAxes_LP/StyledAxes.py

@@ -133,6 +133,7 @@ class StyledAxes(Axes) :
         if self.polish_imscale : self.imscale()
         if self.polish_noborders : self.noborders()
         if self.polish_equiscale : self.equiscale()
+        if self.polish_figscale : self.figscale()
 
     # grids
     @prop()
@@ -179,6 +180,28 @@ class StyledAxes(Axes) :
         with plt.style.context(self.style) :
             self.set_aspect(aspect='equal', adjustable='box')
     
+    # figscale
+    @prop()
+    def polish_figscale(self) :
+        return self.figure.naxes == 1 and not self.polish_imscale and self.polish_equiscale
+    def figscale(self) :
+        with plt.style.context(self.style) :
+            ratio = self.figure.figsize_ratio
+            xmin, xmax = self.get_xlim()
+            ymin, ymax = self.get_ylim()
+            dx, dy = xmax - xmin, ymax - ymin
+            x, y = (xmax + xmin) / 2, (ymax + ymin) / 2
+            if dx / dy != ratio :
+                _dx, _dy = ratio * dy, dx / ratio
+                dx = _dx if _dx > dx else dx
+                dy = _dy if _dy > dy else dy
+            xmin, xmax = x - dx/2, x + dx/2
+            ymin, ymax = y - dy/2, y + dy/2
+            if self.get_autoscalex_on() :
+                self.set_xlim(xmin, xmax)
+            if self.get_autoscaley_on() :
+                self.set_ylim(ymin, ymax)
+    
 
 
 ### --- Regenerate parent class methods in the given style ---
@@ -189,7 +212,7 @@ def is_plottable(method_name, method_obj):
     """
     Returns True if this method should be wrapped automatically.
     """
-    if hasattr(StyledAxes, method_name): # Already overriden
+    if method_name in StyledAxes.__dict__ : # Already overriden
         return False
     if method_name.startswith("_"):      # private
         return False                # handled separately

{plotlp-0.1.18 → plotlp-0.1.19}/src/plotlp/modules/StyledFigure_LP/StyledFigure.py

@@ -156,10 +156,15 @@ class StyledFigure(Figure) :
 
 
 
+    # Merging and splitting
     @property
     def merge(self):
         return _MergeIndexer(self)
 
+    @property
+    def split(self):
+        return _SplitIndexer(self)
+
     def _normalize_indices(self, idx, size):
         if isinstance(idx, slice):
             return list(range(*idx.indices(size)))
@@ -198,6 +203,17 @@ class StyledFigure(Figure) :
 
         return new_ax
 
+    def _split_axis(self, row, col, height, width):
+
+        if not hasattr(self, "_axes_grid"):
+            raise RuntimeError("merge only works with fig.subplots()")
+
+        grid = self._axes_grid
+        axes_to_merge = [grid[i, j] for i in row for j in col]
+
+        # TODO
+
+        return None
 
 
     # Paper index
@@ -351,6 +367,22 @@ class _MergeIndexer:
 
 
 
+class _SplitIndexer:
+
+    def __init__(self, fig):
+        self.fig = fig
+
+    def __getitem__(self, key):
+
+        if not isinstance(key, tuple):
+            raise KeyError(f'Splitting figure axis should only be done with two coordinates, not {key}')
+
+        r, c, h, w = key
+
+        return self.fig._split_axis(r, c, h, w)
+
+
+
 # %% Test function run
 if __name__ == "__main__":
     from corelp import test

{plotlp-0.1.18 → plotlp-0.1.19}/src/plotlp/modules/figure_LP/test_figure.py

@@ -31,12 +31,14 @@ def test_plot() :
     y = x**2
     fig = figure(figsize_fact=(0.5,0.5), darkmode=True)
     fig.axis.plot(x, -y)
+    fig.axis.scatter(x, -y)
     plt.plot(x, y)
+    plt.scatter(x, y)
     plt.xlabel('x [ua]')
     fig.axis.set_ylabel('y [ua]')
     fig.title = 'test title'
-    plt.savefig(path_png = debug_folder / 'plot_png', close=False)
-    plt.savefig(path_pdf = debug_folder / 'plot_pdf', close=False)
+    fig.savefig(path_png = debug_folder / 'plot_png', close=False)
+    fig.savefig(path_pdf = debug_folder / 'plot_pdf', close=False)
     plt.savefig(debug_folder / 'plot_all')
 
 def test_imshow() :
@@ -50,8 +52,8 @@ def test_imshow() :
     fig = figure(figsize_ratio=4/3)
     fig.axis.imshow(img, barname='intensity')
     fig.title = 'test title'
-    plt.savefig(path_png = debug_folder / 'imshow_png', close=False)
-    plt.savefig(path_pdf = debug_folder / 'imshow_pdf', close=False)
+    fig.savefig(path_png = debug_folder / 'imshow_png', close=False)
+    fig.savefig(path_pdf = debug_folder / 'imshow_pdf', close=False)
     plt.savefig(debug_folder / 'imshow_all')