|
23 | 23 | MTR_POINTDATA_KEY = "target_size" |
24 | 24 |
|
25 | 25 | invalid_input = TypeError( |
26 | | - "Invalid input. First argument must be either a pyvista.PolyData object or vertex array, followed by a face arrays and optionally a face marker array." |
| 26 | + "Invalid input. First argument must be either a pyvista.PolyData object or a vertex array and a face array and optionally a face marker array." |
27 | 27 | ) |
28 | 28 |
|
29 | 29 |
|
@@ -193,22 +193,22 @@ def store_mesh(mesh: "PolyData") -> None: |
193 | 193 | faces = mesh._connectivity_array.reshape(-1, 3).astype(np.int32, copy=False) |
194 | 194 | self._tetgen.load_mesh(points, faces) |
195 | 195 |
|
196 | | - if "PolyData" in str(type(arg0)): # check without importing |
197 | | - from pyvista.core.pointset import PolyData |
198 | | - |
199 | | - if not isinstance(arg0, PolyData): |
200 | | - raise TypeError(f"Unknown type {type(arg0)}. Expected a `pyvista.PolyData`.") |
201 | | - mesh: PolyData = arg0 |
202 | | - |
203 | | - store_mesh(mesh) |
204 | | - elif isinstance(arg0, (np.ndarray, list)): |
| 196 | + if isinstance(arg0, (np.ndarray, list)): |
205 | 197 | points = np.asarray(arg0, dtype=np.float64) |
206 | 198 | if isinstance(arg1, (np.ndarray, list)) and isinstance(arg2, (np.ndarray, list)): |
207 | 199 | self._load_arrays(points, arg1, arg2) |
208 | 200 | elif isinstance(arg1, (np.ndarray, list)): |
209 | 201 | self._load_arrays(points, arg1) |
210 | 202 | else: |
211 | 203 | raise invalid_input |
| 204 | + elif "PolyData" in str(type(arg0)): # check without importing |
| 205 | + from pyvista.core.pointset import PolyData |
| 206 | + |
| 207 | + if not isinstance(arg0, PolyData): |
| 208 | + raise TypeError(f"Unknown type {type(arg0)}. Expected a `pyvista.PolyData`.") |
| 209 | + mesh: PolyData = arg0 |
| 210 | + |
| 211 | + store_mesh(mesh) |
212 | 212 | elif isinstance(arg0, (str, Path)): |
213 | 213 | try: |
214 | 214 | import pyvista.core as pv |
|
0 commit comments