kaxe 1.4.4.dev12__tar.gz → 1.4.4.dev14__tar.gz

{kaxe-1.4.4.dev12/src/kaxe.egg-info → kaxe-1.4.4.dev14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kaxe
-Version: 1.4.4.dev12
+Version: 1.4.4.dev14
 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.4.4.dev12 → kaxe-1.4.4.dev14}/pyproject.toml

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

{kaxe-1.4.4.dev12 → kaxe-1.4.4.dev14}/src/kaxe/core/axis.py

@@ -368,6 +368,7 @@ class Axis(AttrObject):
 
     def autoAddMarkers(self, parent):
         self.setAttrMap(parent.attrmap)
+        self.markers = []
 
         markers = self.computeMarkersAutomatic(parent)
         self.addMarkersToAxis(markers, parent)

{kaxe-1.4.4.dev12 → kaxe-1.4.4.dev14}/src/kaxe/core/helper.py

@@ -127,6 +127,37 @@ def insideBox(box, point):
     return True
 
 
+def segment_break_threshold(parent) -> float:
+    """Pixel y delta above which a new polyline segment should start."""
+    box = parent.windowBox
+    return (box[3] - box[1]) * 0.45
+
+
+def should_break_polyline_segment(
+    p1: tuple[float, float],
+    p2: tuple[float, float],
+    parent,
+) -> bool:
+    """Break when a segment looks like a wrap-around, not a normal diagonal."""
+    dx = abs(p2[0] - p1[0])
+    dy = abs(p2[1] - p1[1])
+    if dy <= segment_break_threshold(parent):
+        return False
+    return dy > dx * 1.5
+
+
+def plot_window_clip_rect_svg(plot) -> tuple[float, float, float, float]:
+    """Return plot windowBox as an SVG clip rect (x, y, width, height), y-down."""
+    box = plot.windowBox
+    canvas_h = plot.getSize()[1]
+    return (
+        float(box[0]),
+        float(canvas_h - box[3]),
+        float(box[2] - box[0]),
+        float(box[3] - box[1]),
+    )
+
+
 def shell(a):
     def __shell__():
         return a

{kaxe-1.4.4.dev12 → kaxe-1.4.4.dev14}/src/kaxe/core/svg.py

@@ -57,6 +57,9 @@ class SvgDocument:
         self._width, self._height = int(size[0]), int(size[1])
         self._elements: list[ET.Element] = []
         self._fondi_font_css: Optional[str] = None
+        self._clip_defs: list[ET.Element] = []
+        self._clip_counter = 0
+        self._active_group: Optional[ET.Element] = None
 
     @property
     def height(self) -> int:
@@ -69,12 +72,48 @@ class SvgDocument:
     def flip_y(self, y: float) -> float:
         return flip_y(y, self._height)
 
+    def _register_clip_rect(self, x: float, y: float, width: float, height: float) -> str:
+        clip_id = f"kaxe-clip-{self._clip_counter}"
+        self._clip_counter += 1
+        clip_path = ET.Element(
+            f"{{{SVG_NS}}}clipPath",
+            {"id": clip_id},
+        )
+        ET.SubElement(
+            clip_path,
+            f"{{{SVG_NS}}}rect",
+            {
+                "x": str(round(x, 3)),
+                "y": str(round(y, 3)),
+                "width": str(round(width, 3)),
+                "height": str(round(height, 3)),
+            },
+        )
+        self._clip_defs.append(clip_path)
+        return clip_id
+
+    def push_clip_layer(self, x: float, y: float, width: float, height: float) -> None:
+        """Clip subsequent elements to a rectangle in SVG top-down coordinates."""
+        clip_id = self._register_clip_rect(x, y, width, height)
+        group = ET.Element(
+            f"{{{SVG_NS}}}g",
+            {"clip-path": f"url(#{clip_id})"},
+        )
+        self._elements.append(group)
+        self._active_group = group
+
+    def pop_clip_layer(self) -> None:
+        self._active_group = None
+
     def add_element(self, tag: str, attribs: dict[str, Any]) -> ET.Element:
         el = ET.Element(
             f"{{{SVG_NS}}}{tag}",
             {k: str(v) for k, v in attribs.items() if v is not None},
         )
-        self._elements.append(el)
+        if self._active_group is not None:
+            self._active_group.append(el)
+        else:
+            self._elements.append(el)
         return el
 
     def add_rect(
@@ -285,9 +324,11 @@ class SvgDocument:
         rotate: float = 0,
         rotate_center: Optional[tuple[float, float]] = None,
     ) -> None:
-        """Place an image; y is in kaxe coords (y-up). y_coord='bottom' or 'top'."""
+        """Place an image; y is in kaxe coords (y-up) unless y_coord='svg_top'."""
         href = pil_to_data_uri(img)
-        if y_coord == "top":
+        if y_coord == "svg_top":
+            svg_top = y
+        elif y_coord == "top":
             svg_top = self.flip_y(y)
         else:
             svg_top = self.flip_y(y) - img.height
@@ -347,7 +388,10 @@ class SvgDocument:
         group = ET.Element(f"{{{SVG_NS}}}g", {"transform": transform})
         for child in list(inner):
             group.append(copy.deepcopy(child))
-        self._elements.append(group)
+        if self._active_group is not None:
+            self._active_group.append(group)
+        else:
+            self._elements.append(group)
 
     def serialize(self) -> str:
         root = ET.Element(
@@ -359,15 +403,22 @@ class SvgDocument:
                 "viewBox": f"0 0 {self._width} {self._height}",
             },
         )
-        if self._fondi_font_css is not None:
+        if self._fondi_font_css is not None or self._clip_defs:
             defs = ET.SubElement(root, f"{{{SVG_NS}}}defs")
-            style = ET.SubElement(defs, f"{{{SVG_NS}}}style")
-            style.text = self._fondi_font_css
+            if self._fondi_font_css is not None:
+                style = ET.SubElement(defs, f"{{{SVG_NS}}}style")
+                style.text = self._fondi_font_css
+            for clip_el in self._clip_defs:
+                defs.append(clip_el)
         for el in self._elements:
             root.append(el)
         body = ET.tostring(root, encoding="unicode")
-        from fondi.backends.svg import _ascii_safe_svg_markup
-        body = _ascii_safe_svg_markup(body)
+        try:
+            from fondi.backends.svg import _ascii_safe_svg_markup
+
+            body = _ascii_safe_svg_markup(body)
+        except ImportError:
+            pass
         return '<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n' + body
 
     def to_pdf(self, fname: Optional[Union[str, BytesIO]] = None) -> bytes:
@@ -408,14 +459,23 @@ def embed_svg_children(
     children: list[ET.Element],
     tx: float,
     ty: float,
+    *,
+    clip_rect: Optional[tuple[float, float, float, float]] = None,
 ) -> None:
-    """Embed copied SVG children at top-left offset (SVG y-down coordinates)."""
+    """Embed copied SVG children at top-left offset (SVG y-down coordinates).
+
+    clip_rect is optional (x, y, width, height) in the embedded cell's local SVG space.
+    """
     if not children:
         return
-    group = ET.Element(
-        f"{{{SVG_NS}}}g",
-        {"transform": f"translate({round(tx, 3)},{round(ty, 3)})"},
-    )
+    attribs: dict[str, str] = {
+        "transform": f"translate({round(tx, 3)},{round(ty, 3)})",
+    }
+    if clip_rect is not None:
+        cx, cy, cw, ch = clip_rect
+        clip_id = doc._register_clip_rect(cx, cy, cw, ch)
+        attribs["clip-path"] = f"url(#{clip_id})"
+    group = ET.Element(f"{{{SVG_NS}}}g", attribs)
     for child in children:
         group.append(copy.deepcopy(child))
     doc._elements.append(group)

{kaxe-1.4.4.dev12 → kaxe-1.4.4.dev14}/src/kaxe/core/window.py

@@ -418,7 +418,8 @@ class Window(AttrObject):
         self.__includeAllAgain__()
         
 
-        self.shapes = [i[0] for i in sorted(self.shapes, key=lambda x: x[1])]
+        self.shape_layers = sorted(self.shapes, key=lambda x: x[1])
+        self.shapes = [i[0] for i in self.shape_layers]
 
         # add style padding
         self.addPaddingCondition(*self.getAttr('outerPadding'))
@@ -494,7 +495,23 @@ class Window(AttrObject):
             background = shapes.Rectangle(0, 0, winSize[0], winSize[1], color=self.getAttr('backgroundColor'))
             background.draw(doc)
 
-        for shape in self.shapes:
+        box = self.windowBox
+        doc.push_clip_layer(
+            box[0],
+            winSize[1] - box[3],
+            box[2] - box[0],
+            box[3] - box[1],
+        )
+        for shape, z in getattr(self, "shape_layers", [(s, 0) for s in self.shapes]):
+            if z >= 2:
+                continue
+            shape.draw(doc)
+            if self.showProgressBar: pbar.update()
+        doc.pop_clip_layer()
+
+        for shape, z in getattr(self, "shape_layers", [(s, 0) for s in self.shapes]):
+            if z < 2:
+                continue
             shape.draw(doc)
             if self.showProgressBar: pbar.update()
 
@@ -524,7 +541,23 @@ class Window(AttrObject):
             background = shapes.Rectangle(0, 0, winSize[0], winSize[1], color=self.getAttr('backgroundColor'))
             background.draw(doc)
 
-        for shape in self.shapes:
+        box = self.windowBox
+        doc.push_clip_layer(
+            box[0],
+            winSize[1] - box[3],
+            box[2] - box[0],
+            box[3] - box[1],
+        )
+        for shape, z in getattr(self, "shape_layers", [(s, 0) for s in self.shapes]):
+            if z >= 2:
+                continue
+            shape.draw(doc)
+            if self.showProgressBar: pbar.update()
+        doc.pop_clip_layer()
+
+        for shape, z in getattr(self, "shape_layers", [(s, 0) for s in self.shapes]):
+            if z < 2:
+                continue
             shape.draw(doc)
             if self.showProgressBar: pbar.update()
 

{kaxe-1.4.4.dev12 → kaxe-1.4.4.dev14}/src/kaxe/objects/d2/function.py

@@ -130,6 +130,8 @@ class Function2D:
                     )
 
         if parent.inside(px, py) or parent.inside(*self.__lastPoint__):
+            if should_break_polyline_segment(self.__lastPoint__, (px, py), parent):
+                self.lineSegments.append([])
             self.lineSegments[-1].append(parent.clamp(self.__lastPoint__[0], self.__lastPoint__[1]))
             self.lineSegments[-1].append(parent.clamp(px, py))
         else:

{kaxe-1.4.4.dev12 → kaxe-1.4.4.dev14}/src/kaxe/objects/d2/point.py

@@ -136,25 +136,34 @@ class Points2D:
 
 
     def __finalizeConnectedLine__(self, parent, line_width):
-        points = []
+        segments = [[]]
         for x_val, y_val in zip(self.x, self.y):
             px, py = parent.pixel(x_val, y_val)
             if px is None or py is None:
                 continue
             if not parent.inside(px, py):
                 continue
-            points.append(parent.clamp(px, py))
+            point = parent.clamp(px, py)
+            if segments[-1] and should_break_polyline_segment(segments[-1][-1], point, parent):
+                segments.append([])
+            segments[-1].append(point)
 
-        if len(points) < 2:
-            return
-        if len(points) == 2:
-            x0, y0 = points[0]
-            x1, y1 = points[1]
-            line = shapes.Line(x0, y0, x1, y1, color=self.color, width=line_width, batch=self.batch, center=True)
-            self.lines.append(line)
-            return
-
-        shapes.LineSegment(points, color=self.color, width=line_width, batch=self.batch)
+        for points in segments:
+            if len(points) < 2:
+                continue
+            if len(points) == 2:
+                x0, y0 = points[0]
+                x1, y1 = points[1]
+                line = shapes.Line(
+                    x0, y0, x1, y1,
+                    color=self.color,
+                    width=line_width,
+                    batch=self.batch,
+                    center=True,
+                )
+                self.lines.append(line)
+                continue
+            shapes.LineSegment(points, color=self.color, width=line_width, batch=self.batch)
         
     
     def draw(self, *args, **kwargs):

{kaxe-1.4.4.dev12 → kaxe-1.4.4.dev14}/src/kaxe/plot/grid.py

@@ -94,6 +94,7 @@ class Grid(AttrObject):
         """
         
         self.__legends = legends
+        self._invalidate_bake_cache()
 
 
     def theme(self, theme):
@@ -110,10 +111,23 @@ class Grid(AttrObject):
         plot.__included__ = []
         plot.__baked__ = False
         plot.__bakedImage__ = False
+        if hasattr(plot, "shape_layers"):
+            plot.shape_layers = []
+        for axis in (getattr(plot, "firstAxis", None), getattr(plot, "secondAxis", None)):
+            if axis is not None:
+                axis.markers = []
+                axis.title = None
+
+
+    def _invalidate_bake_cache(self):
+        self.__bakedImage__ = False
+        self.__bakedSvg__ = None
+        self.__bakedPdf__ = None
 
 
     def _apply_cell_styles(self, plot, cellWidth, cellHeight):
         self._reset_cell_bake_state(plot)
+        plot.showLegend = False
         plot.style(
             width=cellWidth,
             height=cellHeight,
@@ -315,12 +329,18 @@ class Grid(AttrObject):
                     xml = plot.__ioBytes.read().decode("utf-8")
                     root = parse_svg_root(xml)
                     children, fondi_css = extract_svg_children(root)
-                    embed_svg_children(doc, children, px, py)
+                    embed_svg_children(
+                        doc,
+                        children,
+                        px,
+                        py,
+                        clip_rect=plot_window_clip_rect_svg(plot),
+                    )
                     merge_fondi_css(doc, fondi_css)
                 else:
                     plot.__ioBytes.seek(0)
                     img = Image.open(plot.__ioBytes)
-                    doc.add_image(img, px, py, y_coord="top")
+                    doc.add_image(img, px, py, y_coord="svg_top")
 
                 x += cellWidth + gapcol
 
@@ -364,6 +384,7 @@ class Grid(AttrObject):
 
         """
 
+        self._invalidate_bake_cache()
         self.grid.append(row)
 
 
@@ -377,6 +398,8 @@ class Grid(AttrObject):
             A list of plots to be added as a column in the grid.
         """
 
+        self._invalidate_bake_cache()
+
         for i, plot in enumerate(column):
             
             if i >= len(self.grid):

{kaxe-1.4.4.dev12 → kaxe-1.4.4.dev14/src/kaxe.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kaxe
-Version: 1.4.4.dev12
+Version: 1.4.4.dev14
 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