Skip to content

FIX Assembly input for meshcloud Distance Calculation #66

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 24, 2024
Merged

FIX Assembly input for meshcloud Distance Calculation #66

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c902c33
FIX assembly input for meshcloud distance calculation
eleniv3d Aug 20, 2024
f3608c2
FIX typo
eleniv3d Aug 23, 2024
475353f
FIX remove docstrings to comply with documentation generation logic
eleniv3d Aug 23, 2024
8a0ade7
FIX take files out to avoid conflicts
eleniv3d Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deps/eigen
Open in desktop
Submodule eigen updated from 0b646f to cc240e
2 changes: 1 addition & 1 deletion deps/pybind11
Open in desktop
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you get our this from the PR to avoid conflicts please?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

okie. i deleted the folder in the last push. Let me know if there was a better way to take it out :)

Submodule pybind11 updated 33 files
+5 −5 .github/CONTRIBUTING.md
+2 −2 .github/workflows/configure.yml
+3 −3 .github/workflows/emscripten.yaml
+1 −1 .github/workflows/pip.yml
+4 −4 .pre-commit-config.yaml
+10 −47 CMakeLists.txt
+1 −1 docs/advanced/cast/eigen.rst
+1 −1 docs/advanced/embedding.rst
+92 −0 docs/changelog.rst
+20 −18 docs/compiling.rst
+8 −8 docs/faq.rst
+1 −1 include/pybind11/detail/common.h
+45 −34 include/pybind11/functional.h
+251 −51 include/pybind11/stl.h
+26 −3 pybind11/__main__.py
+18 −33 tests/CMakeLists.txt
+0 −1 tests/extra_python_package/test_files.py
+1 −10 tests/test_cmake_build/installed_embed/CMakeLists.txt
+1 −11 tests/test_cmake_build/installed_function/CMakeLists.txt
+1 −10 tests/test_cmake_build/installed_target/CMakeLists.txt
+1 −10 tests/test_cmake_build/subdirectory_embed/CMakeLists.txt
+1 −10 tests/test_cmake_build/subdirectory_function/CMakeLists.txt
+1 −10 tests/test_cmake_build/subdirectory_target/CMakeLists.txt
+51 −0 tests/test_stl.cpp
+133 −0 tests/test_stl.py
+46 −0 tests/test_type_caster_std_function_specializations.cpp
+15 −0 tests/test_type_caster_std_function_specializations.py
+40 −53 tools/pybind11Common.cmake
+1 −1 tools/pybind11Config.cmake.in
+1 −1 tools/pybind11GuessPythonExtSuffix.cmake
+0 −5 tools/pybind11NewTools.cmake
+14 −37 tools/pybind11Tools.cmake
+1 −1 tools/test-pybind11GuessPythonExtSuffix.cmake
19 changes: 15 additions & 4 deletions src/gh/components/DF_cloud_mesh_distance/code.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
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 CloudMeshDistance(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):
Expand All @@ -28,7 +28,7 @@ def RunScript(self,
The cloud-to-mesh component computes the distance between a point cloud and a mesh

:param i_cloud_source: a list of point clouds
:param i_beams: a list of DF beams
:param i_assembly: an assembly of DF beams
:param i_signed_flag: calculate the sign of the distances
:param i_swap: swap source and target

Expand All @@ -42,9 +42,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 = f"Per Beam"
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= f"Per Joint"
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 obejcts to compare matches neither the number of beams nor the number of joints")
Copy link
Collaborator

@DamienGilliard DamienGilliard Aug 23, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

small typo in the runtime message ;)

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

noted ;)

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)
Expand Down
10 changes: 5 additions & 5 deletions src/gh/components/DF_cloud_mesh_distance/metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -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"
Expand Down
Loading
Loading