valetudo-map-parser 0.1.9b70__py3-none-any.whl → 0.1.9b72__py3-none-any.whl

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.dist-info → valetudo_map_parser-0.1.9b72.dist-info}/METADATA

@@ -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.dist-info → valetudo_map_parser-0.1.9b72.dist-info}/RECORD

@@ -4,7 +4,7 @@ valetudo_map_parser/config/async_utils.py,sha256=e1j9uTtg4dhPVWvB2_XgqaH4aeSjRAP
 valetudo_map_parser/config/auto_crop.py,sha256=Aes7vfv4z8ihYvGaH5Nryj6Y9mHDerZLIeyvePjf9aQ,19259
 valetudo_map_parser/config/color_utils.py,sha256=nXD6WeNmdFdoMxPDW-JFpjnxJSaZR1jX-ouNfrx6zvE,4502
 valetudo_map_parser/config/colors.py,sha256=DG-oPQoN5gsnwDbEsuFr8a0hRCxmbFHObWa4_5pr-70,29910
-valetudo_map_parser/config/drawable.py,sha256=2MeVHXqZuVuJk3eerMJYGwo25rVetHx3xB_vxecEFOQ,34168
+valetudo_map_parser/config/drawable.py,sha256=9twbotqVEQ7A_9W-XWg2zx8414Kvwm_B9dFgu4nyJ9Q,33606
 valetudo_map_parser/config/drawable_elements.py,sha256=o-5oiXmfqPwNQLzKIhkEcZD_A47rIU9E0CqKgWipxgc,11516
 valetudo_map_parser/config/enhanced_drawable.py,sha256=QlGxlUMVgECUXPtFwIslyjubWxQuhIixsRymWV3lEvk,12586
 valetudo_map_parser/config/optimized_element_map.py,sha256=52BCnkvVv9bre52LeVIfT8nhnEIpc0TuWTv1xcNu0Rk,15744
@@ -20,8 +20,8 @@ valetudo_map_parser/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 valetudo_map_parser/rand256_handler.py,sha256=daaSQ5ktMUYMnYxJkjS75UdBchpXVZ58HIomwHBFivs,27651
 valetudo_map_parser/reimg_draw.py,sha256=1q8LkNTPHEA9Tsapc_JnVw51kpPYNhaBU-KmHkefCQY,12507
 valetudo_map_parser/rooms_handler.py,sha256=ovqQtAjauAqwUNPR0aX27P2zhheQmqfaFhDE3_AwYWk,17821
-valetudo_map_parser-0.1.9b70.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
-valetudo_map_parser-0.1.9b70.dist-info/METADATA,sha256=oadNkSUgJDO-yswCRC2dow27dI0ntUsKH10Z5OURuic,3353
-valetudo_map_parser-0.1.9b70.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
-valetudo_map_parser-0.1.9b70.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-valetudo_map_parser-0.1.9b70.dist-info/RECORD,,
+valetudo_map_parser-0.1.9b72.dist-info/LICENSE,sha256=Lh-qBbuRV0-jiCIBhfV7NgdwFxQFOXH3BKOzK865hRs,10480
+valetudo_map_parser-0.1.9b72.dist-info/METADATA,sha256=04tAbYfZ0ZiwdCoHppkEaSjtgfcwQvriXny3LeBsWpg,3353
+valetudo_map_parser-0.1.9b72.dist-info/NOTICE.txt,sha256=5lTOuWiU9aiEnJ2go8sc7lTJ7ntMBx0g0GFnNrswCY4,2533
+valetudo_map_parser-0.1.9b72.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+valetudo_map_parser-0.1.9b72.dist-info/RECORD,,