Merge pull request #147 from cristobaltapia/fix-issue-125

Change code to generate Bin objects

Author: Ruudjhuu

.vscode/launch.json

@@ -20,6 +20,7 @@ dev = [
   "Sphinx",
   "sphinx-rtd-theme",
   "sphinx_design",
+  "debugpy>=1.8.20",
 ]
 
 [build-system]

pyproject.toml

@@ -11,14 +11,12 @@
     BasePartObject,
     BuildPart,
     BuildSketch,
-    Location,
+    Locations,
     Mode,
     Rectangle,
     RotationLike,
     add,
     extrude,
-    fillet,
-    offset,
 )
 
 from .constants import gridfinity_standard
@@ -62,31 +60,27 @@ def __init__(
 
         with BuildPart() as base:
             base_block = BaseBlock(features=features, mode=Mode.PRIVATE)
-            Utils.place_by_grid(base_block, grid)
-
-            top_face = base.faces().sort_by(Axis.Z)[-1]
-            edges = (
-                base.edges()
-                .filter_by(Axis.Z)
-                .filter_by(
-                    lambda edge: any(
-                        True for vertex in edge.vertices() if vertex in top_face.vertices()
-                    ),
-                )
+            Utils.place_by_grid(
+                base_block,
+                grid,
+                width=gridfinity_standard.grid.size,
+                length=gridfinity_standard.grid.size,
             )
-            fillet(objects=edges, radius=gridfinity_standard.grid.radius)
 
-        with BuildPart() as cutter:
-            with BuildSketch(Location((0, 0, base.part.bounding_box().max.Z))):
-                add(base.faces().sort_by(Axis.Z)[-1])
-                offset(amount=-gridfinity_standard.grid.tollerance / 2)
-            extrude(amount=base.part.bounding_box().size.Z, dir=(0, 0, -1))
+            top_face_1 = base.faces().sort_by(Axis.Z)[-1]
+            z_top = top_face_1.bounding_box().min.Z
 
-        with BuildPart() as part:
-            add(base)
-            add(cutter, mode=Mode.INTERSECT)
+            with Locations((0, 0, z_top)):
+                Utils.create_bin_platform(
+                    grid,
+                    align=(
+                        Align.CENTER,
+                        Align.CENTER,
+                        Align.MIN,
+                    ),
+                )
 
-        super().__init__(part.part, rotation, align, mode)
+        super().__init__(base.part, rotation, align, mode)
 
 
 class BaseEqual(Base):
@@ -122,9 +116,7 @@ def __init__(
 class BaseBlock(BasePartObject):
     """BaseBlock.
 
-    Create a single baseblock with rectangular platform. The rectangular platform makes it
-    posible to stack the blocks in x and y direction. After creating an array it is meant to
-    cut the platform to size.
+    Create a single baseblock.
     """
 
     def __init__(
@@ -155,14 +147,55 @@ def __init__(
                 gridfinity_standard.stacking_lip.offset,
             )
 
-            with BuildSketch(baseblock.faces().sort_by(Axis.Z)[-1]) as rect2:
+            for feature in features:
+                feature.apply(baseblock)
+
+        super().__init__(baseblock.part, rotation, align, mode)
+
+
+class BaseBlockPlatform(BasePartObject):
+    """BaseBlockPlatform.
+
+    Create a single baseblock with a rectangular platform on top. The rectangular platform makes it
+    posible to stack the blocks in x and y direction. After creating an array it is meant to cut or
+    offset the platform to size.
+    """
+
+    def __init__(
+        self,
+        features: ObjectFeature | list[ObjectFeature] | None = None,
+        rotation: RotationLike = (0, 0, 0),
+        align: Align | tuple[Align, Align, Align] | None = None,
+        mode: Mode = Mode.ADD,
+    ):
+        """Construct BaseBlockPlatform.
+
+        Args:
+            features (ObjectFeature | list[ObjectFeature] | None, optional): ObjectFeature
+                or list of ObjectFeatures. Defaults to None.
+            rotation (RotationLike, optional): Angels to rotate around axes. Defaults to (0, 0, 0).
+            align (Union[Align, tuple[Align, Align, Align]], optional): Align min center of max of
+                object. Defaults to None.
+            mode (Mode, optional): Combination mode. Defaults to Mode.ADD.
+        """
+        if not features:
+            features = []
+
+        features = features if isinstance(features, Iterable) else [features]
+
+        base_block = BaseBlock(features=[], rotation=rotation, mode=Mode.ADD)
+
+        with BuildPart() as baseblock_platform:
+            add(base_block)
+
+            with BuildSketch(baseblock_platform.faces().sort_by(Axis.Z)[-1]) as rect2:
                 Rectangle(gridfinity_standard.grid.size, gridfinity_standard.grid.size)
             extrude(
                 to_extrude=rect2.sketch,
                 amount=gridfinity_standard.bottom.platform_height,
             )
 
             for feature in features:
-                feature.apply(baseblock)
+                feature.apply(baseblock_platform)
 
-        super().__init__(baseblock.part, rotation, align, mode)
+        super().__init__(baseblock_platform.part, rotation, align, mode)

src/gridfinity_build123d/base.py

@@ -74,9 +74,28 @@ def create(
             for feature in self.features:
                 feature.apply(part)
 
-            fillet_edges = [
-                i for i in part.edges() if i not in part.faces().sort_by(Axis.Z)[-1].edges()
-            ]
+            bbox = part.part.bounding_box()
+
+            # Select only vertical edges
+            fillet_edges = (
+                part.edges()
+                .filter_by(Axis.Z)
+                .filter_by_position(
+                    Axis.Z,
+                    minimum=bbox.min.Z,
+                    maximum=bbox.max.Z - 1.1,
+                )
+            )
+
+            # Select the rest of the edges (excluding the top face and lower
+            # edge of the label)
+            fillet(fillet_edges, gf_bin.inner_radius_v)
+
+            fillet_edges = part.edges().filter_by_position(
+                Axis.Z,
+                minimum=bbox.min.Z,
+                maximum=bbox.max.Z - 1.1,
+            )
 
             fillet(fillet_edges, gf_bin.inner_radius)
 

src/gridfinity_build123d/compartments.py

@@ -52,8 +52,13 @@ class screw:
 class gf_bin:
     """Bin constants."""
 
-    inner_radius = 1.8
-    inner_wall = 1.2
+    inner_wall = 0.95
+    # Radius used for vertical inner fillets
+    inner_radius_v = (
+        gridfinity_standard.grid.radius - inner_wall - gridfinity_standard.grid.tollerance / 2
+    )
+    # Radius used for the rest of the inner fillets
+    inner_radius = 1.2
 
     @dataclass
     class label:

src/gridfinity_build123d/constants.py

@@ -488,8 +488,8 @@ def create_obj(  # noqa: D102
                 Polyline(
                     ln3 @ 1,
                     ((ln3 @ 1).X, -3.5),
-                    ((ln3 @ 1).X + 1.47, -5.6),
-                    ((ln1 @ 0).X, -5.6),
+                    ((ln3 @ 1).X + 1.47, -5.9),
+                    ((ln1 @ 0).X, -5.9),
                     ln1 @ 0,
                 )
             make_face()