maxplotlibx 0.1.2__tar.gz → 0.1.4__tar.gz

{maxplotlibx-0.1.2 → maxplotlibx-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maxplotlibx
-Version: 0.1.2
+Version: 0.1.4
 Summary: A reproducible plotting module with various backends and export options.
 Author: Max
 Project-URL: Source, https://github.com/max-models/maxplotlib
@@ -12,7 +12,7 @@ License-File: LICENSE
 Requires-Dist: matplotlib
 Requires-Dist: pint
 Requires-Dist: plotly
-Requires-Dist: tikzpics>=0.1.1
+Requires-Dist: tikzfigure[vis]>=0.2.0
 Provides-Extra: test
 Requires-Dist: pytest; extra == "test"
 Requires-Dist: coverage; extra == "test"
@@ -26,7 +26,7 @@ Requires-Dist: nbconvert; extra == "docs"
 Provides-Extra: dev
 Requires-Dist: maxplotlibx[docs,test]; extra == "dev"
 Requires-Dist: ruff; extra == "dev"
-Requires-Dist: black; extra == "dev"
+Requires-Dist: black[jupyter]; extra == "dev"
 Requires-Dist: isort; extra == "dev"
 Requires-Dist: jupyterlab; extra == "dev"
 Requires-Dist: nbstripout; extra == "dev"

{maxplotlibx-0.1.2 → maxplotlibx-0.1.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maxplotlibx"
-version = "0.1.2"
+version = "0.1.4"
 description = "A reproducible plotting module with various backends and export options."
 readme = "README.md"
 requires-python = ">=3.8"
@@ -18,7 +18,7 @@ dependencies = [
     "matplotlib",
     "pint",
     "plotly",
-    "tikzpics>=0.1.1",
+    "tikzfigure[vis]>=0.2.0",
 ]
 [project.optional-dependencies]
 test = [
@@ -36,7 +36,7 @@ docs = [
 dev = [
     "maxplotlibx[test,docs]",
     "ruff",
-    "black",
+    "black[jupyter]",
     "isort",
     "jupyterlab",
     "nbstripout",
@@ -56,4 +56,4 @@ line-length = 88
 line-length = 88
 
 [tool.isort]
-profile = "black"
+profile = "black"

{maxplotlibx-0.1.2 → maxplotlibx-0.1.4}/src/maxplotlib/backends/matplotlib/utils.py

@@ -56,18 +56,30 @@ def convert_to_inches(length_str):
     return quantity.to("inch").magnitude  # Convert to inches
 
 
-def _2pt(width, dpi=300):
+def _2pt(width, dpi=300, verbose: bool = False):
+    if verbose:
+        print(f"Converting width: {width} to points with dpi={dpi}")
+
     if isinstance(width, (int, float)):
         return width
     elif isinstance(width, str):
         length_in = convert_to_inches(width)
         length_pt = length_in * dpi
+        if verbose:
+            print(f"Converted length: {length_in} inches = {length_pt} points")
         return length_pt
     else:
         raise NotImplementedError
 
 
-def set_size(width, fraction=1, ratio="golden", dpi=300):
+# TODO: Use literal types for width and ratio
+def set_size(
+    width: str,
+    fraction: int | float = 1,
+    ratio: str | int | float = "golden",
+    dpi=300,
+    verbose: bool = False,
+) -> tuple:
     """
     Sets figure dimensions to avoid scaling in LaTeX.
     """
@@ -76,9 +88,11 @@ def set_size(width, fraction=1, ratio="golden", dpi=300):
     elif width == "beamer":
         width_pt = 307.28987
     else:
-        width_pt = _2pt(width=width, dpi=dpi)
+        width_pt = _2pt(width=width, dpi=dpi, verbose=verbose)
 
     fig_width_pt = width_pt * fraction
+    inches_per_pt = 1 / 72.27
+    # fig_width_pt = width_pt * fraction
     # inches_per_pt = 1 / 72.27
 
     # Calculate the figure height based on the desired ratio
@@ -91,7 +105,11 @@ def set_size(width, fraction=1, ratio="golden", dpi=300):
         fig_height_pt = fig_width_pt * ratio
     else:
         raise ValueError("Invalid ratio specified.")
-    fig_dim = (fig_width_pt, fig_height_pt)
+
+    # Convert from points to inches for matplotlib
+    fig_width_in = fig_width_pt * inches_per_pt
+    fig_height_in = fig_height_pt * inches_per_pt
+    fig_dim = (fig_width_in, fig_height_in)
     return fig_dim