Skip to content
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

Jump to bottom

Update/rhino point conversion #1346

Merged
merged 3 commits into from
Apr 30, 2024
Merged

Update/rhino point conversion #1346

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8283d74
allow Rhino.Geometry.Point
Licini Apr 29, 2024
7b5b5e3
changelog
Licini Apr 29, 2024
9454699
use try except
Licini Apr 29, 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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
* Changed use of `compas.geometry.allclose` to `compas.tolerance.TOL.is_allclose`.
* Changed use of `compas.geometry.close` to `compas.tolerance.TOL.is_close`.
* Changed imports of itertools to `compas.itertools` instead of `compas.utilities`.
* Updated `compas_rhino.conversions.point_to_compas` to allow for `compas.geometry.Point` as input.
Copy link
Member

@gonzalocasas gonzalocasas Apr 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Do you mean to allow for `Rhino.Geometry.Point` as input.?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

My bad!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Updated!


### Removed

Expand Down
9 changes: 7 additions & 2 deletions src/compas_rhino/conversions/geometry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,19 @@ def point_to_compas(point):

Parameters
----------
point : :rhino:`Rhino.Geometry.Point3d`
point : :rhino:`Rhino.Geometry.Point3d` | :rhino:`Rhino.Geometry.Point`

Returns
-------
:class:`compas.geometry.Point`

"""
return Point(point.X, point.Y, point.Z)
if isinstance(point, Rhino.Geometry.Point3d):
return Point(point.X, point.Y, point.Z)
elif isinstance(point, Rhino.Geometry.Point):
return Point(point.Location.X, point.Location.Y, point.Location.Z)
else:
raise TypeError("Expected Rhino.Geometry.Point3d or Rhino.Geometry.Point., got: {}".format(type(point)))
Copy link
Member

Choose a reason for hiding this comment

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

Instead of relying on type checking, I would rely on "feature checking". Something like this maybe?

Suggested change
if isinstance(point, Rhino.Geometry.Point3d):
return Point(point.X, point.Y, point.Z)
elif isinstance(point, Rhino.Geometry.Point):
return Point(point.Location.X, point.Location.Y, point.Location.Z)
else:
raise TypeError("Expected Rhino.Geometry.Point3d or Rhino.Geometry.Point., got: {}".format(type(point)))
if hasattr(point, "X"):
return Point(point.X, point.Y, point.Z)
elif hasattr(point, "Location"):
return Point(point.Location.X, point.Location.Y, point.Location.Z)
else:
raise TypeError("Unexpected point type, got: {}".format(type(point)))

Or maybe not even that, maybe just try..except idiom:

    try:
        return Point(point.X, point.Y, point.Z)
    except MissingMemberException:
        try:
            return Point(point.Location.X, point.Location.Y, point.Location.Z)
        except MissingMemberException:
            raise TypeError("Unexpected point type, got: {}".format(type(point)))

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sounds good! using try except now



def vector_to_compas(vector):
Expand Down
Loading