Skip to content

Commit e9ef94c

Browse files
author
Onur Rauf Bingol
committed
Update the output of the data property
Required for reducing complexity of passing data to operational/algorithmic modules
1 parent 837af2e commit e9ef94c

File tree

3 files changed

+28
-16
lines changed

3 files changed

+28
-16
lines changed

geomdl/abstract.py

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -914,10 +914,14 @@ def data(self):
914914
type=self.type,
915915
rational=self.rational,
916916
dimension=self.dimension,
917-
degree=self._degree,
918-
knotvector=self._knot_vector,
919-
size=[self.ctrlpts_size],
920-
control_points=self._control_points
917+
pdimension=self.pdimension,
918+
delta=tuple(self._delta),
919+
sample_size=(self.sample_size,),
920+
precision=self._precision,
921+
degree=tuple(self._degree),
922+
knotvector=tuple(self._knot_vector),
923+
size=(self.ctrlpts_size,),
924+
control_points=tuple(self._control_points)
921925
)
922926

923927
def reverse(self):
@@ -1779,11 +1783,15 @@ def data(self):
17791783
type=self.type,
17801784
rational=self.rational,
17811785
dimension=self.dimension,
1782-
degree=self._degree,
1783-
knotvector=self._knot_vector,
1784-
size=self._control_points_size,
1785-
control_points=self._control_points,
1786-
trims=[t.data for t in self._trims]
1786+
pdimension=self.pdimension,
1787+
delta=tuple(self._delta),
1788+
sample_size=self.sample_size,
1789+
precision=self._precision,
1790+
degree=tuple(self._degree),
1791+
knotvector=tuple(self._knot_vector),
1792+
size=tuple(self._control_points_size),
1793+
control_points=tuple(self._control_points),
1794+
trims=tuple([t.data for t in self._trims])
17871795
)
17881796

17891797
def add_trim(self, trim):
@@ -2828,11 +2836,15 @@ def data(self):
28282836
type=self.type,
28292837
rational=self.rational,
28302838
dimension=self.dimension,
2831-
degree=self._degree,
2832-
knotvector=self._knot_vector,
2833-
size=self._control_points_size,
2834-
control_points=self._control_points,
2835-
trims=[t.data for t in self._trims]
2839+
pdimension=self.pdimension,
2840+
delta=tuple(self._delta),
2841+
sample_size=self.sample_size,
2842+
precision=self._precision,
2843+
degree=tuple(self._degree),
2844+
knotvector=tuple(self._knot_vector),
2845+
size=tuple(self._control_points_size),
2846+
control_points=tuple(self._control_points),
2847+
trims=tuple([t.data for t in self._trims])
28362848
)
28372849

28382850
def add_trim(self, trim):

geomdl/freeform.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def data(self):
2626
"""
2727
return dict(
2828
type=self.type,
29-
points=self.evalpts
29+
points=tuple(self.evalpts)
3030
)
3131

3232
def evaluate(self, **kwargs):

geomdl/multi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@ def data(self):
270270
Please refer to the `wiki <https://github.com/orbingol/NURBS-Python/wiki/Using-Python-Properties>`_ for details
271271
on using this class member.
272272
"""
273-
return [e.data for e in self._elements]
273+
return tuple([e.data for e in self._elements])
274274

275275
def add(self, element):
276276
""" Adds geometry objects to the container.

0 commit comments

Comments
 (0)