kaxe 1.5.0.dev0__tar.gz → 1.5.0.dev2__tar.gz

{kaxe-1.5.0.dev0/src/kaxe.egg-info → kaxe-1.5.0.dev2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kaxe
-Version: 1.5.0.dev0
+Version: 1.5.0.dev2
 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

{kaxe-1.5.0.dev0 → kaxe-1.5.0.dev2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kaxe"
-version = "1.5.0.dev0"
+version = "1.5.0.dev2"
 authors = [
   { name="Valter Yde Daugberg", email="valteryde@hotmail.com" },
 ]

{kaxe-1.5.0.dev0 → kaxe-1.5.0.dev2}/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.dev0 → kaxe-1.5.0.dev2}/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.dev0 → kaxe-1.5.0.dev2}/src/kaxe/objects/d2/inequality.py

@@ -146,7 +146,19 @@ class Inequality:
                     continue
 
                 diff = _eval_diff(parent, self.left, self.right, px, py)
-                forbidden = diff is not None and abs(diff) >= eps and self._is_forbidden(diff)
+                if diff is None:
+                    if segment_start is not None and last_point is not None:
+                        self.__add_hatch_segment__(segment_start, last_point, hatch_width)
+                    segment_start = None
+                    last_point = None
+                    continue
+
+                if abs(diff) < eps:
+                    # On the boundary: skip without breaking an open segment so
+                    # hatching stays continuous past axis intercepts and corners.
+                    continue
+
+                forbidden = self._is_forbidden(diff)
 
                 if forbidden:
                     point = (px, py)

{kaxe-1.5.0.dev0 → kaxe-1.5.0.dev2}/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.dev0 → kaxe-1.5.0.dev2/src/kaxe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kaxe
-Version: 1.5.0.dev0
+Version: 1.5.0.dev2
 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