Merge remote-tracking branch 'origin/fix_registration_metadata'

Author: 9and3

src/gh/components/DF_fast_global_registration/code.py

@@ -6,10 +6,8 @@
 
 from Grasshopper.Kernel import GH_RuntimeMessageLevel as RML
 
-import diffCheck
 from diffCheck import diffcheck_bindings
 from diffCheck import df_cvt_bindings
-import diffCheck.df_util
 
 
 class DFFastGlobalRegistration(component):
@@ -22,9 +20,12 @@ def RunScript(self,
         i_iteration_number: int,
         i_max_tuple_count: int
     ) -> rg.Transform:
+        # preliminary checks
         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 align")  # noqa: F821
             return None
+        if not i_cloud_source.ContainsNormals or not i_cloud_target.ContainsNormals:
+            ghenv.Component.AddRuntimeMessage(RML.Error, "Please compute cloud's normals with a component before")  # noqa: F821
 
         # set default values
         if i_radius_kd_search is None:
@@ -38,11 +39,6 @@ def RunScript(self,
         if i_max_tuple_count is None:
             i_max_tuple_count = 1000
 
-        # get the working unit of the Rhino document, if other than meters, set a multiplier factor
-        scalef = diffCheck.df_util.get_doc_2_meters_unitf()
-        i_radius_kd_search *= scalef
-        i_max_corrspondence_dist *= scalef
-
         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)
 

src/gh/components/DF_fast_global_registration/metadata.json

@@ -13,18 +13,6 @@
         "marshalOutGuids": true,
         "iconDisplay": 2,
         "inputParameters": [
-            {
-                "name": "i_recompute",
-                "nickname": "i_recompute",
-                "description": "Connect a button to recompute the registration.",
-                "optional": true,
-                "allowTreeAccess": true,
-                "showTypeHints": true,
-                "scriptParamAccess": "item",
-                "wireDisplay": "default",
-                "sourceCount": 0,
-                "typeHintID": "bool"
-            },
             {
                 "name": "i_cloud_source",
                 "nickname": "i_cloud_source",

src/gh/components/DF_icp_registration/code.py

@@ -6,10 +6,8 @@
 
 from Grasshopper.Kernel import GH_RuntimeMessageLevel as RML
 
-import diffCheck
 from diffCheck import diffcheck_bindings
 from diffCheck import df_cvt_bindings
-import diffCheck.df_util
 
 
 class DFICPRegistration(component):
@@ -25,9 +23,12 @@ def RunScript(self,
         is_t_estimate_pt2pt: bool,  # valid only for 03dicp
         i_use_point_to_plane: bool  # valid only for 03dicp
     ) -> rg.Transform:
+        # preliminary checks
         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 align")  # noqa: F821
             return None
+        if not i_cloud_source.ContainsNormals or not i_cloud_target.ContainsNormals:
+            ghenv.Component.AddRuntimeMessage(RML.Error, "Please compute cloud's normals with a component before")  # noqa: F821
 
         # set default values
         if i_use_generalized_icp is None:
@@ -37,10 +38,6 @@ def RunScript(self,
         if i_max_iteration is None:
             i_max_iteration = 50
 
-        # get the working unit of the Rhino document, if other than meters, set a multiplier factor
-        scalef = diffCheck.df_util.get_doc_2_meters_unitf()
-        i_max_corrspondence_dist *= scalef
-
         # 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)

src/gh/components/DF_icp_registration/metadata.json

@@ -13,18 +13,6 @@
         "marshalOutGuids": true,
         "iconDisplay": 2,
         "inputParameters": [
-            {
-                "name": "i_recompute",
-                "nickname": "i_recompute",
-                "description": "Connect a button to recompute the registration.",
-                "optional": true,
-                "allowTreeAccess": true,
-                "showTypeHints": true,
-                "scriptParamAccess": "item",
-                "wireDisplay": "default",
-                "sourceCount": 0,
-                "typeHintID": "bool"
-            },
             {
                 "name": "i_use_generalized_icp",
                 "nickname": "i_use_generalized_icp",

src/gh/components/DF_ransac_global_registration/code.py

@@ -6,10 +6,9 @@
 
 from Grasshopper.Kernel import GH_RuntimeMessageLevel as RML
 
-import diffCheck
 from diffCheck import diffcheck_bindings
 from diffCheck import df_cvt_bindings
-import diffCheck.df_util
+
 
 class DFRANSACGlobalRegistration(component):
     def RunScript(self,
@@ -25,9 +24,12 @@ def RunScript(self,
         i_max_iterations: int,
         i_confidence_threshold: float
     ) -> rg.Transform:
+        # preliminary checks
         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 align")  # noqa: F821
             return None
+        if not i_cloud_source.ContainsNormals or not i_cloud_target.ContainsNormals:
+            ghenv.Component.AddRuntimeMessage(RML.Error, "Please compute cloud's normals with a component before")  # noqa: F821
 
         # set default values
         if i_radius_kd_search is None:
@@ -49,12 +51,6 @@ def RunScript(self,
         if i_confidence_threshold is None:
             i_confidence_threshold = 0.999
 
-        # get the working unit of the Rhino document, if other than meters, set a multiplier factor
-        scalef = diffCheck.df_util.get_doc_2_meters_unitf()
-        i_radius_kd_search *= scalef
-        i_max_corrspondence_dist *= scalef
-        i_checker_dist *= scalef
-
         # 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)

src/gh/components/DF_ransac_global_registration/metadata.json

@@ -13,18 +13,6 @@
         "marshalOutGuids": true,
         "iconDisplay": 2,
         "inputParameters": [
-            {
-                "name": "i_recompute",
-                "nickname": "i_recompute",
-                "description": "Connect a button to recompute the registration.",
-                "optional": true,
-                "allowTreeAccess": true,
-                "showTypeHints": true,
-                "scriptParamAccess": "item",
-                "wireDisplay": "default",
-                "sourceCount": 0,
-                "typeHintID": "bool"
-            },
             {
                 "name": "i_cloud_source",
                 "nickname": "i_cloud_source",

src/gh/components/DF_tester/code.py

@@ -11,14 +11,22 @@
 
 class DFTester(component):
     def RunScript(self):
+        # version
         ghenv.Component.Message = f"diffCheck v: {diffCheck.__version__}"  # noqa: F821
-        is_binding_imported = diffcheck_bindings.dfb_test.test()
 
+        # bindings
+        is_binding_imported = diffcheck_bindings.dfb_test.test()
         if not is_binding_imported:
             ghenv.Component.AddRuntimeMessage(RML.Warning, "Bindings not imported.")  # noqa: F821
         else:
             ghenv.Component.AddRuntimeMessage(RML.Remark, "Bindings imported.")  # noqa: F821
-
         print(f"diffCheck test: {diffCheck.df_cvt_bindings.test_bindings()}")
 
+        # workspace unit
+        scalef = diffCheck.df_util.get_doc_2_meters_unitf()
+        if scalef != 1.0:
+            ghenv.Component.AddRuntimeMessage(RML.Warning, "Workspace unit is not in meters.")  # noqa: F821
+        else:
+            ghenv.Component.AddRuntimeMessage(RML.Remark, "Workspace unit is in meters.")  # noqa: F821
+
         return is_binding_imported