Merge branch 'main' into test_suite_seg_reg

Author: 9and3

deps/eigen

@@ -198,6 +198,51 @@ def is_joint(self):
     def id(self):
         return self.__id
 
+@dataclass
+class DFJoint:
+    """
+    This class represents a joint, in diffCheck, a joint is a collection of faces
+    For convenience, this is used only as a return type from the DFBeam class's property for retrieveing joints
+    """
+
+    id: int
+    faces: typing.List[DFFace]
+
+    def __post_init__(self):
+        self.id = self.id
+        self.faces = self.faces or []
+
+    def __repr__(self):
+        return f"Joint id: {self.id}, Faces: {len(self.faces)}"
+
+    def to_brep(self):
+        """
+        Convert the joint to a Rhino Brep object
+        """
+        brep = rg.Brep()
+        for face in self.faces:
+            brep.Append(face.to_brep_face())
+        brep.Compact()
+        return brep
+
+    def to_mesh(self, max_edge_length):
+        """
+        Convert the joint to a Rhino Mesh object
+        """
+        rhino_brep_faces = [f.to_brep_face() for f in self.faces]
+        mesh = rg.Mesh()
+
+        new_faces = [f.DuplicateFace(True) for f in rhino_brep_faces]
+
+        for f in new_faces:
+            param = rg.MeshingParameters()
+            param.MaximumEdgeLength = max_edge_length
+            mesh_part = rg.Mesh.CreateFromBrep(f, param)[0]
+            mesh.Append(mesh_part)
+
+        mesh.Faces.ConvertQuadsToTriangles()
+        mesh.Compact()
+        return mesh
 
 @dataclass
 class DFBeam:
@@ -214,6 +259,8 @@ def __post_init__(self):
         self._joint_faces = []
         self._side_faces = []
 
+        self._joints = []
+
         self.__id = uuid.uuid4().int
 
     @classmethod
@@ -274,6 +321,18 @@ def joint_faces(self):
     def side_faces(self):
         return [face for face in self.faces if not face.is_joint]
 
+    @property
+    def joints(self):
+        joints : typing.List[DFJoint] = []
+        temp_faces = self.joint_faces.copy()
+        while len(temp_faces) > 0:
+            joint_id = temp_faces[0].joint_id
+            joint_faces = [face for face in temp_faces if face.joint_id == joint_id]
+            joint = DFJoint(joint_id, joint_faces)
+            joints.append(joint)
+            temp_faces = [face for face in temp_faces if face.joint_id != joint_id]
+        return joints
+
 
 @dataclass
 class DFAssembly:
@@ -288,9 +347,11 @@ def __post_init__(self):
         self.beams = self.beams
         self.name = self.name or "Unnamed Assembly"
 
-        self._all_jointfaces = []
-        self._all_sidefaces = []
+        self._all_jointfaces: typing.List[DFFace] = []
+        self._all_sidefaces: typing.List[DFFace] = []
 
+        self._all_joints: typing.List[DFJoint] = []
+        
     def __repr__(self):
         return f"Assembly: {self.name}, Beams: {len(self.beams)}"
 
@@ -370,3 +431,9 @@ def all_side_faces(self):
         for beam in self.beams:
             self._all_sidefaces.extend(beam.side_faces)
         return self._all_sidefaces
+
+    @property
+    def all_joints(self):
+        for beam in self.beams:
+            self._all_joints.extend(beam.joints)
+        return self._all_joints

src/gh/diffCheck/diffCheck/df_geometries.py

@@ -146,6 +146,17 @@ def test_DFPointCloud_properties(create_DFPointCloudSampleRoof):
     assert pc.has_colors() == False, "has_colors() should return False"
     assert pc.has_normals() == False, "has_normals() should return False"
 
+def test_DFPointCloud_add_points():
+    point_pc_1 = [(0, 0, 0)]
+    point_pc_2 = [(1, 1, 1)]
+    normal_pc_1 = [(0, 0, 1)]
+    normal_pc_2 = [(1, 0, 0)]
+    color_pc_1 = [(255, 0, 0)]
+    color_pc_2 = [(0, 255, 0)]
+    pc_1 = dfb.dfb_geometry.DFPointCloud(point_pc_1, normal_pc_1, color_pc_1)
+    pc_2 = dfb.dfb_geometry.DFPointCloud(point_pc_2, normal_pc_2, color_pc_2)
+    pc_1.add_points(pc_2)
+    assert pc_1.points.__len__() == 2, "two pointclouds of 1 pt combined into one should have 2 pts"
 
 def test_DFPointCloud_apply_color(create_DFPointCloudSampleRoof):
     pc = create_DFPointCloudSampleRoof

tests/integration_tests/pybinds_tests/test_pybind_units.py

@@ -117,6 +117,13 @@ TEST_F(DFPointCloudTestFixture, ComputeDistance) {
     EXPECT_EQ(distances.size(), 7379);
 }
 
+TEST_F(DFPointCloudTestFixture, AddPoints) {
+    std::shared_ptr<diffCheck::geometry::DFPointCloud> dfPointCloud2 = std::make_shared<diffCheck::geometry::DFPointCloud>();
+    dfPointCloud2->LoadFromPLY(diffCheck::io::GetRoofQuarterPlyPath());
+    dfPointCloud.AddPoints(*dfPointCloud2);
+    EXPECT_EQ(dfPointCloud.GetNumPoints(), 7379 * 2);
+}
+
 TEST_F(DFPointCloudTestFixture, ComputeAABB) {
     std::vector<Eigen::Vector3d> bbox = dfPointCloud.GetAxixAlignedBoundingBox();
     EXPECT_EQ(bbox.size(), 2);