valetudo-map-parser 0.1.9b70__tar.gz → 0.1.9b72__tar.gz

{valetudo_map_parser-0.1.9b70 → valetudo_map_parser-0.1.9b72}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: valetudo-map-parser
-Version: 0.1.9b70
+Version: 0.1.9b72
 Summary: A Python library to parse Valetudo map data returning a PIL Image object.
 License: Apache-2.0
 Author: Sandro Cantarella

{valetudo_map_parser-0.1.9b70 → valetudo_map_parser-0.1.9b72}/SCR/valetudo_map_parser/config/drawable.py

@@ -223,9 +223,7 @@ class Drawable:
 
     @staticmethod
     def point_inside(x: int, y: int, points: list[Tuple[int, int]]) -> bool:
-        """
-        Check if a point (x, y) is inside a polygon defined by a list of points.
-        """
+        """Check if a point (x, y) is inside a polygon defined by a list of points."""
         n = len(points)
         inside = False
         xinters = 0.0
@@ -243,79 +241,80 @@ class Drawable:
 
     @staticmethod
     def _line(
-        layer: NumpyArray,
+        layer: np.ndarray,
         x1: int,
         y1: int,
         x2: int,
         y2: int,
         color: Color,
         width: int = 3,
-    ) -> NumpyArray:
+    ) -> np.ndarray:
         """
-        Draw a line on a NumPy array (layer) from point A to B using vectorized operations.
-
+        Draw a line on a NumPy array (layer) from point A to B using Bresenham's algorithm.
+    
         Args:
-            layer: The numpy array to draw on
+            layer: The numpy array to draw on (H, W, C)
             x1, y1: Start point coordinates
             x2, y2: End point coordinates
-            color: Color to draw with
-            width: Width of the line
+            color: Color to draw with (tuple or array)
+            width: Width of the line in pixels
         """
-        # Ensure coordinates are integers
         x1, y1, x2, y2 = int(x1), int(y1), int(x2), int(y2)
-
-        # Get blended color for the line
+    
         blended_color = get_blended_color(x1, y1, x2, y2, layer, color)
-
-        # Calculate line length
-        length = max(abs(x2 - x1), abs(y2 - y1))
-        if length == 0:  # Handle case of a single point
-            # Draw a dot with the specified width
-            for i in range(-width // 2, (width + 1) // 2):
-                for j in range(-width // 2, (width + 1) // 2):
-                    if 0 <= x1 + i < layer.shape[1] and 0 <= y1 + j < layer.shape[0]:
-                        layer[y1 + j, x1 + i] = blended_color
-            return layer
-
-        # Create parametric points along the line
-        t = np.linspace(0, 1, length * 2)  # Double the points for smoother lines
-        x_coords = np.round(x1 * (1 - t) + x2 * t).astype(int)
-        y_coords = np.round(y1 * (1 - t) + y2 * t).astype(int)
-
-        # Draw the line with the specified width
-        if width == 1:
-            # Fast path for width=1
-            for x, y in zip(x_coords, y_coords):
-                if 0 <= x < layer.shape[1] and 0 <= y < layer.shape[0]:
-                    layer[y, x] = blended_color
-        else:
-            # For thicker lines, draw a rectangle at each point
-            half_width = width // 2
-            for x, y in zip(x_coords, y_coords):
-                for i in range(-half_width, half_width + 1):
-                    for j in range(-half_width, half_width + 1):
-                        if (
-                            i * i + j * j <= half_width * half_width  # Make it round
-                            and 0 <= x + i < layer.shape[1]
-                            and 0 <= y + j < layer.shape[0]
-                        ):
-                            layer[y + j, x + i] = blended_color
-
-        return layer
-
-    @staticmethod
-    async def draw_virtual_walls(
-        layer: NumpyArray, virtual_walls, color: Color
-    ) -> NumpyArray:
-        """
-        Draw virtual walls on the input layer.
-        """
-        for wall in virtual_walls:
-            for i in range(0, len(wall), 4):
-                x1, y1, x2, y2 = wall[i : i + 4]
-                # Draw the virtual wall as a line with a fixed width of 6 pixels
-                layer = Drawable._line(layer, x1, y1, x2, y2, color, width=6)
+    
+        dx = abs(x2 - x1)
+        dy = abs(y2 - y1)
+        sx = 1 if x1 < x2 else -1
+        sy = 1 if y1 < y2 else -1
+        err = dx - dy
+    
+        half_w = width // 2
+        h, w = layer.shape[:2]
+    
+        while True:
+            # Draw a filled circle for thickness
+            yy, xx = np.ogrid[-half_w:half_w + 1, -half_w:half_w + 1]
+            mask = xx**2 + yy**2 <= half_w**2
+            y_min = max(0, y1 - half_w)
+            y_max = min(h, y1 + half_w + 1)
+            x_min = max(0, x1 - half_w)
+            x_max = min(w, x1 + half_w + 1)
+    
+            submask = mask[
+                (y_min - (y1 - half_w)):(y_max - (y1 - half_w)),
+                (x_min - (x1 - half_w)):(x_max - (x1 - half_w))
+            ]
+            layer[y_min:y_max, x_min:x_max][submask] = blended_color
+    
+            if x1 == x2 and y1 == y2:
+                break
+    
+            e2 = 2 * err
+            if e2 > -dy:
+                err -= dy
+                x1 += sx
+            if e2 < dx:
+                err += dx
+                y1 += sy
+    
         return layer
+    
+    
+    
+        @staticmethod
+        async def draw_virtual_walls(
+            layer: NumpyArray, virtual_walls, color: Color
+        ) -> NumpyArray:
+            """
+            Draw virtual walls on the input layer.
+            """
+            for wall in virtual_walls:
+                for i in range(0, len(wall), 4):
+                    x1, y1, x2, y2 = wall[i : i + 4]
+                    # Draw the virtual wall as a line with a fixed width of 6 pixels
+                    layer = Drawable._line(layer, x1, y1, x2, y2, color, width=6)
+            return layer
 
     @staticmethod
     async def lines(arr: NumpyArray, coords, width: int, color: Color) -> NumpyArray:

{valetudo_map_parser-0.1.9b70 → valetudo_map_parser-0.1.9b72}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "valetudo-map-parser"
-version = "0.1.9b70"
+version = "0.1.9b72"
 description = "A Python library to parse Valetudo map data returning a PIL Image object."
 authors = ["Sandro Cantarella <gsca075@gmail.com>"]
 license = "Apache-2.0"