working on updating the examples

Author: tomvanmele

docs/examples/breps/brep_explorer.py

@@ -1,8 +1,5 @@
-# type: ignore
 from compas.geometry import Box
-from compas.colors import Color
-from compas.geometry import Brep
-from compas_view2.app import App
+from compas_viewer import Viewer
 
 box = Box(1).to_brep()
 
@@ -15,21 +12,23 @@
 # Visualization
 # =============================================================================
 
-viewer = App()
-viewer.view.camera.position = [2, -4, 1]
-viewer.view.camera.look_at([0, 0, 0])
+viewer = Viewer()
 
-viewer.add(vertex.point, pointcolor=Color.red(), pointsize=20)
+# viewer.view.camera.position = [2, -4, 1]
+# viewer.view.camera.look_at([0, 0, 0])
 
-for vertex in vertices:
-    viewer.add(vertex.point, pointsize=20)
+# viewer.scene.add(vertex.point, pointcolor=Color.red(), pointsize=20)
 
-for edge in edges:
-    viewer.add(edge.to_line(), linewidth=5, linecolor=Color(0.2, 0.2, 0.2))
+# for vertex in vertices:
+#     viewer.scene.add(vertex.point, pointsize=20)
 
-for face in faces:
-    brep = Brep.from_brepfaces([face])
-    viewer.add(brep, opacity=0.5)
+# for edge in edges:
+#     viewer.scene.add(edge.to_line(), linewidth=5, linecolor=Color(0.2, 0.2, 0.2))
+
+# for face in faces:
+#     brep = Brep.from_brepfaces([face])
+#     viewer.scene.add(brep, opacity=0.5)
+
+# viewer.scene.add(box, linewidth=2, linecolor=Color(0.2, 0.2, 0.2), show_faces=False)
 
-viewer.add(box, linewidth=2, linecolor=Color(0.2, 0.2, 0.2), show_faces=False)
 viewer.show()

docs/examples/breps/brep_fillet.py

@@ -1,7 +1,7 @@
-# type: ignore
 from pathlib import Path
-from compas_view2.app import App
+
 from compas.geometry import Brep
+from compas_viewer import Viewer
 
 # Load the brep from a STEP file
 # and extract the individual letters.
@@ -41,10 +41,12 @@
 # Visualization
 # =============================================================================
 
-viewer = App()
-viewer.view.camera.position = [5, -1, 10]
-viewer.view.camera.look_at([5, 2, 0])
+viewer = Viewer()
 
-for letter in letters:
-    viewer.add(letter, linewidth=2, opacity=0.7)
-viewer.run()
+# viewer.view.camera.position = [5, -1, 10]
+# viewer.view.camera.look_at([5, 2, 0])
+
+# for letter in letters:
+#     viewer.scene.add(letter, linewidth=2, opacity=0.7)
+
+viewer.show()

docs/examples/breps/brep_from_booleans.py

@@ -1,9 +1,8 @@
-# type: ignore
+from compas.geometry import Box
+from compas.geometry import Cylinder
 from compas.geometry import Frame
-from compas.geometry import Box, Cylinder
-from compas_view2.app import App
-
 from compas.tolerance import TOL
+from compas_viewer import Viewer
 
 TOL.lineardeflection = 0.1
 
@@ -23,10 +22,12 @@
 # Visualisation
 # ==============================================================================
 
-viewer = App(viewmode="ghosted", width=1600, height=900)
-viewer.view.camera.rz = -30
-viewer.view.camera.rx = -75
-viewer.view.camera.distance = 7
+viewer = Viewer()
+
+# viewer.view.camera.rz = -30
+# viewer.view.camera.rx = -75
+# viewer.view.camera.distance = 7
+
+# viewer.scene.add(result, linewidth=2)
 
-viewer.add(result, linewidth=2)
-viewer.run()
+viewer.show()

docs/examples/breps/brep_from_iges.py

@@ -1,9 +1,10 @@
-# type: ignore
 from pathlib import Path
-from compas.geometry import Frame
-from compas.geometry import Box, Cylinder
+
+from compas.geometry import Box
 from compas.geometry import Brep
-from compas_view2.app import App
+from compas.geometry import Cylinder
+from compas.geometry import Frame
+from compas_viewer import Viewer
 
 filepath = Path(__file__).parent / "booleans.iges"
 
@@ -39,10 +40,12 @@
 # Visualisation
 # =============================================================================
 
-viewer = App(viewmode="ghosted", width=1600, height=900)
-viewer.view.camera.rz = -30
-viewer.view.camera.rx = -75
-viewer.view.camera.distance = 7
+viewer = Viewer()
+
+# viewer.view.camera.rz = -30
+# viewer.view.camera.rx = -75
+# viewer.view.camera.distance = 7
+
+# viewer.scene.add(brep, linewidth=2)
 
-viewer.add(brep, linewidth=2)
-viewer.run()
+viewer.show()

docs/examples/breps/brep_from_mesh.py

@@ -1,8 +1,7 @@
-# type: ignore
 import compas
 from compas.datastructures import Mesh
 from compas.geometry import Brep
-from compas_view2.app import App
+from compas_viewer import Viewer
 
 # Construct a mesh from an OBJ file
 # and convert to a brep
@@ -14,9 +13,11 @@
 # Visualization
 # =============================================================================
 
-viewer = App(width=1600, height=900)
-viewer.view.camera.position = [1, -6, 2]
-viewer.view.camera.look_at([1, 1, 1])
+viewer = Viewer()
 
-viewer.add(brep, linewidth=2)
-viewer.run()
+# viewer.view.camera.position = [1, -6, 2]
+# viewer.view.camera.look_at([1, 1, 1])
+
+# viewer.scene.add(brep, linewidth=2)
+
+viewer.show()

docs/examples/breps/brep_from_shape.py

@@ -1,16 +1,17 @@
-# type: ignore
 from compas.geometry import Cylinder
-from compas_view2.app import App
+from compas_viewer import Viewer
 
 cylinder = Cylinder(1.0, 2.0).to_brep()
 
 # =============================================================================
 # Visualization
 # =============================================================================
 
-viewer = App()
-viewer.view.camera.position = [2, -4, 1]
-viewer.view.camera.look_at([0, 0, 0])
+viewer = Viewer()
+
+# viewer.view.camera.position = [2, -4, 1]
+# viewer.view.camera.look_at([0, 0, 0])
+
+# viewer.scene.add(cylinder, opacity=0.9)
 
-viewer.add(cylinder, opacity=0.9)
 viewer.show()

docs/examples/breps/brep_overlap.py

@@ -1,8 +1,6 @@
-# type: ignore
 from compas.geometry import Box
-from compas.colors import Color
 from compas.geometry import Brep
-from compas_view2.app import App
+from compas_viewer import Viewer
 
 A = Box(1).to_brep()
 
@@ -16,29 +14,30 @@
 # Visualization
 # =============================================================================
 
-viewer = App()
-viewer.view.camera.position = [3, -3, 1]
-viewer.view.camera.look_at([-1, 2, 0])
-
-viewer.add(A, opacity=0.5, linewidth=3)
-viewer.add(B, opacity=0.5, linewidth=3)
-
-for face in FA[:1]:
-    brep = Brep.from_brepfaces([face])
-    viewer.add(
-        brep,
-        facecolor=Color.red().lightened(50),
-        linewidth=3,
-        linecolor=Color.red(),
-    )
-
-for face in FB[:1]:
-    brep = Brep.from_brepfaces([face])
-    viewer.add(
-        brep,
-        facecolor=Color.blue().lightened(50),
-        linewidth=3,
-        linecolor=Color.blue(),
-    )
+viewer = Viewer()
+
+# viewer.view.camera.position = [3, -3, 1]
+# viewer.view.camera.look_at([-1, 2, 0])
+
+# viewer.scene.add(A, opacity=0.5, linewidth=3)
+# viewer.scene.add(B, opacity=0.5, linewidth=3)
+
+# for face in FA[:1]:
+#     brep = Brep.from_brepfaces([face])
+#     viewer.scene.add(
+#         brep,
+#         facecolor=Color.red().lightened(50),
+#         linewidth=3,
+#         linecolor=Color.red(),
+#     )
+
+# for face in FB[:1]:
+#     brep = Brep.from_brepfaces([face])
+#     viewer.scene.add(
+#         brep,
+#         facecolor=Color.blue().lightened(50),
+#         linewidth=3,
+#         linecolor=Color.blue(),
+#     )
 
 viewer.show()

docs/examples/breps/brep_slice.py

@@ -1,9 +1,9 @@
-# type: ignore
 from math import radians
+
 from compas.geometry import Box
 from compas.geometry import Plane
 from compas.geometry import Rotation
-from compas_view2.app import App
+from compas_viewer import Viewer
 
 box = Box(1).to_brep()
 
@@ -13,19 +13,18 @@
 
 slice = box.slice(plane)
 
-for edge in slice.edges:
-    print(edge)
-
 # =============================================================================
 # Visualization
 # =============================================================================
 
 # TODO: this is currently not working properly, because of the new tessellation imlpementation.
 
-viewer = App()
-viewer.view.camera.position = [2, -4, 1]
-viewer.view.camera.look_at([0, 0, 0])
+viewer = Viewer()
+
+# viewer.view.camera.position = [2, -4, 1]
+# viewer.view.camera.look_at([0, 0, 0])
+
+# viewer.scene.add(box, opacity=0.5)
+# viewer.scene.add(slice, linewidth=2)
 
-viewer.add(box, opacity=0.5)
-viewer.add(slice, linewidth=2)
 viewer.show()

docs/examples/breps/brep_split.py

@@ -1,10 +1,10 @@
-# type: ignore
 from math import radians
-from compas.geometry import Box, Plane, Rotation
-from compas.geometry import is_point_infrontof_plane
-from compas.colors import Color
+
+from compas.geometry import Box
+from compas.geometry import Plane
+from compas.geometry import Rotation
 from compas_occ.brep import OCCBrep as Brep
-from compas_view2.app import App
+from compas_viewer import Viewer
 
 box = Box(1).to_brep()
 
@@ -18,28 +18,27 @@
 # Visualization
 # =============================================================================
 
-viewer = App()
-viewer.view.camera.position = [2, -4, 1]
-viewer.view.camera.look_at([0, 0, 0])
-
-viewer.add(
-    plane, linewidth=2, opacity=0.3
-)  # there is a debug print statement in the viewer that needs to be removed
-
-for brep in result:
-    if is_point_infrontof_plane(brep.centroid, plane):
-        viewer.add(
-            brep,
-            facecolor=Color.red().lightened(50),
-            linecolor=Color.red(),
-            linewidth=2,
-        )
-    else:
-        viewer.add(
-            brep,
-            facecolor=Color.blue().lightened(50),
-            linecolor=Color.blue(),
-            linewidth=2,
-        )
+viewer = Viewer()
+
+# viewer.view.camera.position = [2, -4, 1]
+# viewer.view.camera.look_at([0, 0, 0])
+
+# viewer.scene.add(plane, linewidth=2, opacity=0.3)  # there is a debug print statement in the viewer that needs to be removed
+
+# for brep in result:
+#     if is_point_infrontof_plane(brep.centroid, plane):
+#         viewer.scene.add(
+#             brep,
+#             facecolor=Color.red().lightened(50),
+#             linecolor=Color.red(),
+#             linewidth=2,
+#         )
+#     else:
+#         viewer.scene.add(
+#             brep,
+#             facecolor=Color.blue().lightened(50),
+#             linecolor=Color.blue(),
+#             linewidth=2,
+#         )
 
 viewer.show()

docs/examples/breps/brep_thru_sections.py

@@ -1,10 +1,10 @@
-from OCC.Core.BRepOffsetAPI import BRepOffsetAPI_ThruSections
-
-from compas.geometry import Circle, Frame
-from compas_occ.brep import OCCBrepEdge, OCCBrepLoop
 from compas.geometry import Brep
-
-from compas_view2.app import App
+from compas.geometry import Circle
+from compas.geometry import Frame
+from compas_occ.brep import OCCBrepEdge
+from compas_occ.brep import OCCBrepLoop
+from compas_viewer import Viewer
+from OCC.Core.BRepOffsetAPI import BRepOffsetAPI_ThruSections
 
 frame = Frame.worldYZ()
 c1 = Circle(1.0, frame=frame)
@@ -31,6 +31,6 @@
 
 brep = Brep.from_native(thru.Shape())
 
-viewer = App()
-viewer.add(brep, linewidth=2)
+viewer = Viewer()
+# viewer.scene.add(brep, linewidth=2)
 viewer.show()