Artist refactoring

.gitignore

@@ -143,3 +143,5 @@ src/compas_ghpython/components/**/*.ghuser
 dev
 
 NOTES
+
+src/compas_blender/conversions/__temp/

CHANGELOG.md

@@ -102,6 +102,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added `polyhedron_to_rhino` to `compas_rhino.conversions`.
 * Added `from_mesh` plugin to `compas_rhino.geometry.RhinoBrep`.
 * Added `compas.geometry.Plane.worldYZ` and `compas.geometry.Plane.worldZX`.
+* Added `compas_rhino.conversions.brep_to_compas_box`.
+* Added `compas_rhino.conversions.brep_to_compas_cone`.
+* Added `compas_rhino.conversions.brep_to_compas_cylinder`.
+* Added `compas_rhino.conversions.brep_to_compas_sphere`.
+* Added `compas_rhino.conversions.brep_to_rhino`.
+* Added `compas_rhino.conversions.capsule_to_rhino_brep`.
+* Added `compas_rhino.conversions.cone_to_rhino_brep`.
+* Added `compas_rhino.conversions.curve_to_rhino`.
+* Added `compas_rhino.conversions.cylinder_to_rhino_brep`.
+* Added `compas_rhino.conversions.extrusion_to_compas_box`.
+* Added `compas_rhino.conversions.extrusion_to_rhino_cylinder`.
+* Added `compas_rhino.conversions.extrusion_to_rhino_torus`.
+* Added `compas_rhino.conversions.polyline_to_rhino_curve`.
+* Added `compas_rhino.conversions.surface_to_compas`.
+* Added `compas_rhino.conversions.surface_to_compas_mesh`.
+* Added `compas_rhino.conversions.surface_to_compas_quadmesh`.
+* Added `compas_rhino.conversions.surface_to_rhino`.
+* Added `compas_rhino.conversions.torus_to_rhino_brep`.
+* Added `compas_rhino.artists._helpers.attributes`.
+* Added `compas_rhino.artists._helpers.ngon`.
+* Added `compas.geometry.find_span`.
+* Added `compas.geometry.construct_knotvector`.
+* Added `compas.geometry.knotvector_to_knots_and_mults`.
+* Added `compas.geometry.knots_and_mults_to_knotvector`.
+* Added `compas.geometry.compute_basisfuncs`.
+* Added `compas.geometry.compute_basisfuncsderivs`.
+* Added `compas.geometry.DefaultNurbsCurve` as try-last, Python-only plugin for `compas.geometry.NurbsCurve`.
+* Added `compas.geometry.DefaultNurbsSurface` as try-last, Python-only plugin for `compas.geometry.NurbsSurface`.
+* Added color count to constructor functions of `compas.colors.ColorMap`.
 
 ### Changed
 
@@ -174,6 +203,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Changed `compas.datastructures.Graph.delete_edge` to delete invalid (u, u) edges and not delete edges in opposite directions (v, u)
 * Fixed bug in `compas.datastructures.Mesh.insert_vertex`.
 * Fixed bug in `compas.geometry.angle_vectors_signed`.
+* Changed `compas.artists.MeshArtist` default colors.
 
 ### Removed
 
@@ -234,6 +264,27 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Removed classmethod `compas.color.Color.from_data`.
 * Removed `validate_data` from `compas.data.validators`.
 * Removed `json_validate` from `compas.data.json`.
+* Removed `compas_rhino.conversions.Box`.
+* Removed `compas_rhino.conversions.Circle`.
+* Removed `compas_rhino.conversions.Cone`.
+* Removed `compas_rhino.conversions.Curve`.
+* Removed `compas_rhino.conversions.Cylinder`.
+* Removed `compas_rhino.conversions.Ellipse`.
+* Removed `compas_rhino.conversions.Line`.
+* Removed `compas_rhino.conversions.Mesh`.
+* Removed `compas_rhino.conversions.Plane`.
+* Removed `compas_rhino.conversions.Point`.
+* Removed `compas_rhino.conversions.Polyline`.
+* Removed `compas_rhino.conversions.Vector`.
+* Removed `compas_rhino.artists.NetworkArtist.draw_nodelabels`.
+* Removed `compas_rhino.artists.NetworkArtist.draw_edgelabels`.
+* Removed `compas_rhino.artists.MeshArtist.draw_vertexlabels`.
+* Removed `compas_rhino.artists.MeshArtist.draw_edgelabels`.
+* Removed `compas_rhino.artists.MeshArtist.draw_facelabels`.
+* Removed `compas_rhino.artists.VolMeshArtist.draw_vertexlabels`.
+* Removed `compas_rhino.artists.VolMeshArtist.draw_edgelabels`.
+* Removed `compas_rhino.artists.VolMeshArtist.draw_facelabels`.
+* Removed `compas_rhino.artists.VolMeshArtist.draw_celllabels`.
 
 ## [1.17.5] 2023-02-16
 

docs/userguide/tutorials/artists/boxartist.py

@@ -0,0 +1,11 @@
+from compas.geometry import Box
+from compas.artists import Artist
+
+Artist.clear()
+
+box = Box.from_corner_corner_height([0, 0, 0], [1, 1, 0], 3)
+
+artist = Artist(box, layer='Test::Child')
+artist.draw(color=(0.0, 1.0, 0.0))
+
+Artist.redraw()

docs/userguide/tutorials/artists/capsuleartist.py

@@ -0,0 +1,11 @@
+from compas.geometry import Capsule
+from compas.artists import Artist
+
+Artist.clear()
+
+capsule = Capsule(radius=1.0, height=7.0)
+
+artist = Artist(capsule)
+artist.draw(color=(1.0, 0.0, 0.0))
+
+Artist.redraw()

docs/userguide/tutorials/artists/circleartist.py

@@ -0,0 +1,11 @@
+from compas.geometry import Circle
+from compas.artists import Artist
+
+Artist.clear()
+
+circle = Circle(radius=3.0)
+
+artist = Artist(circle)
+artist.draw(color=(0.0, 0.0, 1.0), show_point=True, show_normal=True)
+
+Artist.redraw()

docs/userguide/tutorials/artists/coneartist.py

@@ -0,0 +1,11 @@
+from compas.geometry import Cone
+from compas.artists import Artist
+
+Artist.clear()
+
+cone = Cone(radius=1.0, height=7.0)
+
+artist = Artist(cone)
+artist.draw(color=(1.0, 0.0, 0.0))
+
+Artist.redraw()

docs/userguide/tutorials/artists/curveartist.py

@@ -0,0 +1,12 @@
+from compas.geometry import NurbsCurve
+from compas.artists import Artist
+
+Artist.clear()
+
+curve = NurbsCurve.from_points([[0, 0, 0], [3, 3, 6], [6, -3, -3], [9, 0, 0]])
+
+artist = Artist(curve)
+artist.color = (0.0, 1.0, 0.0)
+artist.draw()
+
+Artist.redraw()

docs/userguide/tutorials/artists/cylinderartist.py

@@ -0,0 +1,11 @@
+from compas.geometry import Cylinder
+from compas.artists import Artist
+
+Artist.clear()
+
+cylinder = Cylinder(radius=1.0, height=7.0)
+
+artist = Artist(cylinder)
+artist.draw(color=(1.0, 0.0, 0.0))
+
+Artist.redraw()

docs/userguide/tutorials/artists/frameartist.py

@@ -0,0 +1,10 @@
+from compas.geometry import Frame
+from compas.artists import Artist
+
+Artist.clear()
+
+frame = Frame.worldXY()
+artist = Artist(frame)
+artist.draw()
+
+Artist.redraw()

docs/userguide/tutorials/artists/lineartist.py

@@ -0,0 +1,20 @@
+from math import pi
+from compas.geometry import Rotation, Scale
+from compas.geometry import Line
+from compas.artists import Artist
+from compas.colors import Color
+
+Artist.clear()
+
+line = Line([0, 0, 0], [3, 0, 0])
+artist = Artist(line)
+# artist.color = (1.0, 0.0, 0.0)
+
+step = pi / 10.0
+rotation = Rotation.from_axis_and_angle([0, 0, 1], angle=step)
+
+for i in range(11):
+    artist.draw(color=Color.from_i(i / 10))
+    line.transform(rotation)
+
+Artist.redraw()

docs/userguide/tutorials/artists/meshartist.py

@@ -0,0 +1,16 @@
+from compas.datastructures import Mesh
+from compas.artists import Artist
+from compas.colors import Color
+
+mesh = Mesh.from_meshgrid(10, 10)
+
+Artist.clear()
+
+artist = Artist(mesh)
+artist.draw_vertices()
+artist.draw_edges()
+artist.draw_faces(color={face: Color.pink() for face in mesh.face_sample(size=17)})
+#artist.draw_vertexnormals()
+artist.draw_facenormals()
+
+Artist.redraw()

docs/userguide/tutorials/artists/networkartist.py

@@ -0,0 +1,21 @@
+from compas.geometry import Pointcloud
+from compas.datastructures import Network
+from compas.artists import Artist
+from compas.colors import Color
+
+network = Network.from_pointcloud(Pointcloud.from_bounds(8, 5, 3, 53))
+
+node = network.node_sample(size=1)[0]
+nbrs = network.neighbors(node)
+edges = network.connected_edges(node)
+
+Artist.clear()
+
+artist = Artist(network)
+artist.draw(
+    nodecolor={n: Color.pink() for n in [node] + nbrs},
+    edgecolor={e: Color.pink() for e in edges},
+    nodetext='index'
+)
+
+Artist.redraw()

docs/userguide/tutorials/artists/pointartist.py

@@ -0,0 +1,17 @@
+import compas_rhino
+
+from compas.geometry import Point
+from compas.artists import Artist
+from compas.colors import Color
+
+compas_rhino.clear()
+
+point = Point(0, 0, 0)
+artist = Artist(point)
+# artist.color = (0.0, 1.0, 0.0)
+
+for i in range(11):
+    point.x = i
+    artist.draw(color=Color.from_i(i / 10))
+
+compas_rhino.redraw()

docs/userguide/tutorials/artists/polygonartist.py

@@ -0,0 +1,13 @@
+from compas.geometry import Polygon
+from compas.artists import Artist
+
+Artist.clear()
+
+polygon = Polygon.from_sides_and_radius_xy(8, 7.0)
+
+artist = Artist(polygon)
+artist.color = (0.0, 1.0, 0.0)
+
+artist.draw(show_points=True, show_edges=True)
+
+Artist.redraw()

docs/userguide/tutorials/artists/polyhedronartist.py

@@ -0,0 +1,10 @@
+from compas.geometry import Polyhedron
+from compas.artists import Artist
+
+Artist.clear()
+
+polyhedron = Polyhedron.from_platonicsolid(f=8)
+artist = Artist(polyhedron)
+artist.draw()
+
+Artist.redraw()

docs/userguide/tutorials/artists/polylineartist.py

@@ -0,0 +1,20 @@
+from random import randrange
+from compas.geometry import Polyline
+from compas.artists import Artist
+from compas.colors import Color
+
+Artist.clear()
+
+polyline = Polyline([[0, 0, 0]])
+
+for i, r in enumerate([randrange(1, 20) for _ in range(10)]):
+    if i % 2 == 0:
+        polyline.append([r, polyline.points[-1].y, 0])
+    else:
+        polyline.append([polyline.points[-1].x, r, 0])
+
+artist = Artist(polyline)
+artist.color = (0.0, 0.0, 1.0)
+artist.draw()
+
+Artist.redraw()

docs/userguide/tutorials/artists/sphereartist.py

@@ -0,0 +1,11 @@
+from compas.geometry import Sphere
+from compas.artists import Artist
+
+Artist.clear()
+
+sphere = Sphere(radius=1.0)
+
+artist = Artist(sphere)
+artist.draw(color=(1.0, 0.0, 0.0))
+
+Artist.redraw()

docs/userguide/tutorials/artists/torusartist.py

@@ -0,0 +1,11 @@
+from compas.geometry import Torus
+from compas.artists import Artist
+
+Artist.clear()
+
+torus = Torus(radius_axis=7.0, radius_pipe=2.0)
+
+artist = Artist(torus)
+artist.draw(color=(1.0, 0.0, 0.0))
+
+Artist.redraw()

docs/userguide/tutorials/artists/vectorartist.py

@@ -0,0 +1,28 @@
+from math import pi
+from compas.geometry import Vector
+from compas.geometry import Rotation
+from compas.artists import Artist
+from compas.colors import Color
+
+Artist.clear()
+
+vector = Vector(1, 0, 0)
+artist = Artist(vector)
+# artist.color = (0.0, 1.0, 0.0)
+
+# for i in range(11):
+#     artist.draw(
+#         color=Color.from_i(i / 10),
+#         point=[i, 0, 0],
+#         show_point=True
+#     )
+
+step = pi / 10.0
+
+for i in range(11):
+    artist.draw(color=Color.from_i(i / 10))
+
+    rotation = Rotation.from_axis_and_angle([0, 0, 1], angle=step)
+    vector.transform(rotation)
+
+Artist.redraw()

docs/userguide/tutorials/artists/volmeshartist.py

@@ -0,0 +1,12 @@
+from compas.datastructures import VolMesh
+from compas.artists import Artist
+from compas.colors import Color
+
+mesh = VolMesh.from_meshgrid(dx=10, nx=10)
+
+Artist.clear()
+
+artist = Artist(mesh)
+artist.draw_cells(color={cell: Color.pink() for cell in mesh.cell_sample(size=83)})
+
+Artist.redraw()

setup.py

@@ -58,7 +58,6 @@ def read(*names, **kwargs):
         "compas_rhino",
         "compas_blender",
         "compas_ghpython",
-        "compas_plotters",
     ],
     package_dir={"": "src"},
     package_data={"compas": ["data/schemas/*.json"]},

src/compas/__init__.py

@@ -136,6 +136,8 @@
 
 __all_plugins__ = [
     "compas.geometry.booleans.booleans_shapely",
+    "compas.geometry.curves.nurbs_",
+    "compas.geometry.surfaces.nurbs_",
 ]
 
 

src/compas/artists/__init__.py

@@ -5,13 +5,11 @@
 from .exceptions import DataArtistNotRegistered
 from .exceptions import NoArtistContextError
 from .artist import Artist
-from .curveartist import CurveArtist
 from .meshartist import MeshArtist
 from .networkartist import NetworkArtist
-from .primitiveartist import PrimitiveArtist
+from .geometryartist import GeometryArtist
 from .robotmodelartist import RobotModelArtist
 from .shapeartist import ShapeArtist
-from .surfaceartist import SurfaceArtist
 from .volmeshartist import VolMeshArtist
 
 from .artist import clear  # noqa: F401
@@ -25,12 +23,10 @@
     "DataArtistNotRegistered",
     "NoArtistContextError",
     "Artist",
-    "CurveArtist",
     "MeshArtist",
     "NetworkArtist",
-    "PrimitiveArtist",
+    "GeometryArtist",
     "RobotModelArtist",
     "ShapeArtist",
-    "SurfaceArtist",
     "VolMeshArtist",
 ]