kaxe 1.4.4.dev11__tar.gz → 1.4.4.dev13__tar.gz

{kaxe-1.4.4.dev11/src/kaxe.egg-info → kaxe-1.4.4.dev13}/PKG-INFO

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

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

{kaxe-1.4.4.dev11 → kaxe-1.4.4.dev13}/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.dev11 → kaxe-1.4.4.dev13}/src/kaxe/core/svg.py

@@ -57,6 +57,8 @@ 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
 
     @property
     def height(self) -> int:
@@ -285,9 +287,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
@@ -359,15 +363,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 +419,36 @@ def embed_svg_children(
     children: list[ET.Element],
     tx: float,
     ty: float,
+    *,
+    clip_size: Optional[tuple[float, float]] = None,
 ) -> None:
     """Embed copied SVG children at top-left offset (SVG y-down coordinates)."""
     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_size is not None:
+        clip_w, clip_h = clip_size
+        clip_id = f"kaxe-clip-{doc._clip_counter}"
+        doc._clip_counter += 1
+        clip_path = ET.Element(
+            f"{{{SVG_NS}}}clipPath",
+            {"id": clip_id},
+        )
+        ET.SubElement(
+            clip_path,
+            f"{{{SVG_NS}}}rect",
+            {
+                "x": "0",
+                "y": "0",
+                "width": str(round(clip_w, 3)),
+                "height": str(round(clip_h, 3)),
+            },
+        )
+        doc._clip_defs.append(clip_path)
+        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.dev11 → kaxe-1.4.4.dev13}/src/kaxe/objects/d2/point.py

@@ -28,9 +28,8 @@ class Points2D:
     lollipop : bool, optional
         If True, the points will be represented as lollipops. Default is False.
     show_points : bool, optional
-        If False, point markers are not drawn. With ``connect=True``, small
-        junction circles matching the line width are still drawn at vertices.
-        Default is True.
+        If False, point markers are not drawn. With ``connect=True``, only the
+        connector polyline is drawn. Default is True.
     """
 
     def __init__(self, x, y, color:tuple=None, size:int=None, symbol:str=None, connect:bool=False, lollipop=False, show_points:bool=True):        
@@ -89,6 +88,10 @@ class Points2D:
         size = max(1, round(self.size * scale))
         line_width = max(1, int(size * 0.5))
 
+        if self.connect and not self.show_points:
+            self.__finalizeConnectedLine__(parent, line_width)
+            return
+
         for i, (x,y) in enumerate(zip(self.x,self.y)):
             x,y = parent.pixel(x, y)
             
@@ -106,8 +109,6 @@ class Points2D:
                 else:
                     radius = line_width / 2 if self.connect else size / 2
                     shapes.Circle(x, y, radius, self.color, batch=self.batch)
-            elif self.connect:
-                shapes.Circle(x, y, line_width / 2, self.color, batch=self.batch)
 
             # lollipop (lagt til lines)
             if self.lollipop:
@@ -123,7 +124,7 @@ class Points2D:
             if x1 is None or y1 is None or x is None or y is None:
                 continue
             
-            skip_dist = size if self.symbol else (line_width if not self.show_points else None)
+            skip_dist = size if self.symbol else None
             if skip_dist and vlen(vdiff((x1, y1), (x,y))) < skip_dist:
                 continue
 
@@ -132,6 +133,28 @@ class Points2D:
 
             line = shapes.Line(x,y, x1, y1, color=self.color, width=line_width, batch=self.batch, center=True)
             self.lines.append(line)
+
+
+    def __finalizeConnectedLine__(self, parent, line_width):
+        points = []
+        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))
+
+        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)
         
     
     def draw(self, *args, **kwargs):

{kaxe-1.4.4.dev11 → kaxe-1.4.4.dev13}/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,21 @@ class Grid(AttrObject):
         plot.__included__ = []
         plot.__baked__ = False
         plot.__bakedImage__ = False
+        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 +327,19 @@ 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)
+                    cell_w, cell_h = plot.getSize()
+                    embed_svg_children(
+                        doc,
+                        children,
+                        px,
+                        py,
+                        clip_size=(cell_w, cell_h),
+                    )
                     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 +383,7 @@ class Grid(AttrObject):
 
         """
 
+        self._invalidate_bake_cache()
         self.grid.append(row)
 
 
@@ -377,6 +397,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.dev11 → kaxe-1.4.4.dev13/src/kaxe.egg-info}/PKG-INFO

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