use default values other than None for compound objects

Author: tomvanmele

src/compas_rhino/geometry/__init__.py

@@ -5,10 +5,6 @@
 
 .. currentmodule:: compas_rhino.geometry
 
-.. rst-class:: lead
-
-Wrappers for Rhino objects that can be used to convert Rhino geometry and data to COMPAS objects.
-
 Classes
 =======
 

src/compas_rhino/objects/__init__.py

@@ -5,32 +5,16 @@
 
 .. currentmodule:: compas_rhino.objects
 
+Classes
+=======
 
-NetworkObject
-=============
-
-.. autoclass:: NetworkObject
-    :members: clear, draw, select_nodes, select_edges, modify_nodes, modify_edges
-    :no-show-inheritance:
-
-----
-
-MeshObject
-==========
-
-.. autoclass:: MeshObject
-    :members: clear, draw, select_vertices, select_faces, select_edges, modify_vertices, modify_faces, modify_edges
-    :no-show-inheritance:
-
-----
-
-VolMeshObject
-=============
-
-.. autoclass:: VolMeshObject
-    :members: clear, draw, select_vertices, select_faces, select_edges, modify_vertices, modify_faces, modify_edges
-    :no-show-inheritance:
+.. autosummary::
+    :toctree: generated/
+    :nosignatures:
 
+    MeshObject
+    NetworkObject
+    VolMeshObject
 
 """
 from __future__ import absolute_import

src/compas_rhino/objects/meshobject.py

@@ -120,6 +120,8 @@ def location(self):
         Setting this location will make a copy of the provided point object.
         Moving the original point will thus not affect the object's location.
         """
+        if not self._location:
+            self._location = Point(0, 0, 0)
         return self._location
 
     @location.setter
@@ -132,6 +134,8 @@ def scale(self):
         A uniform scaling factor for the object in the scene.
         The scale is applied relative to the location of the object in the scene.
         """
+        if not self._scale:
+            self._scale = 1
         return self._scale
 
     @scale.setter
@@ -144,6 +148,8 @@ def rotation(self):
         The rotation angles around the 3 axis of the coordinate system
         with the origin placed at the location of the object in the scene.
         """
+        if not self._rotation:
+            self._rotation = [0, 0, 0]
         return self._rotation
 
     @rotation.setter
@@ -153,24 +159,24 @@ def rotation(self, rotation):
     @property
     def vertex_xyz(self):
         """dict: The view coordinates of the mesh object."""
+        origin = Point(0, 0, 0)
         stack = []
-        if self.anchor is not None and self.location is not None:
-            xyz = self.mesh.vertex_attributes(self.anchor, 'xyz')
-            origin = Point(0, 0, 0)
-            point = Point(* xyz)
-            T1 = Translation.from_vector(origin - point)
-            stack.append(T1)
-        if self.scale is not None:
+        if self.scale != 1:
             S = Scale.from_factors([self.scale] * 3)
             stack.append(S)
-        if self.rotation is not None:
+        if self.rotation != [0, 0, 0]:
             R = Rotation.from_euler_angles(self.rotation)
             stack.append(R)
-        if self.location is not None:
+        if self.location != origin:
+            if self.anchor is not None:
+                xyz = self.mesh.vertex_attributes(self.anchor, 'xyz')
+                point = Point(* xyz)
+                T1 = Translation.from_vector(origin - point)
+                stack.insert(0, T1)
             T2 = Translation.from_vector(self.location)
             stack.append(T2)
         if stack:
-            X = reduce(mul, stack)
+            X = reduce(mul, stack[::-1])
             mesh = self.mesh.transformed(X)
         else:
             mesh = self.mesh

src/compas_rhino/objects/networkobject.py

@@ -96,6 +96,8 @@ def location(self):
         Setting this location will make a copy of the provided point object.
         Moving the original point will thus not affect the object's location.
         """
+        if not self._location:
+            self._location = Point(0, 0, 0)
         return self._location
 
     @location.setter
@@ -108,6 +110,8 @@ def scale(self):
         A uniform scaling factor for the object in the scene.
         The scale is applied relative to the location of the object in the scene.
         """
+        if not self._scale:
+            self._scale = 1.0
         return self._scale
 
     @scale.setter
@@ -120,6 +124,8 @@ def rotation(self):
         The rotation angles around the 3 axis of the coordinate system
         with the origin placed at the location of the object in the scene.
         """
+        if not self._rotation:
+            self._rotation = [0, 0, 0]
         return self._rotation
 
     @rotation.setter
@@ -129,24 +135,24 @@ def rotation(self, rotation):
     @property
     def node_xyz(self):
         """dict : The view coordinates of the mesh object."""
+        origin = Point(0, 0, 0)
         stack = []
-        if self.anchor is not None and self.location is not None:
-            xyz = self.network.vertex_attributes(self.anchor, 'xyz')
-            origin = Point(0, 0, 0)
-            point = Point(* xyz)
-            T1 = Translation.from_vector(origin - point)
-            stack.append(T1)
-        if self.scale is not None:
+        if self.scale != 1.0:
             S = Scale.from_factors([self.scale] * 3)
             stack.append(S)
-        if self.rotation is not None:
+        if self.rotation != [0, 0, 0]:
             R = Rotation.from_euler_angles(self.rotation)
             stack.append(R)
-        if self.location is not None:
+        if self.location != origin:
+            if self.anchor is not None:
+                xyz = self.network.vertex_attributes(self.anchor, 'xyz')
+                point = Point(* xyz)
+                T1 = Translation.from_vector(origin - point)
+                stack.insert(0, T1)
             T2 = Translation.from_vector(self.location)
             stack.append(T2)
         if stack:
-            X = reduce(mul, stack)
+            X = reduce(mul, stack[::-1])
             network = self.network.transformed(X)
         else:
             network = self.network

src/compas_rhino/objects/volmeshobject.py

@@ -110,6 +110,8 @@ def location(self):
         Setting this location will make a copy of the provided point object.
         Moving the original point will thus not affect the object's location.
         """
+        if not self._location:
+            self._location = Point(0, 0, 0)
         return self._location
 
     @location.setter
@@ -122,6 +124,8 @@ def scale(self):
         A uniform scaling factor for the object in the scene.
         The scale is applied relative to the location of the object in the scene.
         """
+        if not self._scale:
+            self._scale = 1.0
         return self._scale
 
     @scale.setter
@@ -134,6 +138,8 @@ def rotation(self):
         The rotation angles around the 3 axis of the coordinate system
         with the origin placed at the location of the object in the scene.
         """
+        if not self._rotation:
+            self._rotation = [0, 0, 0]
         return self._rotation
 
     @rotation.setter
@@ -143,24 +149,24 @@ def rotation(self, rotation):
     @property
     def vertex_xyz(self):
         """dict : The view coordinates of the volmesh object."""
+        origin = Point(0, 0, 0)
         stack = []
-        if self.anchor is not None and self.location is not None:
-            xyz = self.volmesh.vertex_attributes(self.anchor, 'xyz')
-            origin = Point(0, 0, 0)
-            point = Point(* xyz)
-            T1 = Translation.from_vector(origin - point)
-            stack.append(T1)
-        if self.scale is not None:
+        if self.scale != 1.0:
             S = Scale.from_factors([self.scale] * 3)
             stack.append(S)
-        if self.rotation is not None:
+        if self.rotation != [0, 0, 0]:
             R = Rotation.from_euler_angles(self.rotation)
             stack.append(R)
-        if self.location is not None:
+        if self.location != origin:
+            if self.anchor is not None:
+                xyz = self.volmesh.vertex_attributes(self.anchor, 'xyz')
+                point = Point(* xyz)
+                T1 = Translation.from_vector(origin - point)
+                stack.insert(0, T1)
             T2 = Translation.from_vector(self.location)
             stack.append(T2)
         if stack:
-            X = reduce(mul, stack)
+            X = reduce(mul, stack[::-1])
             volmesh = self.volmesh.transformed(X)
         else:
             volmesh = self.volmesh