Merge remote-tracking branch 'origin/main' into main

CHANGELOG.md

@@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 * Added optional `triangulated` flag to `Mesh.to_vertices_and_faces`.
+* Added geometry information of active meshes to the serialization/deserialization of robot model's `MeshDescriptor`.
+* Added Grasshopper component to draw any COMPAS object.
+* Added new icons to Grasshopper components and default to icon style.
 
 ### Changed
 

src/compas/robots/model/geometry.py

@@ -173,13 +173,15 @@ def data(self):
             'filename': self.filename,
             'scale': self.scale,
             'attr': _attr_to_data(self.attr),
+            'meshes': [m.data for m in self.meshes],
         }
 
     @data.setter
     def data(self, data):
         self.filename = data['filename']
         self.scale = data['scale']
         self.attr = _attr_from_data(data['attr']) if 'attr' in data else {}
+        self.meshes = [Mesh.from_data(md) for md in data['meshes']] if 'meshes' in data else []
 
     @classmethod
     def from_data(cls, data):
@@ -364,6 +366,7 @@ def get_color(self):
     ('point', 'radius'): compas.geometry.Sphere,
     ('line', 'radius'): compas.geometry.Capsule,
     ('attr', 'filename', 'scale'): MeshDescriptor,
+    ('attr', 'filename', 'meshes', 'scale'): MeshDescriptor,
 }
 
 

src/compas_ghpython/components/Compas_FromJson/code.py

@@ -8,6 +8,9 @@
 
 class CompasInfo(component):
     def RunScript(self, json):
+        if not json:
+            return None
+
         try:
             return compas.json_load(json)
         except:    # noqa: E722

src/compas_ghpython/components/Compas_FromJson/metadata.json

@@ -8,6 +8,7 @@
 
     "ghpython": {
         "isAdvancedMode": true,
+        "iconDisplay": 2,
         "inputParameters": [
             {
                 "name": "json",

src/compas_ghpython/components/Compas_Info/metadata.json

@@ -8,6 +8,7 @@
 
     "ghpython": {
         "isAdvancedMode": true,
+        "iconDisplay": 2,
         "inputParameters": [
         ],
         "outputParameters": [

src/compas_ghpython/components/Compas_ToJson/metadata.json

@@ -8,6 +8,7 @@
 
     "ghpython": {
         "isAdvancedMode": true,
+        "iconDisplay": 2,
         "inputParameters": [
             {
                 "name": "data",

src/compas_ghpython/components/Compas_ToRhinoGeometry/code.py

@@ -0,0 +1,14 @@
+"""
+Draws COMPAS geometry in Grasshopper.
+"""
+from ghpythonlib.componentbase import executingcomponent as component
+
+from compas.artists import Artist
+
+
+class CompasToRhinoGeometry(component):
+    def RunScript(self, cg):
+        if not cg:
+            return None
+
+        return Artist(cg).draw()

src/compas_ghpython/components/Compas_ToRhinoGeometry/metadata.json

@@ -0,0 +1,25 @@
+{
+    "name": "Draw",
+    "nickname": "Draw",
+    "category": "COMPAS",
+    "subcategory": "Display",
+    "description": "Draws COMPAS geometry",
+    "exposure": 2,
+
+    "ghpython": {
+        "isAdvancedMode": true,
+        "iconDisplay": 2,
+        "inputParameters": [
+            {
+                "name": "cg",
+                "description": "The COMPAS geometry or datastructure to be drawn."
+            }
+        ],
+        "outputParameters": [
+            {
+                "name": "rg",
+                "description": "The Rhino geometry object."
+            }
+        ]
+    }
+}

src/compas_ghpython/components/__init__.py

@@ -34,17 +34,6 @@
 import compas_rhino
 
 
-def coerce_frame(plane):
-    import Rhino
-    from compas.geometry import Frame
-    if isinstance(plane, Rhino.Geometry.Plane):
-        return Frame(plane.Origin, plane.XAxis, plane.YAxis)
-    elif isinstance(plane, Frame):
-        return plane
-    else:
-        return Frame(*plane)
-
-
 def get_version_from_args():
     parser = argparse.ArgumentParser()
     parser.add_argument('-v', '--version', choices=compas_rhino.SUPPORTED_VERSIONS, default=compas_rhino.DEFAULT_VERSION)