kaxe 1.4.4.dev8__tar.gz → 1.4.4.dev10__tar.gz

{kaxe-1.4.4.dev8/src/kaxe.egg-info → kaxe-1.4.4.dev10}/PKG-INFO

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

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

{kaxe-1.4.4.dev8 → kaxe-1.4.4.dev10}/src/kaxe/objects/d2/point.py

@@ -27,9 +27,12 @@ class Points2D:
         If True, the points will be connected by lines. Default is False.
     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``, junction
+        circles matching the line width are still drawn. Default is True.
     """
 
-    def __init__(self, x, y, color:tuple=None, size:int=None, symbol:str=None, connect:bool=False, lollipop=False):        
+    def __init__(self, x, y, color:tuple=None, size:int=None, symbol:str=None, connect:bool=False, lollipop=False, show_points:bool=True):        
         self.batch = shapes.Batch()
         self.points = []
         self.lines = []
@@ -64,6 +67,9 @@ class Points2D:
 
         self.legendColor = self.color
         self.connect = connect
+        self.show_points = show_points
+        if not show_points and connect and not symbol:
+            self.legendSymbol = symbols.LINE
         
         if len(self.x) > 0:
             self.farLeft = min(self.x)
@@ -80,6 +86,7 @@ class Points2D:
         if self.size is None: self.size = round(parent.getAttr('fontSize') / 3)
         scale = parent.getVisualScale()
         size = max(1, round(self.size * scale))
+        line_width = max(1, int(size * 0.5))
 
         for i, (x,y) in enumerate(zip(self.x,self.y)):
             x,y = parent.pixel(x, y)
@@ -88,22 +95,22 @@ class Points2D:
                 continue
             
             # symbol
-            if self.symbol:
-                
-                #shapes.Circle(x,y, size, color=self.color, batch=self.batch)
-                symbol = makeSymbolShapes(self.symbol, size, self.color, batch=self.batch)
-                symbol.x = x
-                symbol.y = y
-                if hasattr(symbol, 'centerAlign'): symbol.centerAlign()
-                self.points.append(symbol)
-            
-            else:
-                shapes.Circle(x, y, self.size/2, self.color, batch=self.batch)
+            if self.show_points:
+                if self.symbol:
+                    symbol = makeSymbolShapes(self.symbol, size, self.color, batch=self.batch)
+                    symbol.x = x
+                    symbol.y = y
+                    if hasattr(symbol, 'centerAlign'): symbol.centerAlign()
+                    self.points.append(symbol)
+                else:
+                    shapes.Circle(x, y, self.size/2, 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:
                 _, y0 = parent.pixel(x, min(max(0, parent.windowAxis[2]), parent.windowAxis[3]))
-                line = shapes.Line(x, y, x, y0, color=self.color, width=max(1, int(size*.5)), batch=self.batch, center=True)
+                line = shapes.Line(x, y, x, y0, color=self.color, width=line_width, batch=self.batch, center=True)
                 self.lines.append(line)
 
             # connect
@@ -114,13 +121,14 @@ class Points2D:
             if x1 is None or y1 is None or x is None or y is None:
                 continue
             
-            if (vlen(vdiff((x1, y1), (x,y))) < size) and self.symbol:
+            skip_dist = size if self.symbol else (line_width if not self.show_points else None)
+            if skip_dist and vlen(vdiff((x1, y1), (x,y))) < skip_dist:
                 continue
 
             if not parent.inside(x1, y1):
                 continue
 
-            line = shapes.Line(x,y, x1, y1, color=self.color, width=max(1, int(size*.5)), batch=self.batch, center=True)
+            line = shapes.Line(x,y, x1, y1, color=self.color, width=line_width, batch=self.batch, center=True)
             self.lines.append(line)
         
     

{kaxe-1.4.4.dev8 → kaxe-1.4.4.dev10}/src/kaxe/objects/point.py

@@ -22,6 +22,7 @@ class Points:
         Y coordinates of the points.
     **kwargs
         Additional keyword arguments. For the appropiate keyworks see arguments for Points2D and Points3D.
+        ``show_points`` is supported by Points2D only (line-only plots with ``connect=True``).
 
     Returns
     -------

{kaxe-1.4.4.dev8 → kaxe-1.4.4.dev10}/src/kaxe/plot/grid.py

@@ -101,7 +101,19 @@ class Grid(AttrObject):
         self.style(**theme)
 
 
+    def _reset_cell_bake_state(self, plot):
+        if plot == XYZPLOT or isinstance(plot, str):
+            return
+        plot.padding = [0, 0, 0, 0]
+        plot.resetAllPushed()
+        plot.shapes = []
+        plot.__included__ = []
+        plot.__baked__ = False
+        plot.__bakedImage__ = False
+
+
     def _apply_cell_styles(self, plot, cellWidth, cellHeight):
+        self._reset_cell_bake_state(plot)
         plot.style(
             width=cellWidth,
             height=cellHeight,
@@ -120,17 +132,13 @@ class Grid(AttrObject):
 
         cellWidth, cellHeight = self.width // gridSize[0], self.height // gridSize[1]
 
-        height = 0
         leftpadding = 0
         rightpadding = 0
         toppadding = 0
         bottompadding = 0
         gapcol = 0
-        maxWidth = 0
 
         for row in grid:
-            maxHeight = 0
-
             for colNum, plot in enumerate(row):
                 self._apply_cell_styles(plot, cellWidth, cellHeight)
 
@@ -149,10 +157,6 @@ class Grid(AttrObject):
                 plot.__ioBytes = memfile
                 memfile.seek(0)
 
-                w, h = plot.getSize()
-                maxWidth = max(w, maxWidth)
-                maxHeight = max(h, maxHeight)
-
                 if colNum == 0:
                     leftpadding = max(leftpadding, plot.padding[0])
                     bottompadding = max(bottompadding, plot.padding[1])
@@ -163,8 +167,24 @@ class Grid(AttrObject):
                     rightpadding = max(rightpadding, plot.padding[2])
                     toppadding = max(toppadding, plot.padding[3])
 
-            height += maxHeight
-
+        gapcol = max(gapcol, self.gridGap[0])
+
+        gaprows = []
+        for row_idx in range(len(grid) - 1):
+            boundary_gap = 0
+            row_above = grid[row_idx]
+            row_below = grid[row_idx + 1]
+            for col_idx in range(max(len(row_above), len(row_below))):
+                if col_idx < len(row_above) and col_idx < len(row_below):
+                    above = row_above[col_idx]
+                    below = row_below[col_idx]
+                    boundary_gap = max(
+                        boundary_gap,
+                        above.padding[1] + below.padding[3],
+                    )
+            gaprows.append(max(boundary_gap, self.gridGap[1]))
+
+        num_rows = len(grid)
         largetsRowNumber = max(len(i) for i in grid)
         width = (
             gapcol * (largetsRowNumber - 1)
@@ -172,10 +192,16 @@ class Grid(AttrObject):
             + leftpadding
             + rightpadding
         )
+        height = (
+            num_rows * cellHeight
+            + sum(gaprows)
+            + toppadding
+            + bottompadding
+        )
 
         size = (
             width + self.outerPadding[0] + self.outerPadding[2],
-            height + self.outerPadding[1] + self.outerPadding[3] + toppadding,
+            height + self.outerPadding[1] + self.outerPadding[3],
         )
 
         legend_image = None
@@ -201,10 +227,13 @@ class Grid(AttrObject):
         return {
             "grid": grid,
             "cellWidth": cellWidth,
+            "cellHeight": cellHeight,
             "gapcol": gapcol,
+            "gaprows": gaprows,
             "size": size,
             "leftpadding": leftpadding,
             "toppadding": toppadding,
+            "bottompadding": bottompadding,
             "legend_image": legend_image,
             "legend_doc": legend_doc,
             "legend_top_margin": legend_top_margin,
@@ -215,7 +244,9 @@ class Grid(AttrObject):
         grid = layout["grid"]
         size = layout["size"]
         cellWidth = layout["cellWidth"]
+        cellHeight = layout["cellHeight"]
         gapcol = layout["gapcol"]
+        gaprows = layout["gaprows"]
         leftpadding = layout["leftpadding"]
         toppadding = layout["toppadding"]
 
@@ -233,8 +264,7 @@ class Grid(AttrObject):
 
         y = toppadding + self.outerPadding[1]
 
-        for row in grid:
-            maxHeight = 0
+        for row_idx, row in enumerate(grid):
             x = leftpadding + self.outerPadding[0]
 
             for plot in row:
@@ -242,9 +272,9 @@ class Grid(AttrObject):
                 plot.__ioBytes.seek(0)
                 image.paste(img, (x - plot.padding[0], y - plot.padding[3]))
                 x += cellWidth + gapcol
-                maxHeight = max(maxHeight, plot.getSize()[1])
 
-            y += maxHeight
+            if row_idx < len(grid) - 1:
+                y += cellHeight + gaprows[row_idx]
 
         return image
 
@@ -253,7 +283,9 @@ class Grid(AttrObject):
         size = layout["size"]
         grid = layout["grid"]
         cellWidth = layout["cellWidth"]
+        cellHeight = layout["cellHeight"]
         gapcol = layout["gapcol"]
+        gaprows = layout["gaprows"]
         leftpadding = layout["leftpadding"]
         toppadding = layout["toppadding"]
 
@@ -271,8 +303,7 @@ class Grid(AttrObject):
 
         y = toppadding + self.outerPadding[1]
 
-        for row in grid:
-            maxHeight = 0
+        for row_idx, row in enumerate(grid):
             x = leftpadding + self.outerPadding[0]
 
             for plot in row:
@@ -292,9 +323,9 @@ class Grid(AttrObject):
                     doc.add_image(img, px, py, y_coord="top")
 
                 x += cellWidth + gapcol
-                maxHeight = max(maxHeight, plot.getSize()[1])
 
-            y += maxHeight
+            if row_idx < len(grid) - 1:
+                y += cellHeight + gaprows[row_idx]
 
         return doc
 

{kaxe-1.4.4.dev8 → kaxe-1.4.4.dev10/src/kaxe.egg-info}/PKG-INFO

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