Merge pull request #788 from compas-dev/rhino-scene-objects

Fix bugs in Rhino scene objets

Author: tomvanmele

CHANGELOG.md

@@ -24,6 +24,20 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Fixed bug where `compas_rhino.BaseArtist.redraw` did not trigger a redraw.
 * Fixed minor bugs in `compas.geometry.Polyline` and `compas.geometry.Polygon`.
 * Fixed very minor bugs in `compas.geometry.Frame` and `compas.geometry.Quaternion`.
+* Fixed bug in `compas_rhino.objects.MeshObject.modify`.
+* Fixed bug in `compas_rhino.objects.MeshObject.modify_vertices`.
+* Fixed bug in `compas_rhino.objects.MeshObject.modify_edges`.
+* Fixed bug in `compas_rhino.objects.MeshObject.modify_faces`.
+* Fixed bug in `compas_rhino.objects.VolMeshObject.modify`.
+* Fixed bug in `compas_rhino.objects.VolMeshObject.modify_vertices`.
+* Fixed bug in `compas_rhino.objects.VolMeshObject.modify_edges`.
+* Fixed bug in `compas_rhino.objects.VolMeshObject.modify_faces`.
+* Fixed bug in `compas_rhino.objects.NetworkObject.modify`.
+* Fixed bug in `compas_rhino.objects.NetworkObject.modify_vertices`.
+* Fixed bug in `compas_rhino.objects.NetworkObject.modify_edges`.
+* Changed `compas_rhino.objects.inspect` to `compas_rhino.objects.inspectors`.
+* Changed `compas_rhino.objects.select` to `compas_rhino.objects._select`.
+* Changed `compas_rhino.objects.modify` to `compas_rhino.objects._modify`.
 
 ### Removed
 

src/compas_rhino/objects/__init__.py

@@ -53,9 +53,32 @@
 """
 from __future__ import absolute_import
 
-from .select import *  # noqa : F401 F403
-from .modify import *  # noqa : F401 F403
-from .inspect import *  # noqa : F401 F403
+from ._select import (  # noqa : F401 F403
+    mesh_select_vertex,
+    mesh_select_vertices,
+    mesh_select_face,
+    mesh_select_faces,
+    mesh_select_edge,
+    mesh_select_edges,
+    network_select_node,
+    network_select_nodes,
+    network_select_edge,
+    network_select_edges
+)
+from ._modify import (  # noqa : F401 F403
+    network_update_attributes,
+    network_update_node_attributes,
+    network_update_edge_attributes,
+    network_move_node,
+    mesh_update_attributes,
+    mesh_update_vertex_attributes,
+    mesh_update_face_attributes,
+    mesh_update_edge_attributes,
+    mesh_move_vertex,
+    mesh_move_vertices,
+    mesh_move_face
+)
+from .inspectors import MeshVertexInspector  # noqa : F401 F403
 
 from ._object import BaseObject
 from .meshobject import MeshObject

src/compas_rhino/objects/modify/datastructures.py renamed to src/compas_rhino/objects/_modify.py

@@ -3,7 +3,6 @@
 from __future__ import division
 
 import ast
-
 import compas_rhino
 
 from compas.geometry import add_vectors

src/compas_rhino/objects/select/datastructures.py renamed to src/compas_rhino/objects/_select.py

@@ -13,14 +13,16 @@
 from compas.geometry import subtract_vectors
 from compas.geometry import add_vectors
 from compas.geometry import scale_vector
-from compas_rhino.objects._object import BaseObject
-from compas_rhino.objects.modify import mesh_update_attributes
-from compas_rhino.objects.modify import mesh_update_vertex_attributes
-from compas_rhino.objects.modify import mesh_update_face_attributes
-from compas_rhino.objects.modify import mesh_update_edge_attributes
-from compas_rhino.objects.modify import mesh_move_vertex
-from compas_rhino.objects.modify import mesh_move_vertices
-from compas_rhino.objects.modify import mesh_move_face
+
+from ._modify import mesh_update_attributes
+from ._modify import mesh_update_vertex_attributes
+from ._modify import mesh_update_face_attributes
+from ._modify import mesh_update_edge_attributes
+from ._modify import mesh_move_vertex
+from ._modify import mesh_move_vertices
+from ._modify import mesh_move_face
+
+from ._object import BaseObject
 
 
 __all__ = ['MeshObject']
@@ -62,11 +64,6 @@ class MeshObject(BaseObject):
         'show.facenormals': False,
     }
 
-    modify = mesh_update_attributes
-    modify_vertices = mesh_update_vertex_attributes
-    modify_faces = mesh_update_face_attributes
-    modify_edges = mesh_update_edge_attributes
-
     def __init__(self, mesh, scene=None, name=None, layer=None, visible=True, settings=None):
         super(MeshObject, self).__init__(mesh, scene, name, layer, visible)
         self._guids = []
@@ -103,12 +100,6 @@ def mesh(self, mesh):
         self._guid_edgelabel = {}
         self._guid_facelabel = {}
 
-    # def __getstate__(self):
-    #     pass
-
-    # def __setstate__(self, state):
-    #     pass
-
     @property
     def anchor(self):
         """The vertex of the mesh that is anchored to the location of the object."""
@@ -395,6 +386,77 @@ def select_edges(self, message="Select edges."):
         edges = [self.guid_edge[guid] for guid in guids if guid in self.guid_edge]
         return edges
 
+    def modify(self):
+        """Update the attributes of the mesh.
+
+        Returns
+        -------
+        bool
+            ``True`` if the update was successful.
+            ``False`` otherwise.
+        """
+        return mesh_update_attributes(self.mesh)
+
+    def modify_vertices(self, vertices, names=None):
+        """Update the attributes of selected vertices.
+
+        Parameters
+        ----------
+        vertices : list
+            The vertices of the vertices of which the attributes should be updated.
+        names : list, optional
+            The names of the attributes that should be updated.
+            Default is to update all available attributes.
+
+        Returns
+        -------
+        bool
+            True if the attributes were successfully updated.
+            False otherwise.
+
+        """
+        return mesh_update_vertex_attributes(self.mesh, vertices, names=names)
+
+    def modify_edges(self, edges, names=None):
+        """Update the attributes of the edges.
+
+        Parameters
+        ----------
+        edges : list
+            The edges to update.
+        names : list, optional
+            The names of the atrtibutes to update.
+            Default is to update all attributes.
+
+        Returns
+        -------
+        bool
+            ``True`` if the update was successful.
+            ``False`` otherwise.
+
+        """
+        return mesh_update_edge_attributes(self.mesh, edges, names=names)
+
+    def modify_faces(self, faces, names=None):
+        """Update the attributes of selected faces.
+
+        Parameters
+        ----------
+        vertices : list
+            The vertices of the vertices of which the attributes should be updated.
+        names : list, optional
+            The names of the attributes that should be updated.
+            Default is to update all available attributes.
+
+        Returns
+        -------
+        bool
+            True if the attributes were successfully updated.
+            False otherwise.
+
+        """
+        return mesh_update_face_attributes(self.mesh, faces, names=names)
+
     # not clear if this is now about the location or the data
     def move(self):
         """Move the entire mesh object to a different location."""

src/compas_rhino/objects/inspect/__init__.py renamed to src/compas_rhino/objects/inspectors/__init__.py

@@ -7,11 +7,13 @@
 from compas.geometry import Scale
 from compas.geometry import Translation
 from compas.geometry import Rotation
-from compas_rhino.objects._object import BaseObject
-from compas_rhino.objects.modify import network_update_attributes
-from compas_rhino.objects.modify import network_update_node_attributes
-from compas_rhino.objects.modify import network_update_edge_attributes
-from compas_rhino.objects.modify import network_move_node
+
+from ._modify import network_update_attributes
+from ._modify import network_update_node_attributes
+from ._modify import network_update_edge_attributes
+from ._modify import network_move_node
+
+from ._object import BaseObject
 
 
 __all__ = ['NetworkObject']
@@ -46,10 +48,6 @@ class NetworkObject(BaseObject):
         'show.edgelabels': False,
     }
 
-    modify = network_update_attributes
-    modify_nodes = network_update_node_attributes
-    modify_edges = network_update_edge_attributes
-
     def __init__(self, network, scene=None, name=None, layer=None, visible=True, settings=None):
         super(NetworkObject, self).__init__(network, scene, name, layer, visible)
         self._guid_node = {}
@@ -77,12 +75,6 @@ def network(self, network):
         self._guid_nodelabel = {}
         self._guid_edgelabel = {}
 
-    # def __getstate__(self):
-    #     pass
-
-    # def __setstate__(self, state):
-    #     pass
-
     @property
     def anchor(self):
         """The node of the network that is anchored to the location of the object."""
@@ -274,6 +266,56 @@ def select_edges(self):
         edges = [self.guid_edge[guid] for guid in guids if guid in self.guid_edge]
         return edges
 
+    def modify(self):
+        """Update the attributes of the network.
+
+        Returns
+        -------
+        bool
+            ``True`` if the update was successful.
+            ``False`` otherwise.
+        """
+        return network_update_attributes(self.network)
+
+    def modify_nodes(self, nodes, names=None):
+        """Update the attributes of the nodes.
+
+        Parameters
+        ----------
+        nodes : list
+            The identifiers of the nodes to update.
+        names : list, optional
+            The names of the atrtibutes to update.
+            Default is to update all attributes.
+
+        Returns
+        -------
+        bool
+            ``True`` if the update was successful.
+            ``False`` otherwise.
+
+        """
+        return network_update_node_attributes(self.network, nodes, names=names)
+
+    def modify_edges(self, edges, names=None):
+        """Update the attributes of the edges.
+
+        Parameters
+        ----------
+        edges : list
+            The identifiers of the edges to update.
+        names : list, optional
+            The names of the atrtibutes to update.
+            Default is to update all attributes.
+
+        Returns
+        -------
+        bool
+            ``True`` if the update was successful.
+            ``False`` otherwise.
+        """
+        return network_update_edge_attributes(self.network, edges, names=names)
+
     def move(self):
         """Move the entire mesh object to a different location."""
         raise NotImplementedError