FIX-MERGE: linter fixes + merge from eleni's branch

Author: 9and3

.pre-commit-config.yaml

@@ -25,7 +25,7 @@ repos:
     files: \.py$
 
 - repo: https://github.com/pre-commit/mirrors-mypy
-  rev: 'v1.11.0'
+  rev: 'v1.11.1'
   hooks:
   - id: mypy
     files: (src/gh|tests|invokes\.py)
@@ -39,6 +39,6 @@ repos:
     args: [--config=pyproject.toml]
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.4.4
+  rev: v0.6.2
   hooks:
   - id: ruff

deps/eigen

@@ -6,7 +6,8 @@ exclude = [
     "src/gh/components",
     "src/gh/diffCheck/setup.py",
     "temp",
-    "doc"
+    "doc",
+    "src/gh/diffCheck/diffCheck/__init__.py"
 ]
 
 [[tool.mypy.overrides]]
@@ -18,18 +19,27 @@ module = [
     "System.*",
     "GH_IO.*",
     "clr.*",
-    "diffcheck_bindings"
+    "diffcheck_bindings",
+    "diffCheck.diffcheck_bindings"
 ]
 ignore_missing_imports = true
 
 [[tool.mypy.overrides]]
 module = "pefile"
 ignore_missing_imports = true
 
+[[tool.mypy.overrides]]
+module = "diffCheck"
+ignore_undefined_attributes = true
+
+
 
 [tool.ruff]
 exclude = [
     "doc/",
     "deps/",
     "temp/"
-]
+]
+
+[tool.ruff.per-file-ignores]
+"src/gh/diffCheck/diffCheck/__init__.py" = ["F401", "F403" ,"E402"]

deps/googletest

@@ -4,18 +4,18 @@
 
 import Rhino.Geometry as rg
 from ghpythonlib.componentbase import executingcomponent as component
-
+from Grasshopper.Kernel import GH_RuntimeMessageLevel as RML
 
 import diffCheck
 from diffCheck import df_cvt_bindings
 from diffCheck import df_error_estimation
-from diffCheck.df_geometries import DFBeam
+from diffCheck.df_geometries import DFAssembly
 
 
 class DFCloudMeshDistance(component):
     def RunScript(self,
         i_cloud_source: typing.List[rg.PointCloud],
-        i_beams: typing.List[DFBeam],
+        i_assembly: DFAssembly,
         i_signed_flag: bool,
         i_swap: bool,
         i_analysis_resolution):
@@ -24,9 +24,20 @@ def RunScript(self,
             scalef = diffCheck.df_util.get_doc_2_meters_unitf()
             i_analysis_resolution = 0.1 / scalef
 
+        # Based on cloud source input + beam size, decide whether to calculate joints or entire assembly and output respective message
+        if len(i_assembly.beams) == len(i_cloud_source):
+            ghenv.Component.Message = "Per Beam"  # noqa: F821
+            rh_mesh_target_list = [beam.to_mesh(i_analysis_resolution) for beam in i_assembly.beams]
+        elif len(i_assembly.all_joints) == len(i_cloud_source):
+            ghenv.Component.Message = "Per Joint"  # noqa: F821
+            rh_mesh_target_list = [joint.to_mesh(i_analysis_resolution) for joint in i_assembly._all_joints]
+        else:
+            ghenv.Component.AddRuntimeMessage(RML.Warning, "The input number of objects to compare matches neither the number of beams nor the number of joints")  # noqa: F821
+            return None, None, None, None, None, None
+
         # conversion
         df_cloud_source_list = [df_cvt_bindings.cvt_rhcloud_2_dfcloud(i_cl_s) for i_cl_s in i_cloud_source]
-        rh_mesh_target_list = [beam.to_mesh(i_analysis_resolution) for beam in i_beams]
+
 
         # calculate distances
         o_result = df_error_estimation.df_cloud_2_rh_mesh_comparison(df_cloud_source_list, rh_mesh_target_list, i_signed_flag, i_swap)

deps/pybind11

@@ -5,7 +5,7 @@
     "subcategory": "Analysis",
     "description": "Computes the distance between a point cloud and a mesh",
     "exposure": 4,
-    "instanceGuid": "534a24ba-7e32-482f-a3d7-293647185122",
+    "instanceGuid": "eda01e34-b89b-4e3c-a9b6-0178a05ae81b",
     "ghpython": {
         "hideOutput": true,
         "hideInput": true,
@@ -26,13 +26,13 @@
                 "typeHintID": "pointcloud"
             },
             {
-                "name": "i_beams",
-                "nickname": "i_beams",
-                "description": "The target DFbeams",
+                "name": "i_assembly",
+                "nickname": "i_assembly",
+                "description": "The target DFAssembly",
                 "optional": false,
                 "allowTreeAccess": true,
                 "showTypeHints": true,
-                "scriptParamAccess": "list",
+                "scriptParamAccess": "item",
                 "wireDisplay": "default",
                 "sourceCount": 0,
                 "typeHintID": "ghdoc"

pyproject.toml

@@ -2,6 +2,7 @@
 
 import Rhino
 
+import diffCheck
 from diffCheck import diffcheck_bindings
 from diffCheck import df_cvt_bindings as df_cvt
 
@@ -15,20 +16,22 @@
 class DFJointSegmentator(component):
     def __init__(self):
         super(DFJointSegmentator, self).__init__()
-    def RunScript(self, 
-                  i_clusters: typing.List[Rhino.Geometry.PointCloud], 
+    def RunScript(self,
+                  i_clusters: typing.List[Rhino.Geometry.PointCloud],
                   i_assembly: diffCheck.df_geometries.DFAssembly,
                   i_angle_threshold: float,
                   i_distance_threshold: float):
 
-        if i_angle_threshold is None : i_angle_threshold = 0.1
-        if i_distance_threshold is None : i_distance_threshold = 0.1
-        
+        if i_angle_threshold is None:
+            i_angle_threshold = 0.1
+        if i_distance_threshold is None:
+            i_distance_threshold = 0.1
+
         if len(i_clusters) == 0:
             raise ValueError("No clusters given.")
         if not isinstance(i_clusters[0], Rhino.Geometry.PointCloud):
             raise ValueError("The input clusters must be PointClouds.")
-            
+
         # get number of joints
         n_joints = i_assembly.total_number_joints
 
@@ -60,13 +63,13 @@ def RunScript(self,
             # find the corresponding clusters and merge them
             df_joint_segment = diffcheck_bindings.dfb_segmentation.DFSegmentation.associate_clusters(df_joint, df_cloud_clusters, i_angle_threshold, i_distance_threshold)
             diffcheck_bindings.dfb_segmentation.DFSegmentation.clean_unassociated_clusters(df_cloud_clusters, [df_joint_segment], [df_joint], i_angle_threshold, i_distance_threshold)
-            
+
             # register the merged clusters to the reference point cloud
             registration = diffcheck_bindings.dfb_registrations.DFRefinedRegistration.O3DICP(df_joint_segment, ref_df_joint_cloud)
             res = registration.transformation_matrix
             transforms.append(df_cvt.cvt_ndarray_2_rh_transform(res))
             rh_joint_segments.append(df_cvt.cvt_dfcloud_2_rhcloud(df_joint_segment))
-        
+
         o_joint_segments = []
         o_transforms = []
         o_reference_point_clouds = []
@@ -76,6 +79,6 @@ def RunScript(self,
                 o_transforms.append(transform)
                 o_reference_point_clouds.append(_joint_cloud)
             else:
-                ghenv.Component.AddRuntimeMessage(RML.Warning, "Some joints could not be segmented and were ignored.")
+                ghenv.Component.AddRuntimeMessage(RML.Warning, "Some joints could not be segmented and were ignored.")  # noqa: F821
 
-        return o_joint_segments, o_transforms, o_reference_point_clouds
+        return o_joint_segments, o_transforms, o_reference_point_clouds

src/gh/components/DF_cloud_mesh_distance/code.py

@@ -8,4 +8,5 @@
 os.add_dll_directory(extra_dll_dir)
 
 # import the bindings
-from . import diffcheck_bindings
+from . import diffcheck_bindings  # type: ignore[attr-defined]
+from . import df_cvt_bindings  # type: ignore[attr-defined]

src/gh/components/DF_cloud_mesh_distance/metadata.json

@@ -360,7 +360,7 @@ def __post_init__(self):
         self._all_sidefaces: typing.List[DFFace] = []
 
         self._all_joints: typing.List[DFJoint] = []
-        
+
     def __repr__(self):
         return f"Assembly: {self.name}, Beams: {len(self.beams)}"
 
@@ -451,4 +451,4 @@ def all_joints(self):
         self._all_joints = []
         for beam in self.beams:
             self._all_joints.extend(beam.joints)
-        return self._all_joints
+        return self._all_joints