Skip to content

Commit a608233

Browse files
committed
Update conversion functions after rebase
1 parent d670516 commit a608233

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

src/compas_cadwork/elements/element.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
from compas.geometry import Line
1919
from compas.geometry import Vector
2020

21-
from compas_cadwork.utils.converters import compas_to_cwpoint
22-
from compas_cadwork.utils.converters import cwpoint_to_point
23-
from compas_cadwork.utils.converters import cwpoint_to_vector
24-
from compas_cadwork.utils.ifc_uuid import IfcUUID
21+
from compas_cadwork.conversions.primitives import point_to_compas
22+
from compas_cadwork.conversions.primitives import vector_to_cadwork
23+
from compas_cadwork.conversions.primitives import vector_to_compas
24+
from compas_cadwork.ifc_uuid import IfcUUID
2525
from compas_cadwork.utils.storage import KeyValueStorage
2626

2727
from .element_type import ElementType
@@ -209,9 +209,9 @@ def data(self) -> _ElementData:
209209
@property
210210
def frame(self) -> Frame:
211211
"""Reference frame."""
212-
p1 = cwpoint_to_point(gc.get_p1(self.id))
213-
x_axis = cwpoint_to_vector(gc.get_xl(self.id))
214-
y_axis = cwpoint_to_vector(gc.get_yl(self.id))
212+
p1 = point_to_compas(gc.get_p1(self.id))
213+
x_axis = vector_to_compas(gc.get_xl(self.id))
214+
y_axis = vector_to_compas(gc.get_yl(self.id))
215215
return Frame(p1, x_axis, y_axis)
216216

217217
@property
@@ -244,8 +244,8 @@ def length(self, value: float) -> None:
244244
@property
245245
def centerline(self) -> Line:
246246
"""Line connecting the two points that define the element."""
247-
p1 = cwpoint_to_point(gc.get_p1(self.id))
248-
p2 = cwpoint_to_point(gc.get_p2(self.id))
247+
p1 = point_to_compas(gc.get_p1(self.id))
248+
p2 = point_to_compas(gc.get_p2(self.id))
249249
return Line(p1, p2)
250250

251251
def translate(self, vector: Vector) -> None:
@@ -256,7 +256,7 @@ def translate(self, vector: Vector) -> None:
256256
vector : Vector
257257
The vector by which to translate the element.
258258
"""
259-
ec.move_element([self.id], compas_to_cwpoint(vector))
259+
ec.move_element([self.id], vector_to_cadwork(vector))
260260

261261
def duplicate(self, vector: Vector) -> Self:
262262
"""Duplicate element by the given vector.
@@ -271,7 +271,7 @@ def duplicate(self, vector: Vector) -> Self:
271271
Self
272272
New element.
273273
"""
274-
new_element_ids = ec.copy_elements([self.id], compas_to_cwpoint(vector))
274+
new_element_ids = ec.copy_elements([self.id], vector_to_cadwork(vector))
275275
if len(new_element_ids) != 1:
276276
raise RuntimeError(f"Failed to copy Cadwork element with ID {self.id}")
277277
return self.__class__(new_element_ids[0])

0 commit comments

Comments
 (0)