kaxe 1.5.0.dev1__tar.gz → 1.5.0.dev3__tar.gz

{kaxe-1.5.0.dev1/src/kaxe.egg-info → kaxe-1.5.0.dev3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kaxe
-Version: 1.5.0.dev1
+Version: 1.5.0.dev3
 Summary: A small graphing tool for functions, points, equations and more
 Author-email: Valter Yde Daugberg <valteryde@hotmail.com>
 Project-URL: Homepage, https://github.com/valteryde/kaxe
@@ -11,20 +11,19 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: numpy
 Requires-Dist: pillow
 Requires-Dist: fondi>=0.2.0
-Requires-Dist: sympy
-Requires-Dist: scipy
 Requires-Dist: openpyxl
 Requires-Dist: tqdm
-Requires-Dist: numba
-Requires-Dist: python-dotenv
-Requires-Dist: pyopengl
-Requires-Dist: PySDL2
-Requires-Dist: pysdl2-dll
-Requires-Dist: numpy-stl
-Requires-Dist: psutil
-Requires-Dist: opencv-python-headless
+Provides-Extra: core
+Provides-Extra: 3d
+Requires-Dist: scipy; extra == "3d"
+Requires-Dist: pyopengl; extra == "3d"
+Requires-Dist: PySDL2; extra == "3d"
+Requires-Dist: pysdl2-dll; extra == "3d"
+Requires-Dist: numpy-stl; extra == "3d"
+Requires-Dist: psutil; extra == "3d"
 Provides-Extra: pdf
 Requires-Dist: reportlab>=4.0; extra == "pdf"
 Requires-Dist: fonttools>=4.0; extra == "pdf"
@@ -39,6 +38,15 @@ Kaxe is a lightweight, pure-Python plotting library for publication-quality figu
 
 Documentation: [kaxe.readthedocs.io](https://kaxe.readthedocs.io/en/latest/)
 
+## Installation
+
+```bash
+pip install kaxe          # 2D plotting (default)
+pip install kaxe[3d]        # add 3D plotting (OpenGL)
+pip install kaxe[pdf]       # add PDF export
+pip install kaxe[3d,pdf]    # 3D + PDF
+```
+
 ## Quick example
 
 ```python

{kaxe-1.5.0.dev1 → kaxe-1.5.0.dev3}/README.md

@@ -7,6 +7,15 @@ Kaxe is a lightweight, pure-Python plotting library for publication-quality figu
 
 Documentation: [kaxe.readthedocs.io](https://kaxe.readthedocs.io/en/latest/)
 
+## Installation
+
+```bash
+pip install kaxe          # 2D plotting (default)
+pip install kaxe[3d]        # add 3D plotting (OpenGL)
+pip install kaxe[pdf]       # add PDF export
+pip install kaxe[3d,pdf]    # 3D + PDF
+```
+
 ## Quick example
 
 ```python

{kaxe-1.5.0.dev1 → kaxe-1.5.0.dev3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kaxe"
-version = "1.5.0.dev1"
+version = "1.5.0.dev3"
 authors = [
   { name="Valter Yde Daugberg", email="valteryde@hotmail.com" },
 ]
@@ -13,23 +13,23 @@ classifiers = [
     "Operating System :: OS Independent",
 ]
 dependencies = [
+  "numpy",
   "pillow",
   "fondi>=0.2.0",
-  "sympy",
-  "scipy",
   "openpyxl",
   "tqdm",
-  "numba",
-  "python-dotenv",
+]
+
+[project.optional-dependencies]
+core = []
+3d = [
+  "scipy",
   "pyopengl",
   "PySDL2",
   "pysdl2-dll",
   "numpy-stl",
   "psutil",
-  "opencv-python-headless",
 ]
-
-[project.optional-dependencies]
 pdf = ["reportlab>=4.0", "fonttools>=4.0"]
 
 [project.urls]

kaxe-1.5.0.dev3/src/kaxe/_require_3d.py

@@ -0,0 +1,9 @@
+_MSG = "3D features require optional dependencies. Install with: pip install kaxe[3d]"
+
+
+def require_3d():
+    try:
+        import OpenGL  # noqa: F401
+        import sdl2  # noqa: F401
+    except ImportError as exc:
+        raise ImportError(_MSG) from exc

{kaxe-1.5.0.dev1 → kaxe-1.5.0.dev3}/src/kaxe/core/axis.py

@@ -115,13 +115,16 @@ class Axis(AttrObject):
         length = self.endNumber - self.startNumber
 
         numberOnAxisGoal = self.getAttr(self.numberOnAxisGoalReference)
-        if not numberOnAxisGoal: # default
-            numberOnAxisGoal = pixelLength // (3*self.getAttr('fontSize'))
-
-        if numberOnAxisGoal - 1 == 0:
-            numberOnAxisGoal = 2
+        explicit_goal = bool(numberOnAxisGoal)
+        if not numberOnAxisGoal:
+            numberOnAxisGoal = max(
+                4, pixelLength // (2 * self.getAttr('fontSize'))
+            )
 
-        acceptence = [numberOnAxisGoal-1, numberOnAxisGoal+1]
+        if explicit_goal and numberOnAxisGoal < 3:
+            acceptence = [numberOnAxisGoal - 1, numberOnAxisGoal + 1]
+        else:
+            acceptence = [max(3, numberOnAxisGoal - 1), numberOnAxisGoal + 1]
 
         MARKERSTEP = [2, 5, 10]
         
@@ -158,8 +161,17 @@ class Axis(AttrObject):
                 continue
 
             break
-        
-        lengthOverStep = round(lengthOverStep)
+
+        if not explicit_goal or numberOnAxisGoal >= 3:
+            min_intervals = 3
+            refine_c = c
+            while round(length / step) < min_intervals and refine_c > 0:
+                refine_c -= 1
+                step = MARKERSTEP[refine_c % len(MARKERSTEP)] * 10 ** (
+                    refine_c // len(MARKERSTEP)
+                )
+
+        lengthOverStep = round(length / step)
 
         # is null in frame?
         nullX, nullY = self.get(0)

{kaxe-1.5.0.dev1 → kaxe-1.5.0.dev3}/src/kaxe/core/d3/openglrender.py

@@ -18,7 +18,6 @@ import sdl2.ext
 import sdl2.video
 import ctypes
 from ..fileloader import loadFile
-import cv2
 from ..profiler import Profiler
 from ..helper import to_numpy
 from .hud import ViewportHud
@@ -808,12 +807,12 @@ class OpenGLRender:
             if overlay_np.shape[1] > self.width or overlay_np.shape[0] > self.height:
                 overlay_np = overlay_np[:self.height, :self.width]
 
-        with self.profiler.measure("opencv_resize"):
+        with self.profiler.measure("overlay_resize"):
             if overlay_np.shape[1] != self.guiWidth or overlay_np.shape[0] != self.guiHeight:
-                overlay_np = cv2.resize(
-                    overlay_np,
-                    (self.guiWidth, self.guiHeight),
-                    interpolation=cv2.INTER_LINEAR,
+                overlay_np = np.asarray(
+                    Image.fromarray(overlay_np).resize(
+                        (self.guiWidth, self.guiHeight), Image.BILINEAR
+                    )
                 )
 
         return overlay_np

{kaxe-1.5.0.dev1 → kaxe-1.5.0.dev3}/src/kaxe/core/window.py

@@ -40,6 +40,37 @@ except:
 
 settings = {"removeInfo":False}
 
+def compute_adjust_styles(
+    procentWidth,
+    documentFontSize=0.25,
+    documentMarginProcent=1.5,
+    documentWidth=11.8,
+    imageSlimRatio=1,
+):
+    """Compute width, height, and fontSize for LaTeX page-fraction sizing."""
+    width = 4000 * procentWidth
+    height = width / (1 + procentWidth) * imageSlimRatio
+    fontSize = documentFontSize / (
+        procentWidth * (documentWidth - 2 * documentMarginProcent)
+    ) * width
+    return {
+        "width": int(width),
+        "height": int(height),
+        "fontSize": int(fontSize),
+        "outerPadding": (10, 10, 10, 10),
+    }
+
+
+def compute_axis_numbers(width_px, height_px, font_size, min_ticks=4):
+    """Target tick counts from pixel extent and font size (~2*fontSize per tick)."""
+    divisor = 2 * font_size
+    if divisor <= 0:
+        divisor = 1
+    x_numbers = max(min_ticks, int(width_px // divisor))
+    y_numbers = max(min_ticks, int(height_px // divisor))
+    return x_numbers, y_numbers
+
+
 def setSetting(**kwargs):
     """Set global Kaxe runtime settings.
 
@@ -169,7 +200,7 @@ class Window(AttrObject):
         """
         Adjust the following styles based on document size and document font size. i. e. match document font size with plot font size
 
-        Directly changed styles; fontSize, width, height, outerPadding
+        Directly changed styles; fontSize, width, height, outerPadding, xNumbers, yNumbers
 
         A lot of styles indirecitly relies on fontSize, width and height.
         
@@ -183,16 +214,21 @@ class Window(AttrObject):
 
         """
 
-        # Same ratio
-        # documentFontSize/documentWidth = fontSize/width
-        # fontSize = documentFontSize/documentWidth*width
-
-        width = 4000 * procentWidth
-        height = width / (1 + procentWidth) * imageSlimRatio
-
-        fontSize = documentFontSize/(procentWidth*(documentWidth-2*documentMarginProcent))*width
-        
-        self.style(width=int(width), height=int(height), fontSize=int(fontSize), outerPadding=(10,10,10,10))
+        styles = compute_adjust_styles(
+            procentWidth,
+            documentFontSize=documentFontSize,
+            documentMarginProcent=documentMarginProcent,
+            documentWidth=documentWidth,
+            imageSlimRatio=imageSlimRatio,
+        )
+        x_numbers, y_numbers = compute_axis_numbers(
+            styles["width"], styles["height"], styles["fontSize"]
+        )
+        self.style(
+            **styles,
+            xNumbers=x_numbers,
+            yNumbers=y_numbers,
+        )
 
 
     # paddings

{kaxe-1.5.0.dev1 → kaxe-1.5.0.dev3}/src/kaxe/objects/_lazy.py

@@ -12,6 +12,8 @@ _D3_EXPORTS = frozenset({
 
 def lazy_getattr(module_globals, name):
     if name in _D3_EXPORTS:
+        from .._require_3d import require_3d
+        require_3d()
         from . import d3 as _d3
         value = getattr(_d3, name)
         module_globals[name] = value

{kaxe-1.5.0.dev1 → kaxe-1.5.0.dev3}/src/kaxe/objects/d2/arrow.py

@@ -121,6 +121,8 @@ class Arrow:
         return np.cos(theta) * ortho1 + np.sin(theta) * ortho2
 
     def finalize3D(self, parent):
+        from ..._require_3d import require_3d
+        require_3d()
         from ...core.d3.objects import Triangle, Line3D
 
         pixel0 = parent.pixel(*self.p0)

{kaxe-1.5.0.dev1 → kaxe-1.5.0.dev3}/src/kaxe/objects/d2/equation.py

@@ -185,10 +185,12 @@ class Equation:
 
 
     def finalize(self, parent):
+        from ..._require_3d import require_3d
         from ...core.d3.translator import translate2DTo3DObjects, getEquivalent2DPlot, has3DReference
 
         # Translate to 3D plot
         if parent == identities.XYZPLOT:
+            require_3d()
             parent = getEquivalent2DPlot(parent)
         scale = getattr(parent, 'getVisualScale', lambda: 1.0)()
         self._effectiveWidth = max(1, int(self.width * scale))
@@ -201,6 +203,7 @@ class Equation:
 
         # Translate to 3D plot
         if has3DReference(parent):
+            require_3d()
             translate2DTo3DObjects(parent, self.batch)
 
         # algoritmen burde findes alle pixels hvor ligningen går op

{kaxe-1.5.0.dev1 → kaxe-1.5.0.dev3}/src/kaxe/objects/d2/function.py

@@ -220,6 +220,7 @@ class Function2D:
 
     def finalize(self, parent):
 
+        from ..._require_3d import require_3d
         from ...core.d3.translator import translate2DTo3DObjects, getEquivalent2DPlot, has3DReference
 
         self.lineSegments = [[]]
@@ -228,6 +229,7 @@ class Function2D:
 
         # translate xyz
         if parent == identities.XYZPLOT:
+            require_3d()
             parent = getEquivalent2DPlot(parent)
 
 
@@ -298,6 +300,7 @@ class Function2D:
 
         # translate fully to xyz
         if has3DReference(parent):
+            require_3d()
             translate2DTo3DObjects(parent, self.batch)
             # translate2DTo3DObjects(parent, self.fillbatch)
 

{kaxe-1.5.0.dev1 → kaxe-1.5.0.dev3}/src/kaxe/objects/d2/inequality.py

@@ -20,9 +20,10 @@ _OPS = {
 
 
 def _resolve_plot(parent):
-    from ...core.d3.translator import getEquivalent2DPlot
-
     if getattr(parent, 'identity', None) == identities.XYZPLOT:
+        from ..._require_3d import require_3d
+        require_3d()
+        from ...core.d3.translator import getEquivalent2DPlot
         return getEquivalent2DPlot(parent)
     return parent
 
@@ -187,6 +188,7 @@ class Inequality:
         )
 
     def finalize(self, parent):
+        from ..._require_3d import require_3d
         from ...core.d3.translator import translate2DTo3DObjects, has3DReference
 
         plot = _resolve_plot(parent)
@@ -194,6 +196,7 @@ class Inequality:
         self.__build_hatch__(plot)
 
         if has3DReference(plot):
+            require_3d()
             translate2DTo3DObjects(plot, self.hatch_batch)
 
     def push(self, x, y):

{kaxe-1.5.0.dev1 → kaxe-1.5.0.dev3}/src/kaxe/objects/d2/parameter.py

@@ -139,6 +139,8 @@ class ParametricEquation:
                 parent.add(tf)
 
         elif parent == identities.XYZPLOT:
+            from ..._require_3d import require_3d
+            require_3d()
             from ...core.d3.objects import Line3D, Point3D
             from ...core.d3.backend import RenderBackend
 

{kaxe-1.5.0.dev1 → kaxe-1.5.0.dev3}/src/kaxe/objects/d3/mesh.py

@@ -86,7 +86,9 @@ class Mesh(Base3DObject):
         """
 
         if not STLLIBIMPORTED:
-            raise ImportError('Please ensure that the numpy-stl library is installed')
+            raise ImportError(
+                '3D features require optional dependencies. Install with: pip install kaxe[3d]'
+            )
 
         return Mesh(stlmesh.Mesh.from_file(fpath), **kwargs)
 

{kaxe-1.5.0.dev1 → kaxe-1.5.0.dev3}/src/kaxe/objects/function.py

@@ -57,6 +57,8 @@ class Function:
             return Function2D(f, color=color, width=width, *args, **kwargs)
 
         if n == 2:
+            from .._require_3d import require_3d
+            require_3d()
             from .d3.function import Function3D
             return Function3D(f, color=color, numPoints=numPoints, fill=fill, *args, **kwargs)
 

{kaxe-1.5.0.dev1 → kaxe-1.5.0.dev3}/src/kaxe/objects/point.py

@@ -38,6 +38,8 @@ class Points:
     def __new__(self, x, y, z = None, **kwargs) -> Union[Points2D, "Points3D"]:
     
         if z:
+            from .._require_3d import require_3d
+            require_3d()
             from .d3.point import Points3D
             return Points3D(x, y, z, **kwargs)
         return Points2D(x, y, **kwargs)

{kaxe-1.5.0.dev1 → kaxe-1.5.0.dev3}/src/kaxe/plot/__init__.py

@@ -16,7 +16,6 @@ __all__ = [
     'Plot', 'XYPLOT', 'PolarPlot', 'POLARPLOT',
     'BoxedPlot', 'EmptyPlot', 'EmptyWindow',
     'DoubleAxisPlot', 'Grid', 'XYZPLOT', 'identities',
-    'Plot3D', 'PlotCenter3D', 'PlotFrame3D', 'PlotEmpty3D',
 ]
 
 if TYPE_CHECKING:

{kaxe-1.5.0.dev1 → kaxe-1.5.0.dev3}/src/kaxe/plot/_lazy.py

@@ -11,6 +11,8 @@ _D3_EXPORTS = frozenset({
 
 def lazy_getattr(module_globals, name):
     if name in _D3_EXPORTS:
+        from .._require_3d import require_3d
+        require_3d()
         from . import d3 as _d3
         value = getattr(_d3, name)
         module_globals[name] = value

{kaxe-1.5.0.dev1 → kaxe-1.5.0.dev3}/src/kaxe/plot/grid.py

@@ -23,6 +23,14 @@ def _cell_supports_svg(plot) -> bool:
     return getattr(plot, "supports_vector_export", False)
 
 
+def _grid_has_3d_cells(grid) -> bool:
+    for row in grid:
+        for plot in row:
+            if plot == XYZPLOT or getattr(plot, "identity", None) == XYZPLOT:
+                return True
+    return False
+
+
 class Grid(AttrObject):
     """
     Assemble multiple plots in one image.
@@ -101,6 +109,50 @@ class Grid(AttrObject):
         self.style(**theme)
 
 
+    def adjust(self, procentWidth, documentFontSize=0.25, documentMarginProcent=1.5, documentWidth=11.8, imageSlimRatio=1):
+        """
+        Adjust grid size and typography for LaTeX page fractions (same API as :meth:`kaxe.Plot.adjust`).
+
+        Sets width, height, fontSize, outerPadding, and per-cell xNumbers / yNumbers from cell size.
+        zNumbers is set when the grid contains 3D plots.
+
+        See :meth:`kaxe.core.window.Window.adjust` for parameter details.
+        """
+        styles = compute_adjust_styles(
+            procentWidth,
+            documentFontSize=documentFontSize,
+            documentMarginProcent=documentMarginProcent,
+            documentWidth=documentWidth,
+            imageSlimRatio=imageSlimRatio,
+        )
+        cols = max((len(row) for row in self.grid), default=1) or 1
+        rows = len(self.grid) or 1
+        cell_w = styles["width"] // cols
+        cell_h = styles["height"] // rows
+        x_numbers, y_numbers = compute_axis_numbers(
+            cell_w, cell_h, styles["fontSize"]
+        )
+        axis_kwargs = {
+            "xNumbers": x_numbers,
+            "yNumbers": y_numbers,
+        }
+        if _grid_has_3d_cells(self.grid):
+            z_extent = min(cell_w, cell_h)
+            axis_kwargs["zNumbers"] = compute_axis_numbers(
+                z_extent, z_extent, styles["fontSize"]
+            )[0]
+        self.style(**styles, **axis_kwargs)
+
+
+    def _axis_style_kwargs(self):
+        kwargs = {}
+        for attr in ("xNumbers", "yNumbers", "zNumbers"):
+            value = self.getAttr(attr)
+            if value is not None:
+                kwargs[attr] = value
+        return kwargs
+
+
     def _reset_cell_bake_state(self, plot):
         if plot == XYZPLOT or isinstance(plot, str):
             return
@@ -120,6 +172,7 @@ class Grid(AttrObject):
             outerPadding=self.outerPadding,
             fontSize=self.getAttr('fontSize'),
             color=self.getAttr('color'),
+            **self._axis_style_kwargs(),
         )
 
 

{kaxe-1.5.0.dev1 → kaxe-1.5.0.dev3/src/kaxe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kaxe
-Version: 1.5.0.dev1
+Version: 1.5.0.dev3
 Summary: A small graphing tool for functions, points, equations and more
 Author-email: Valter Yde Daugberg <valteryde@hotmail.com>
 Project-URL: Homepage, https://github.com/valteryde/kaxe
@@ -11,20 +11,19 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: numpy
 Requires-Dist: pillow
 Requires-Dist: fondi>=0.2.0
-Requires-Dist: sympy
-Requires-Dist: scipy
 Requires-Dist: openpyxl
 Requires-Dist: tqdm
-Requires-Dist: numba
-Requires-Dist: python-dotenv
-Requires-Dist: pyopengl
-Requires-Dist: PySDL2
-Requires-Dist: pysdl2-dll
-Requires-Dist: numpy-stl
-Requires-Dist: psutil
-Requires-Dist: opencv-python-headless
+Provides-Extra: core
+Provides-Extra: 3d
+Requires-Dist: scipy; extra == "3d"
+Requires-Dist: pyopengl; extra == "3d"
+Requires-Dist: PySDL2; extra == "3d"
+Requires-Dist: pysdl2-dll; extra == "3d"
+Requires-Dist: numpy-stl; extra == "3d"
+Requires-Dist: psutil; extra == "3d"
 Provides-Extra: pdf
 Requires-Dist: reportlab>=4.0; extra == "pdf"
 Requires-Dist: fonttools>=4.0; extra == "pdf"
@@ -39,6 +38,15 @@ Kaxe is a lightweight, pure-Python plotting library for publication-quality figu
 
 Documentation: [kaxe.readthedocs.io](https://kaxe.readthedocs.io/en/latest/)
 
+## Installation
+
+```bash
+pip install kaxe          # 2D plotting (default)
+pip install kaxe[3d]        # add 3D plotting (OpenGL)
+pip install kaxe[pdf]       # add PDF export
+pip install kaxe[3d,pdf]    # 3D + PDF
+```
+
 ## Quick example
 
 ```python

{kaxe-1.5.0.dev1 → kaxe-1.5.0.dev3}/src/kaxe.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ MANIFEST.in
 README.md
 pyproject.toml
 src/kaxe/__init__.py
+src/kaxe/_require_3d.py
 src/kaxe.egg-info/PKG-INFO
 src/kaxe.egg-info/SOURCES.txt
 src/kaxe.egg-info/dependency_links.txt

{kaxe-1.5.0.dev1 → kaxe-1.5.0.dev3}/src/kaxe.egg-info/requires.txt

@@ -1,17 +1,18 @@
+numpy
 pillow
 fondi>=0.2.0
-sympy
-scipy
 openpyxl
 tqdm
-numba
-python-dotenv
+
+[3d]
+scipy
 pyopengl
 PySDL2
 pysdl2-dll
 numpy-stl
 psutil
-opencv-python-headless
+
+[core]
 
 [pdf]
 reportlab>=4.0