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

PyVista: point_arrays -> point_data #327

Merged
merged 1 commit into from
Apr 14, 2022
Merged

PyVista: point_arrays -> point_data #327

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions pyntcloud/io/pyvista.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def from_pyvista(poly_data, **kwargs):

points = pd.DataFrame(data=poly_data.points, columns=["x", "y", "z"])

scalars = poly_data.point_arrays
scalars = poly_data.point_data
for name, array in scalars.items():
if array.ndim == 1:
points[name] = array
Expand Down Expand Up @@ -72,11 +72,11 @@ def to_pyvista(cloud, mesh=False, use_as_color=("red", "green", "blue"), **kwarg
# add scalar arrays
if all(c in cloud.points.columns for c in use_as_color):
colors = cloud.points[list(use_as_color)].values
poly.point_arrays["RGB"] = colors
poly.point_data["RGB"] = colors
avoid += list(use_as_color)
# Add other arrays
for name in cloud.points.columns:
if name not in avoid:
poly.point_arrays[name] = cloud.points[name]
poly.point_data[name] = cloud.points[name]

return poly
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ ipython
matplotlib
numba
pytest
pyvista
pyvista>=0.32.0
open3d
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
],
extras_require={
'LAS': ["pylas", "lazrs"],
'PLOT': ["ipython", "matplotlib", "pyvista"],
'PLOT': ["ipython", "matplotlib", "pyvista>=0.32.0"],
'NUMBA': ["numba"]
},
classifiers=[
Expand Down
8 changes: 4 additions & 4 deletions tests/integration/io/test_from_instance.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@ def test_pyvista_conversion(data_path):
cloud = PyntCloud.from_instance("pyvista", original_point_cloud)
assert np.allclose(cloud.xyz, original_point_cloud.points)
assert {'red', 'green', 'blue'}.issubset(cloud.points.columns)
assert np.allclose(cloud.points[['red', 'green', 'blue']].values, original_point_cloud.point_arrays["RGB"])
assert np.allclose(cloud.points[['red', 'green', 'blue']].values, original_point_cloud.point_data["RGB"])
assert {'nx', 'ny', 'nz'}.issubset(cloud.points.columns)
assert np.allclose(cloud.points[['nx', 'ny', 'nz']].values, original_point_cloud.point_arrays["Normals"])
assert np.allclose(cloud.points[['nx', 'ny', 'nz']].values, original_point_cloud.point_data["Normals"])
assert cloud.mesh is not None


Expand All @@ -39,7 +39,7 @@ def test_pyvista_normals_are_handled():
@pytest.mark.skipif(SKIP_PYVISTA, reason="Requires PyVista")
def test_pyvista_multicomponent_scalars_are_splitted():
poly = pv.Sphere()
poly.point_arrays["foo"] = np.zeros_like(poly.points)
poly.point_data["foo"] = np.zeros_like(poly.points)
pc = PyntCloud.from_instance("pyvista", poly)
assert all(x in pc.points.columns for x in ["foo_0", "foo_1", "foo_2"])

Expand All @@ -50,7 +50,7 @@ def test_pyvista_rgb_is_handled():
if poin_arrays contain a field with `name in "RGB"`
"""
poly = pv.Sphere()
poly.point_arrays["RG"] = np.zeros_like(poly.points)[:, :2]
poly.point_data["RG"] = np.zeros_like(poly.points)[:, :2]
pc = PyntCloud.from_instance("pyvista", poly)
assert all(x in pc.points.columns for x in ["RG_0", "RG_1"])

Expand Down