FIX a lot of minor fixes

eleniv3d · eleniv3d · commit cdb04c40372e · 2024-07-31T08:31:48.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -247,5 +247,3 @@ cython_debug/
 
 # egg-info
 *.egg-info/
-deps/eigen
-deps/pybind11
diff --git a/deps/eigen b/deps/eigen
@@ -1 +1 @@
-Subproject commit c29c800126982c561e8d0b9255dc65474cd98de3
+Subproject commit 3f06651fd65e176c8ad4c5b73f013132386d4c58
diff --git a/deps/pybind11 b/deps/pybind11
@@ -1 +1 @@
-Subproject commit 8e7307f0699726c29f5bdc2c177dd55b6b330061
+Subproject commit 723307283ed7dc03c901fba1da1127c7b16a4a0d
diff --git a/src/gh/components/DF_cloud_cloud_distance/code.py b/src/gh/components/DF_cloud_cloud_distance/code.py
@@ -51,7 +51,7 @@ def RunScript(self,
         df_cloud_target_list = [df_cvt_bindings.cvt_rhcloud_2_dfcloud(i_cl_t) for i_cl_t in i_cloud_target]
 
         # calculate distances
-        o_results = df_error_estimation.cloud_2_cloud_comparison(df_cloud_source_list, df_cloud_target_list)
+        o_results = df_error_estimation.df_cloud_2_df_cloud_comparison(df_cloud_source_list, df_cloud_target_list)
 
         return o_results.distances, o_results.distances_rmse, o_results.distances_max_deviation, o_results.distances_min_deviation, o_results.distances_sd_deviation, o_results
 
diff --git a/src/gh/components/DF_cloud_cloud_distance/metadata.json b/src/gh/components/DF_cloud_cloud_distance/metadata.json
@@ -92,8 +92,8 @@
                 "graft": false
             },
             {
-                "name": "o_results",
-                "nickname": "o_results",
+                "name": "o_result",
+                "nickname": "o_result",
                 "description": "The result of the distance calculation.",
                 "optional": false,
                 "sourceCount": 0,
diff --git a/src/gh/components/DF_cloud_mesh_distance/code.py b/src/gh/components/DF_cloud_mesh_distance/code.py
@@ -44,17 +44,17 @@ def RunScript(self,
 
         # conversion
         df_cloud_source_list = [df_cvt_bindings.cvt_rhcloud_2_dfcloud(i_cl_s) for i_cl_s in i_cloud_source]
-        df_mesh_target_list = [beam.to_mesh(i_analysis_resolution) for beam in i_beams]
+        rh_mesh_target_list = [beam.to_mesh(i_analysis_resolution) for beam in i_beams]
 
         # calculate distances
-        o_result = df_error_estimation.cloud_2_rhino_mesh_comparison(df_cloud_source_list, df_mesh_target_list, i_signed_flag, i_swap)
+        o_result = df_error_estimation.df_cloud_2_rh_mesh_comparison(df_cloud_source_list, rh_mesh_target_list, i_signed_flag, i_swap)
 
-        return o_result.distances, o_result.distances_mse, o_result.distances_max_deviation, o_result.distances_min_deviation, o_result.distances_sd_deviation, o_result
+        return o_result.distances, o_result.distances_rmse, o_result.distances_max_deviation, o_result.distances_min_deviation, o_result.distances_sd_deviation, o_result
 
 
 # if __name__ == "__main__":
 #     com = CloudMeshDistance()
-#     o_distances, o_mse, o_max_deviation, o_min_deviation, o_std_deviation, o_results = com.RunScript(
+#     o_distances, o_rmse, o_max_deviation, o_min_deviation, o_std_deviation, o_results = com.RunScript(
 #         i_cloud_source,
 #         i_beams,
 #         i_signed_flag,
diff --git a/src/gh/components/DF_cvs_exporter/code.py b/src/gh/components/DF_cvs_exporter/code.py
@@ -9,7 +9,7 @@
 
 import Grasshopper as gh
 from Grasshopper.Kernel import GH_RuntimeMessageLevel as RML
-
+from diffCheck.df_error_estimation import DFVizResults
 import csv
 import os
 
@@ -18,29 +18,42 @@ class CsvExporter(component):
     def RunScript(self,
         i_dump: bool,
         i_export_dir: str,
-        i_results):
+        i_file_name: str,
+        i_export_seperate_files: bool,
+        i_result: DFVizResults):
         """
             The csv-exporter component exports a list of values to a .csv file
 
             :param i_dump: A flag indicating whether to perform the export.
             :param i_export_dir: The directory where the CSV file will be saved.
+            :param i_file_name: The name of the file
+            :param i_export_seperate_files: whether to export a different file for each part
             :param i_values: A list of values to be exported.
+
+            :return o_success: A string notifying the user for the successful export
         """
         if i_dump:
             # Ensure the export directory exists
             os.makedirs(i_export_dir, exist_ok=True)
 
-            # Define the CSV file path
-            file_path = os.path.join(i_export_dir, 'exported_values.csv')
+            if i_export_seperate_files:
+                # Export each list of values to a separate file
+                for idx, list_of_values in enumerate(i_result.distances):
+                    file_name = f"{i_file_name}_{idx + 1}.csv"
+                    file_path = os.path.join(i_export_dir, file_name)
+                    with open(file_path, mode='w', newline='') as file:
+                        writer = csv.writer(file)
+                        writer.writerow([list_of_values])
+            else:
+                # Export all values to a single file
+                file_path = os.path.join(i_export_dir, f"{i_file_name}.csv")
+                with open(file_path, mode='w', newline='') as file:
+                    writer = csv.writer(file)
+                    for list_of_values in i_result.distances:
+                        writer.writerow([list_of_values])
 
-            # Write the values to the CSV file
-            with open(file_path, mode='w', newline='') as file:
-                writer = csv.writer(file)
-                for list_of_values in i_results.distances:
-                    writer.writerow([list_of_values])
-            
             o_success = "Successfully exported the values"
-            
+
             return o_success
 
 
@@ -49,5 +62,7 @@ def RunScript(self,
 #     o_cvs = com.RunScript(
 #         i_dump,
 #         i_export_dir,
+#         i_file_name,
+#         i_export_seperate_files,
 #         i_results
 #     )
diff --git a/src/gh/components/DF_cvs_exporter/metadata.json b/src/gh/components/DF_cvs_exporter/metadata.json
@@ -38,8 +38,32 @@
                 "typeHintID": "str"
             },
             {
-                "name": "i_results",
-                "nickname": "i_results",
+                "name": "i_file_name",
+                "nickname": "i_file_name",
+                "description": "The name for the file.",
+                "optional": true,
+                "allowTreeAccess": true,
+                "showTypeHints": true,
+                "scriptParamAccess": "item",
+                "wireDisplay": "default",
+                "sourceCount": 0,
+                "typeHintID": "str"
+            },
+            {
+                "name": "i_export_seperate_files",
+                "nickname": "i_export_seperate_file",
+                "description": "Whether to export one single file or seperate files per element.",
+                "optional": true,
+                "allowTreeAccess": true,
+                "showTypeHints": true,
+                "scriptParamAccess": "item",
+                "wireDisplay": "default",
+                "sourceCount": 0,
+                "typeHintID": "bool"
+            },
+            {
+                "name": "i_result",
+                "nickname": "i_result",
                 "description": "The result of the distance calculation to export",
                 "optional": false,
                 "allowTreeAccess": true,
diff --git a/src/gh/components/DF_visualization/code.py b/src/gh/components/DF_visualization/code.py
@@ -14,6 +14,7 @@
 from diffCheck import df_visualization
 from diffCheck.df_visualization import DFVizSettings
 from diffCheck.df_error_estimation import DFVizResults
+from diffCheck import diffcheck_bindings
 
 class Visualization(component):
     def RunScript(self,
diff --git a/src/gh/components/DF_visualization_settings/code.py b/src/gh/components/DF_visualization_settings/code.py
@@ -38,8 +38,16 @@ def RunScript(self,
         :returns o_viz_settings: the results of the comparison all in one object
         """
 
+        
+        if i_palette not in  ["Jet", "Rainbow", "RdPu", "Viridis"]:
+            ghenv.Component.AddRuntimeMessage(RML.Warning, "Possible values for i_palette are: Jet, Rainbow, RdPu, Viridis")
+            return None
+        
+        if i_value_type not in  ["Dist", "RMSE", "MAX", "MIN", "STD"]:
+            ghenv.Component.AddRuntimeMessage(RML.Warning, "Possible values for i_value_type are: dist, RMSE, MAX, MIN, STD")
+            return None
+        
         # set default values
-        if i_palette is None: i_palette = "Jet"
         if i_legend_height is None: i_legend_height = 10
         if i_legend_width is None: i_legend_width = 0.5
         if i_legend_plane is None: i_legend_plane = rg.Plane.WorldXY
diff --git a/src/gh/diffCheck/diffCheck.egg-info/SOURCES.txt b/src/gh/diffCheck/diffCheck.egg-info/SOURCES.txt
@@ -7,7 +7,7 @@ diffCheck/df_geometries.py
 diffCheck/df_joint_detector.py
 diffCheck/df_transformations.py
 diffCheck/df_util.py
-diffCheck/df_vizualization.py
+diffCheck/df_visualization.py
 diffCheck/diffcheck_bindings.cp39-win_amd64.pyd
 diffCheck.egg-info/PKG-INFO
 diffCheck.egg-info/SOURCES.txt
diff --git a/src/gh/diffCheck/diffCheck/df_error_estimation.py b/src/gh/diffCheck/diffCheck/df_error_estimation.py
@@ -8,7 +8,7 @@
 import Rhino.Geometry as rg
 
 
-def cloud_2_cloud_comparison(source_list, target_list):
+def df_cloud_2_df_cloud_comparison(source_list, target_list):
     """
         Compute the Euclidean distance for every point of a source pcd to its
         closest point on a target pointcloud
@@ -21,7 +21,7 @@ def cloud_2_cloud_comparison(source_list, target_list):
     return results
 
 
-def cloud_2_rhino_mesh_comparison(cloud_source_list, rhino_mesh_target_list, signed_flag, swap):
+def df_cloud_2_rh_mesh_comparison(cloud_source_list, rhino_mesh_target_list, signed_flag, swap):
     """
         Computes distances between a pcd and a mesh
     """
@@ -30,10 +30,10 @@ def cloud_2_rhino_mesh_comparison(cloud_source_list, rhino_mesh_target_list, sig
     for source, target in zip(cloud_source_list, rhino_mesh_target_list):
         if swap:
             # this mean we want to visualize the result on the target mesh
-            distances = rhino_mesh_2_cloud_distance(target, source, signed_flag)
+            distances = rh_mesh_2_df_cloud_distance(target, source, signed_flag)
         else:
             # this means we want to visualize the result on the source pcd
-            distances = cloud_2_rhino_mesh_distance(source, target, signed_flag)
+            distances = df_cloud_2_rh_mesh_distance(source, target, signed_flag)
 
         if swap:
             results.add(target, source, distances)
@@ -43,7 +43,7 @@ def cloud_2_rhino_mesh_comparison(cloud_source_list, rhino_mesh_target_list, sig
     return results
 
 
-def rhino_mesh_2_cloud_distance(source, target, signed=False):
+def rh_mesh_2_df_cloud_distance(source, target, signed=False):
     """
         Calculate the distance between every vertex of a Rhino Mesh to its closest point on a PCD
     """
@@ -85,7 +85,7 @@ def search_callback(sender, e):
     return np.asarray(distances)
 
 
-def cloud_2_rhino_mesh_distance(source, target, signed=False):
+def df_cloud_2_rh_mesh_distance(source, target, signed=False):
     """
         Calculate the distance between every point of a source pcd to its closest point on a target Rhino Mesh
     """
diff --git a/src/gh/diffCheck/diffCheck/df_geometries.py b/src/gh/diffCheck/diffCheck/df_geometries.py
@@ -236,7 +236,7 @@ def to_brep(self):
         """
         brep = rg.Brep()
         for face in self.faces:
-            brep.Append(face.to_brep_face().ToBrep())
+            brep.Append(face.to_brep_face())
         brep.Compact()
 
         return brep
@@ -251,7 +251,6 @@ def to_mesh(self, max_edge_length):
         new_faces = [f.DuplicateFace(True) for f in rhino_brep_faces]  # .DuplicateFace bypasses the problem of untrimmed faces that appear in f.to_brep_face
 
         for f in new_faces:
-
             param = rg.MeshingParameters()
             param.MaximumEdgeLength = max_edge_length
             mesh_part = rg.Mesh.CreateFromBrep(f, param)[0] #returns a list of meshes with one element
diff --git a/src/gh/diffCheck/diffCheck/df_visualization.py b/src/gh/diffCheck/diffCheck/df_visualization.py
diff --git a/src/gh/examples/error_viz_tester_components.ghx b/src/gh/examples/error_viz_tester_components.ghx
