adaptations for cylindical beams #65

DamienGilliard · 2024-08-17T17:23:43Z

This PR contains changes to make diffCheck work with cylindrical beams.

The main changes target:

the joint detector df_joint_detector.py
the segmentation backend to deal with faces that are not flat :

the method IsPointOnFace is skipped for the logs because it doesn't make sense in the case of round wood construction: > we assume we will never have 2 logs of exactly the same diameter, perfectly aligned along the same axis.

Change log:

DFMesh now has a GetCenterAndAxis method that is useful in the case of cylindrical meshes and is used in the DFSegmentation
DFMesh also had the IsPointOnFace method adapted to make it more robust
DFSegmentation had quite a lot of changes to accommodate two cases: standard case and log case. The two are differentiated by a flag IsCylinder as mathod parameter
The changes hereabove are reflected in the code.py of the segmentation components
df_joint_detector.py has had a few changes to: i) detect if we have a log or not, and ii) improve the joint detector itself that sometimes had some misses in complicated joints
df_util.py has a merge_shared_index that helps the joint detector with the joint_ids
DFBuildAssembiles now has a i_is_cylinder boolean parameter so signal is the assemply we are building is made out of logs or not
DFMergeAssemblies component created if you want to make an assembly by merging other assemblies. This is useful if you have a case where some beams are logs and others are squared. In that case you would make 2 assemblies, on with i_is_cylinder = True and the other False, then merge the two.
a small change was made to the MeshToCloud component to deal with "None" point clouds

No additional test was made, the changes are mainly reliant on rhino and difficult to test. If you see something to test during the review, let me know !!

DamienGilliard · 2024-08-17T17:27:14Z

Joint detector working with test data:

9and3 · 2024-08-17T20:26:07Z

Joint detector working with test data:

Nice! @DamienGilliard have you already tried also with square sections for compatibility by any chance?

… in code.py

…ethods

…ot useful here

…int_detector.py

…te association threshold

9and3 · 2024-09-10T09:02:57Z

Hello @DamienGilliard , following up our meeting I marked the issue about not taking in acoount the holes in the df_joint_detector.py, can you have a look to implement it plis? #96

DamienGilliard · 2024-09-12T13:33:43Z

joint_detector now excludes cylindrical holes

NB: if a real joint face was created with a cylinder (by boolean difference, for example), it will also be excluded (corner case).

Here 1 was created from a circle arc, 2 from a cylinder, and 3 from a nurbs

9and3 · 2024-09-12T15:52:50Z

NB: if a real joint face was created with a cylinder (by boolean difference, for example), it will also be excluded (corner case).

indeed correct. At least we keep the same limitation everywhere for curved elements. I really want to take the time to review this PR properly since it introduces some nice feats and changes, hold on please @DamienGilliard :)

DamienGilliard · 2024-09-21T13:28:47Z

New component added: DFMergeAssemblies:

Component modified: DFBuilAssembly now takes a "i_is_cylinder"
With small tweekings, the results are quite satisfactory:

…log cases

…o ci]

…osite assemblies (logs + squared)

DamienGilliard · 2024-09-22T14:07:14Z

@9and3 , @mariklad , @eleniv3d I believe this PR is (again ;) ) ready for review. It's a big one, sorry for that \(*.*)/

9and3

Hello @DamienGilliard ! I left my comments and feedback here and there. The biggest remark I have is on the choice of the name cylinder, I thought that it would make more sense to have "roundwood" since for the other we used beam, something more related to the type of timber rather than the shape.

Let's take the time to close this properly, we can also discuss tomorrow at the lab if needed ! 👐

doc/gh_components.rst

src/diffCheck/geometry/DFMesh.hh

src/gh/components/DF_CAD_segmentator/code.py

9and3 · 2024-09-22T19:43:47Z

src/gh/components/DF_cloud_mesh_distance/code.py

+        siffed_df_cloud_source_list = []
+        siffed_rh_mesh_target_list = []
+        for i in range(len(i_cloud_source)):
+            if i_cloud_source[i] is not None:
+                siffed_df_cloud_source_list.append(df_cvt_bindings.cvt_rhcloud_2_dfcloud(i_cloud_source[i]))
+                siffed_rh_mesh_target_list.append(rh_mesh_target_list[i])


        # 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)
+        o_result = df_error_estimation.df_cloud_2_rh_mesh_comparison(siffed_df_cloud_source_list, siffed_rh_mesh_target_list, i_signed_flag, i_swap)


maybe to be cordinate with @eleniv3d ?

9and3 · 2024-09-22T20:00:02Z

src/gh/diffCheck/diffCheck/df_geometries.py

            face = DFFace.from_brep_face(data[0], data[1])
            faces.append(face)
        beam = cls("Beam", faces)
+        beam.is_cylinder = is_cylinder


src/gh/diffCheck/diffCheck/df_joint_detector.py

9and3 · 2024-09-22T20:25:59Z

src/gh/diffCheck/diffCheck/df_joint_detector.py

+        '''
+        the structure of the disctionnary is as follows:
+        {
+            face_id: (face, is_inside)
+            ...
+        }
+            face_id is int
+            face is Rhino.Geometry.BrepFace
+            is_inside is bool
+        '''
+        faces = {}
+        if is_cylinder_beam:
+            for idx, face in enumerate(self.brep.Faces):
+                faces[idx] = (face, face.IsPlanar(1000 * sc.doc.ModelAbsoluteTolerance))
+        else:
+            for idx, face in enumerate(self.brep.Faces):
+                face_centroid = rg.AreaMassProperties.Compute(face).Centroid
+                coord = face.ClosestPoint(face_centroid)
+                projected_centroid = face.PointAt(coord[1], coord[2])
+                faces[idx] = (face, Bounding_geometry.IsPointInside(projected_centroid, sc.doc.ModelAbsoluteTolerance, True))
+
+        # compute the adjacency list of each face
+        adjacency_of_faces = {}
+        '''
+        the structure of the dictionnary is as follows:
+        {
+            face_id: (face, [adj_face_id_1, adj_face_id_2, ...])
+            ...
+        }
+            face_id is int
+            face is Rhino.Geometry.BrepFace
+            adj_face_id_1, adj_face_id_2, ... are int
+        '''
+        for idx, face in faces.items():
+            if not face[1]:
+                continue
+            adjacency_of_faces[idx] = (face[0], [adj_face for adj_face in face[0].AdjacentFaces() if faces[adj_face][1] and faces[adj_face][0].IsPlanar(1000 * sc.doc.ModelAbsoluteTolerance) and adj_face != idx]) # used to be not faces[adj_face][0].IsPlanar(1000 * sc.doc.ModelAbsoluteTolerance)


I propose two things here:

first it would be great if you can contain what you added in a function encapsualted inside the DFJointDetector (_my_cylinder_func()) with some docstrings explaining why you need this because it's a bit cumbersome like this.

second I propose to do these to state clearly that what you added is needed only for cylinder beams right?

joint_face_ids = [] if is_cylinder_beam: my_cylinder_treatement_func() # change name else: faces = {idx: (face, Bounding_geometry.IsPointInside(rg.AreaMassProperties.Compute(face).Centroid, sc.doc.ModelAbsoluteTolerance, True)) for idx, face in enumerate(self.brep.Faces)} joint_face_ids = [[key] + [adj_face for adj_face in value[0].AdjacentFaces() if faces[adj_face][1] and adj_face != key] for key, value in faces.items() if value[1]]

Done: I created two functions, one for each dictionnary:

faces = _find_joint_faces(self, bounding_geometry) adjacency_of_faces = _compute_adjacency_of_faces(self, faces) adjacency_of_faces = diffCheck.df_util.merge_shared_indexes(adjacency_of_faces) joint_face_ids = [[key] + value[1] for key, value in adjacency_of_faces.items()]

…ut code

…m case

9and3

lookin good! Thanks @DamienGilliard ! 👐

UPDATE: joint detector adapted for cylinders

77127a0

DamienGilliard self-assigned this Aug 17, 2024

DamienGilliard marked this pull request as draft August 17, 2024 17:24

9and3 linked an issue Aug 17, 2024 that may be closed by this pull request

joint detector needs to work for logs #28

Closed

9and3 added enhancement New feature or request PythonAPI labels Aug 17, 2024

DamienGilliard added 22 commits August 21, 2024 22:40

FIX-UPDATE: return tuple with right values

106e4c4

UPDATE: add flag to DFAssembly and DFBeam for log cases

b264a3a

FIX: comment-out if __name__ part

c1b49d4

WIP: GetCylinderCenterAndAxis method added to DFMesh

8d4b559

WIP-UPDATE: add cylinder case to associateClusters methods.

1531211

WIP-UPDATE: implement changes between cases with and without cylinder…

9850851

… in code.py

UPDATE: update binding to add is_cylinder parameter to segmentation m…

7d89b06

…ethods

FIX: __init__.py imports the binding as well

f4c067d

WIP: cylinder segmentation now without IsPointOnFace check, because n…

dae8a0b

…ot useful here

Merge branch 'main' into cylinder_beam

1d13587

UPDATE: joint detector more robust in the adjacency face calculation

21e7c6e

UPDATE: add merge_shared_index method to df_utils to be used by df_jo…

7a4ee73

…int_detector.py

FIX: remove commented-out code for component testing

46d1249

FIX: update diffCheckApp.cc

4ea1e26

FIX: applying changes from pre-commit

fdd13a3

FIX: forgot a file in pre-commit file adding in previous commit

8a9be07

UPDATE: IsPointOnFace method optimized

7540d8b

UPDATE: Small adaptation for cylinder case in DFSegmentation, integra…

e04fe70

…te association threshold

UPDATE: code.py of segmentation component cleaned

4bb9b34

FIX: is_cylinder property of DFBeam properly handled

407ce16

UPDATE: is_cylinder_beam function more robust

e6199c1

UPDATE: general cleanup from pre-commit

4387e4d

9and3 linked an issue Sep 12, 2024 that may be closed by this pull request

CAD Segmentator: wrong metadata #74

Closed

DamienGilliard linked an issue Sep 12, 2024 that may be closed by this pull request

Round wood integration should not detect holes in the df_joint_detector.py #96

Closed

DamienGilliard marked this pull request as draft September 12, 2024 12:48

DamienGilliard added 2 commits September 12, 2024 15:35

FIX: joint_detector now excludes 'cylindrical' faces from joints

7a805e2

Merge branch 'main' into cylinder_beam

16a7966

WIP-UPDATE: joint detector more robust for corner log case

e46a8a1

DamienGilliard added 9 commits September 21, 2024 15:37

ADD: DFMergeAssemblies component created

18d66b6

UPDATE-WIP: add is_cylinder parameter to BuildAssembly component

abe3f61

WIP-UPDATE: Adaptations to semantic segmentation pipeline to improve …

d40e4ed

…log cases

UPDATE: cleaner CAD_segmentator component code

73ab8ec

FIX: colors appended together with point and normals + merge shenanigans

55a844f

FIX: name of input parameter of DFMergeAssemblies in metadata.json [n…

ec79524

…o ci]

FIX: CleanUnassociatedClusters better integrated so it daly with comp…

959630a

…osite assemblies (logs + squared)

ADD Documentation for merrge assemblies

c4ebde6

FIX: underlining of title set to correct length [no ci]

602756d

DamienGilliard marked this pull request as ready for review September 22, 2024 14:04

9and3 requested changes Sep 22, 2024

View reviewed changes

DamienGilliard added 6 commits September 23, 2024 09:28

FIX: Typo in rst file + issues with naming convention and commented-o…

c259efa

…ut code

FIX: naming of functions and switch from 'is_cylinder' to 'is_roundwood'

992a96a

FIX: naming of functions and switch from 'is_cylinder' to 'is_roundwood'

1f1e22e

FIX: df_joint_detector excludes non planar joint faces in squared bea…

d12a1e8

…m case

FIX: forgotten chsnge of method name

5e7d71b

FIX: indent mistake in df_joint_detector.py

057ee36

9and3 approved these changes Sep 24, 2024

View reviewed changes

9and3 merged commit 03df9c6 into main Sep 24, 2024

adaptations for cylindical beams #65

adaptations for cylindical beams #65

Uh oh!

Conversation

DamienGilliard commented Aug 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DamienGilliard commented Aug 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

9and3 commented Aug 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

9and3 commented Sep 10, 2024

Uh oh!

DamienGilliard commented Sep 12, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

9and3 commented Sep 12, 2024

Uh oh!

DamienGilliard commented Sep 21, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DamienGilliard commented Sep 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

9and3 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

9and3 Sep 22, 2024

Choose a reason for hiding this comment

Uh oh!

9and3 Sep 22, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

9and3 Sep 22, 2024

Choose a reason for hiding this comment

Uh oh!

DamienGilliard Sep 23, 2024

Choose a reason for hiding this comment

Uh oh!

9and3 left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

DamienGilliard commented Aug 17, 2024 •

edited

Loading

DamienGilliard commented Aug 17, 2024 •

edited

Loading

9and3 commented Aug 17, 2024 •

edited

Loading

DamienGilliard commented Sep 12, 2024 •

edited

Loading

DamienGilliard commented Sep 21, 2024 •

edited

Loading

DamienGilliard commented Sep 22, 2024 •

edited

Loading