FIX: the joint detector was not updated strange, now it's ok

Author: 9and3

src/gh/components/DF_load_mesh_from_file/code.py

@@ -46,9 +46,9 @@ def RunScript(self,
         return rh_mesh
 
 
-# if __name__ == "__main__":
-#     com = DFLoadMeshFromFile()
-#     o_rh_mesh = com.RunScript(
-#         i_path,n
-#         i_scalef
-#     )
+if __name__ == "__main__":
+    com = DFLoadMeshFromFile()
+    o_rh_mesh = com.RunScript(
+        i_path,
+        i_scalef
+    )

src/gh/components/DF_xml_exporter/code.py

@@ -25,41 +25,48 @@ def RunScript(self,
             :param i_export_dir: directory to export the xml
             :param i_breps: list of breps
         """
-        # beams
-        # beams: typing.List[DFBeam] = []
-        # for brep in i_breps:
-        #     beam = DFBeam.from_brep(brep)
-        #     beams.append(beam)
-
-        # # assembly
-        # assembly1 = DFAssembly(beams, i_assembly_name)
+        o_xml = None
+        o_joints = None
+        o_sides = None
+        o_debug = None
 
-        # # dump the xml
-        # xml: str = assembly1.to_xml()
-        # if i_dump:
-        #     assembly1.dump_xml(xml, i_export_dir)
-        # o_xml = xml
-
-        # # show the joint/side faces
-        # o_joints = [jf.to_brep() for jf in assembly1.all_joint_faces]
-        # o_sides = [sf.to_brep() for sf in assembly1.all_side_faces]
+        # beams
+        beams: typing.List[DFBeam] = []
+        for brep in i_breps:
+            print(f"Processing brep {brep}")
+            print(f"Type: {type(brep)}")
+            beam = DFBeam.from_brep(brep)
+            beams.append(beam)
+
+        # assembly
+        assembly1 = DFAssembly(beams, i_assembly_name)
+
+        # dump the xml
+        xml: str = assembly1.to_xml()
+        if i_dump:
+            assembly1.dump_xml(xml, i_export_dir)
+        o_xml = xml
+
+        # show the joint/side faces
+        o_joints = [jf.to_brep() for jf in assembly1.all_joint_faces]
+        o_sides = [sf.to_brep() for sf in assembly1.all_side_faces]
 
         ###########################
 
-        faces, o_debug = diffCheck.df_joint_detector.JointDetector(i_breps[0]).run()
+        # faces, o_debug = diffCheck.df_joint_detector.JointDetector(i_breps[0]).run()
 
-        # o_joints = [f.to_brep() for f in faces]
-        # o_sides = [f.to_brep() for f in faces]
+        # # o_joints = [f.to_brep() for f in faces]
+        # # o_sides = [f.to_brep() for f in faces]
 
-        o_xml = ""
-        o_joints = []
-        o_sides = []
+        # o_xml = ""
+        # o_joints = []
+        # o_sides = []
 
-        for f in faces:
-            if f[1] != None:
-                o_joints.append(f[0])
-            else:
-                o_sides.append(f[0])
+        # for f in faces:
+        #     if f[1] != None:
+        #         o_joints.append(f[0])
+        #     else:
+        #         o_sides.append(f[0])
 
 
 

src/gh/diffCheck/diffCheck/__pycache__/df_geometries.cpython-39.pyc

@@ -1,3 +1,4 @@
+
 import Rhino
 import scriptcontext as sc
 import Rhino.Geometry as rg
@@ -10,8 +11,6 @@
 
 from Grasshopper.Kernel import GH_RuntimeMessageLevel as RML
 
-# import numpy as np
-
 
 @dataclass
 class JointDetector:
@@ -31,29 +30,12 @@ def __post_init__(self):
         # list of DFFaces from joints and sides
         self._faces = []
 
-        # debug list of various geometries
-        self._debug = []
-
     def _compute_mass_center(self, b_face: rg.BrepFace) -> rg.Point3d:
         """
-        Compute the mass center of a brep face in 3d space
-
+        Compute the mass center of a brep face
         :param b_face: The brep face to compute the mass center from
         :return mass_center: The mass center of the brep face
         """
-        # vertices = b_face.DuplicateFace(False).DuplicateVertices()
-
-        # points_x = [v.X for v in vertices]
-        # points_y = [v.Y for v in vertices]
-        # points_z = [v.Z for v in vertices]
-        # points_xyz = np.array([points_x, points_y, points_z])
-
-
-        # centroid = np.mean(points_xyz, axis=1)
-
-        # return rg.Point3d(centroid[0], centroid[1], centroid[2])
-
-
         amp = rg.AreaMassProperties.Compute(b_face)
         if amp:
             return amp.Centroid
@@ -62,7 +44,6 @@ def _compute_mass_center(self, b_face: rg.BrepFace) -> rg.Point3d:
     def run(self) :
         """
             Run the joint detector
-
             :return: a list of faces from joins and faces
         """
         ############################################################################
@@ -104,6 +85,7 @@ def run(self) :
                 if not f.IsPlanar():
                     is_cut = False
                     is_hole = True
+
                     b_faces = diffCheck.df_util.explode_brep(b)
                     for b_face in b_faces:
                         if b_face.Faces[0].IsPlanar():
@@ -129,7 +111,7 @@ def run(self) :
             is_hole = False
             is_cut = False
             is_mix = False
-        
+
         # deal with mix
         candidate_cuts = []
         candidate_holes = []
@@ -152,10 +134,10 @@ def run(self) :
                     flat_faces_b.append(f_b)
                 else:
                     non_flat_faces_b.append(f_b)
-    
+
             # (*) cap the cylinders
             non_flat_faces_b = [f_b.CapPlanarHoles(sc.doc.ModelAbsoluteTolerance) for f_b in non_flat_faces_b]
-            
+
             # (4) boolunion every object in both lists
             flat_faces_b = Rhino.Geometry.Brep.CreateBooleanUnion(flat_faces_b, sc.doc.ModelAbsoluteTolerance)
             non_flat_faces_b = Rhino.Geometry.Brep.CreateBooleanUnion(non_flat_faces_b, sc.doc.ModelAbsoluteTolerance)
@@ -184,17 +166,13 @@ def run(self) :
         # 3. Sort faces from joints and faces from sides
         ############################################################################
         # retransform back everything
-        # for b in self._holes:
-        #     b.Transform(x_form_back)
-        # for b in self._cuts:
-        #     b.Transform(x_form_back)
-        # for b in self._mix:
-        #     b.Transform(x_form_back)
-        # self.brep.Transform(x_form_back)
-
-        # TODO: get rid debugging
-        # bbox_b.Transform(x_form_back)
-        self._debug.append(bbox_b)
+        for b in self._holes:
+            b.Transform(x_form_back)
+        for b in self._cuts:
+            b.Transform(x_form_back)
+        for b in self._mix:
+            b.Transform(x_form_back)
+        self.brep.Transform(x_form_back)
 
         # get all the medians of the faces of cuts only
         cuts_faces_centroids : typing.Dict[int, typing.List[rg.Point3d]] = {}
@@ -204,7 +182,6 @@ def run(self) :
             for f in b.Faces:
                 centroid = self._compute_mass_center(f)
                 temp_face_centroids.append(centroid)
-                self._debug.append(centroid)
             cuts_faces_centroids[idx] = temp_face_centroids
 
         # compare with the brep medians faces to get the joint/sides's faces
@@ -225,4 +202,4 @@ def run(self) :
         if self._faces is None or len(self._faces) == 0:
             ghenv.Component.AddRuntimeMessage(RML.Error, "No faces found after joint detection.")
 
-        return self._faces, self._debug
+        return self._faces