switch interop to conversions

tomvanmele · tomvanmele · commit 2f63c57fa052 · 2021-09-01T08:55:33.000+02:00
diff --git a/docs/api/compas_occ.conversions.rst b/docs/api/compas_occ.conversions.rst
@@ -0,0 +1,2 @@
+
+.. automodule:: compas_occ.conversions
diff --git a/docs/api/compas_occ.interop.rst b/docs/api/compas_occ.interop.rst
diff --git a/scripts/booleans1.py b/scripts/booleans1.py
@@ -1,7 +1,7 @@
 import os
 
 from compas.geometry import Frame
-from compas_occ.interop.shapes import Box, Sphere
+from compas_occ.conversions.shapes import Box, Sphere
 from compas_occ.brep.booleans import boolean_union_shape_shape
 
 HERE = os.path.dirname(__file__)
diff --git a/scripts/booleans2.py b/scripts/booleans2.py
@@ -1,5 +1,5 @@
 from compas.geometry import Frame, Translation
-from compas_occ.interop.shapes import Box, Sphere
+from compas_occ.conversions.shapes import Box, Sphere
 from compas_occ.brep.booleans import boolean_union_shape_shape
 
 from compas_view2.app import App
diff --git a/scripts/booleans3.py b/scripts/booleans3.py
@@ -1,6 +1,6 @@
 from compas.geometry import Polyline, Frame
 
-from compas_occ.interop.shapes import Box, Sphere
+from compas_occ.conversions.shapes import Box, Sphere
 from compas_occ.brep.booleans import boolean_union_shape_shape
 from compas_occ.geometry.surfaces import BSplineSurface
 from compas_occ.geometry.curves import BSplineCurve
diff --git a/scripts/booleans4.py b/scripts/booleans4.py
@@ -1,6 +1,6 @@
 from compas.geometry import Polyline, Frame
 
-from compas_occ.interop.shapes import Box, Sphere
+from compas_occ.conversions.shapes import Box, Sphere
 from compas_occ.brep.booleans import boolean_difference_shape_shape
 from compas_occ.geometry.surfaces import BSplineSurface
 from compas_occ.geometry.curves import BSplineCurve
diff --git a/scripts/booleans5.py b/scripts/booleans5.py
@@ -1,6 +1,6 @@
 from compas.geometry import Polyline, Frame
 
-from compas_occ.interop.shapes import Box, Sphere
+from compas_occ.conversions.shapes import Box, Sphere
 from compas_occ.brep.booleans import boolean_intersection_shape_shape
 from compas_occ.geometry.surfaces import BSplineSurface
 from compas_occ.geometry.curves import BSplineCurve
diff --git a/scripts/fillet1.py b/scripts/fillet1.py
@@ -1,7 +1,7 @@
 import os
 
 from compas.geometry import Frame
-from compas_occ.interop.shapes import Box
+from compas_occ.conversions.shapes import Box
 from compas_occ.brep.datastructures import BRepShape
 
 from OCC.Core.BRepFilletAPI import BRepFilletAPI_MakeFillet
diff --git a/scripts/intersections1.py b/scripts/intersections1.py
@@ -5,7 +5,7 @@
 from compas_occ.geometry.curves import BSplineCurve
 from compas_occ.geometry.surfaces import BSplineSurface
 
-from compas_occ.interop.primitives import compas_point_from_occ_point
+from compas_occ.conversions.primitives import compas_point_from_occ_point
 
 from OCC.Core.gp import gp_Pnt, gp_Dir
 from OCC.Core.Geom import Geom_Line
diff --git a/src/compas_occ/__init__.py b/src/compas_occ/__init__.py
@@ -10,8 +10,8 @@
     :maxdepth: 1
 
     compas_occ.brep
+    compas_occ.conversions
     compas_occ.geometry
-    compas_occ.interop
 
 """
 
diff --git a/src/compas_occ/brep/brep.py b/src/compas_occ/brep/brep.py
@@ -46,9 +46,9 @@
 from OCC.Core.Interface import Interface_Static_SetCVal
 from OCC.Core.IFSelect import IFSelect_RetDone
 
-from compas_occ.interop import triangle_to_face
-from compas_occ.interop import quad_to_face
-from compas_occ.interop import ngon_to_face
+from compas_occ.conversions import triangle_to_face
+from compas_occ.conversions import quad_to_face
+from compas_occ.conversions import ngon_to_face
 from compas_occ.geometry import NurbsSurface
 
 from compas_occ.brep import BRepVertex
diff --git a/src/compas_occ/conversions/__init__.py b/src/compas_occ/conversions/__init__.py
@@ -1,9 +1,9 @@
 """
 ********************************************************************************
-compas_occ.interop
+compas_occ.conversions
 ********************************************************************************
 
-.. currentmodule:: compas_occ.interop
+.. currentmodule:: compas_occ.conversions
 
 Arrays
 ======
diff --git a/src/compas_occ/conversions/arrays.py b/src/compas_occ/conversions/arrays.py
diff --git a/src/compas_occ/conversions/meshes.py b/src/compas_occ/conversions/meshes.py
diff --git a/src/compas_occ/conversions/primitives.py b/src/compas_occ/conversions/primitives.py
diff --git a/src/compas_occ/conversions/shapes.py b/src/compas_occ/conversions/shapes.py
diff --git a/src/compas_occ/geometry/curves/nurbs.py b/src/compas_occ/geometry/curves/nurbs.py
@@ -9,12 +9,12 @@
 from compas.geometry import Box
 from compas.utilities import linspace
 
-from compas_occ.interop import harray1_from_points1
-from compas_occ.interop import array1_from_points1
-from compas_occ.interop import array1_from_floats1
-from compas_occ.interop import array1_from_integers1
-from compas_occ.interop import points1_from_array1
-from compas_occ.interop import compas_point_from_occ_point
+from compas_occ.conversions import harray1_from_points1
+from compas_occ.conversions import array1_from_points1
+from compas_occ.conversions import array1_from_floats1
+from compas_occ.conversions import array1_from_integers1
+from compas_occ.conversions import points1_from_array1
+from compas_occ.conversions import compas_point_from_occ_point
 
 from ._curve import Curve
 
diff --git a/src/compas_occ/geometry/surfaces/nurbs.py b/src/compas_occ/geometry/surfaces/nurbs.py
@@ -10,18 +10,18 @@
 from compas.utilities import meshgrid, linspace, flatten
 from compas.datastructures import Mesh
 
-from compas_occ.interop import compas_line_to_occ_line
-from compas_occ.interop import compas_point_from_occ_point
-from compas_occ.interop import compas_point_to_occ_point
-from compas_occ.interop import compas_vector_from_occ_vector
-from compas_occ.interop import compas_vector_to_occ_vector
-from compas_occ.interop import compas_frame_from_occ_position
-from compas_occ.interop import array2_from_points2
-from compas_occ.interop import array1_from_floats1
-from compas_occ.interop import array2_from_floats2
-from compas_occ.interop import array1_from_integers1
-from compas_occ.interop import floats2_from_array2
-from compas_occ.interop import points2_from_array2
+from compas_occ.conversions import compas_line_to_occ_line
+from compas_occ.conversions import compas_point_from_occ_point
+from compas_occ.conversions import compas_point_to_occ_point
+from compas_occ.conversions import compas_vector_from_occ_vector
+from compas_occ.conversions import compas_vector_to_occ_vector
+from compas_occ.conversions import compas_frame_from_occ_position
+from compas_occ.conversions import array2_from_points2
+from compas_occ.conversions import array1_from_floats1
+from compas_occ.conversions import array2_from_floats2
+from compas_occ.conversions import array1_from_integers1
+from compas_occ.conversions import floats2_from_array2
+from compas_occ.conversions import points2_from_array2
 
 from ..curves import NurbsCurve
 from ._surface import Surface

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+`
	`2`	`+.. automodule:: compas_occ.conversions`