WIP FIX distance calculations

Author: eleniv3d

src/gh/components/DF_cloud_to_cloud_distance/code.py

@@ -21,14 +21,12 @@
 class CloudToCloudDistance(component):
     def RunScript(self,
         i_cloud_source: rg.PointCloud,
-        i_cloud_target: rg.PointCloud,
-        i_signed_flag: bool):
+        i_cloud_target: rg.PointCloud):
         """
             The cloud-to-cloud component computes the distance between each point in the source point cloud and its nearest neighbour in thr target point cloud.
 
             :param i_cloud_source: source point cloud
             :param i_cloud_target: target point cloud to align to
-            :param i_signed_flag: whether to take normals into account
 
             :return o_distances : list of calculated distances for each point
             :return o_mse: the average squared difference between corresponding points of source and target
@@ -39,17 +37,13 @@ def RunScript(self,
         if i_cloud_source is None or i_cloud_target is None:
             ghenv.Component.AddRuntimeMessage(RML.Warning, "Please provide both objects of type point clouds to compare")
             return None
-        
-        if i_signed_flag and not i_cloud_target.ContainsNormals:
-            ghenv.Component.AddRuntimeMessage(RML.Warning, "Please provide a target point cloud with normals or assign false to i_signed_flag")
-            return None
 
         # conversion
         df_cloud_source = df_cvt_bindings.cvt_rhcloud_2_dfcloud(i_cloud_source)
         df_cloud_target = df_cvt_bindings.cvt_rhcloud_2_dfcloud(i_cloud_target)
 
         # calculate distances
-        o_distances = df_error_estimation.cloud_2_cloud_distance(df_cloud_source, df_cloud_target, i_signed_flag)
+        o_distances = df_error_estimation.cloud_2_cloud_distance(df_cloud_source, df_cloud_target)
         o_mse = df_error_estimation.compute_mse(o_distances)
         o_max_deviation = df_error_estimation.compute_max_deviation(o_distances)
         o_min_deviation = df_error_estimation.compute_min_deviation(o_distances)
@@ -62,6 +56,5 @@ def RunScript(self,
     com = CloudToCloudDistance()
     o_distances, o_mse, o_max_deviation, o_min_deviation, o_std_deviation = com.RunScript(
         i_cloud_source,
-        i_cloud_target,
-        i_signed_flag
+        i_cloud_target
         )

src/gh/components/DF_cloud_to_mesh_distance/code.py

@@ -39,20 +39,22 @@ def RunScript(self,
         # conversion
         df_cloud_source = df_cvt_bindings.cvt_rhcloud_2_dfcloud(i_cloud_source)
         i_mesh_target = i_beam.to_mesh()
-        df_mesh_target = df_cvt_bindings.cvt_rhmesh_2_dfmesh(i_mesh_target)
+        #df_mesh_target = df_cvt_bindings.cvt_rhmesh_2_dfmesh(i_mesh_target)
 
         # calculate distances
-        o_distances = df_error_estimation.cloud_2_mesh_distance(df_cloud_source, df_mesh_target, i_signed_flag)
-        o_mse = df_error_estimation.compute_mse(o_distances)
-        o_max_deviation = df_error_estimation.compute_max_deviation(o_distances)
-        o_min_deviation = df_error_estimation.compute_min_deviation(o_distances)
+        #o_distances = df_error_estimation.cloud_2_mesh_distance(df_cloud_source, df_mesh_target, i_signed_flag)
+        #o_mse = df_error_estimation.compute_mse(o_distances)
+        #o_max_deviation = df_error_estimation.compute_max_deviation(o_distances)
+        #o_min_deviation = df_error_estimation.compute_min_deviation(o_distances)
 
-        return o_distances.tolist(), o_mse, o_max_deviation, o_min_deviation
+        o_mesh = i_mesh_target
+        #return o_distances.tolist(), o_mse, o_max_deviation, o_min_deviation, o_mesh
+        return 0, 0, 0, 0, o_mesh
 
 
 if __name__ == "__main__":
     com = CloudToMeshDistance()
-    o_distances, o_mse, o_max_deviation, o_min_deviation = com.RunScript(
+    o_distances, o_mse, o_max_deviation, o_min_deviation, o_mesh = com.RunScript(
         i_cloud_source,
         i_mesh_target,
         i_signed_flag

src/gh/diffCheck/diffCheck/df_error_estimation.py

@@ -11,10 +11,7 @@ def cloud_2_cloud_distance(source, target, signed=False):
     """
         Compute the Euclidean distance for every point of a source pcd to its closest point on a target pointcloud
     """
-    if signed:
-        distances = np.asarray(source.compute_distance(target, is_abs=False))
-    else:
-        distances = np.asarray(source.compute_distance(target, is_abs=True))
+    distances = np.asarray(source.compute_distance(target))
 
     return distances
 

src/gh/diffCheck/diffCheck/df_geometries.py

@@ -233,7 +233,7 @@ def to_brep(self):
         """
         brep = rg.Brep()
         for face in self.faces:
-            brep.Append(face.to_brep_face())
+            brep.Append(face.to_brep_face().ToBrep())
         brep.Compact()
 
         return brep
@@ -242,13 +242,21 @@ def to_mesh(self):
         """
         Convert the beam to a Rhino Mesh object
         """
-        mesh = rg.Mesh()
-        for face in self.faces:
-            mesh_part = face.to_mesh()
-            mesh.Append(mesh_part)
-            mesh.Compact()
+        # mesh = rg.Mesh()
+        o_side_faces = [f.to_brep_face() for f in self.side_faces]
+        o_joint_faces = [f.to_brep_face() for f in self.joint_faces]
+        rhino_brep_faces = o_side_faces + o_joint_faces
 
-        return mesh
+        brep = rg.Brep()
+
+        for f in rhino_brep_faces:
+            #from dfbeam face to mesh
+            brep.Faces.Add(f)
+            #mesh_part = rg.CreateFromBrep(face.ToBrep(), rg.MeshingParameters.Coarse)
+            #mesh.Append(mesh_part)
+            #mesh.Compact()
+
+        return rhino_brep_faces
 
     def __repr__(self):
         return f"Beam: {self.name}, Faces: {len(self.faces)}"