objectstore

Author: Licini

src/compas/scene/scene.py

@@ -48,17 +48,17 @@ def __data__(self):
             "name": self.name,
             "attributes": self.attributes,
             "datastore": self.datastore,
-            "objects": self.objects,
+            "objectstore": self.objectstore,
             "tree": self.tree,
         }
 
-    def __init__(self, context=None, datastore=None, objects=None, tree=None, **kwargs):
+    def __init__(self, context=None, datastore=None, objectstore=None, tree=None, **kwargs):
         # type: (str | None, dict | None, dict | None, Tree | None, **kwargs) -> None
         super(Scene, self).__init__(**kwargs)
 
         self.context = context or detect_current_context()
         self.datastore = datastore or {}
-        self.objects = objects or {}
+        self.objectstore = objectstore or {}
         self.tree = tree or Tree()
         if self.tree.root is None:
             self.tree.add(TreeNode(name=self.name))
@@ -71,16 +71,26 @@ def node_repr(node):
             if node.is_root:
                 return node.name
             else:
-                sceneobject = self.objects[node.name]
+                sceneobject = self.objectstore[node.name]
                 return str(sceneobject)
 
         return self.tree.get_hierarchy_string(node_repr=node_repr)
 
+    @property
+    def items(self):
+        # type: () -> list
+        return list(self.datastore.values())
+
+    @property
+    def objects(self):
+        # type: () -> list
+        return list(self.objectstore.values())
+
     @property
     def context_objects(self):
         # type: () -> list
         guids = []
-        for obj in self.objects.values():
+        for obj in self.objects:
             guids += obj.guids
         return guids
 
@@ -107,7 +117,7 @@ def add(self, item, parent=None, **kwargs):
         sceneobject = SceneObjectFactory.create(item=item, context=self.context, scene=self, **kwargs)
 
         # Add the scene object and item to the data store
-        self.objects[str(sceneobject.guid)] = sceneobject
+        self.objectstore[str(sceneobject.guid)] = sceneobject
         self.datastore[str(item.guid)] = item
 
         # Add the scene object to the hierarchical tree
@@ -134,11 +144,11 @@ def remove(self, sceneobject):
         """
         # type: (SceneObject) -> None
         guid = str(sceneobject.guid)
-        self.objects.pop(guid, None)
+        self.objectstore.pop(guid, None)
         node = self.tree.get_node_by_name(guid)
         if node:
             for descendant in node.descendants:
-                self.objects.pop(descendant.name, None)
+                self.objectstore.pop(descendant.name, None)
             self.tree.remove(node)
 
     def clear_context(self, guids=None):
@@ -193,7 +203,7 @@ def clear(self, clear_scene=True, clear_context=True):
         """
         guids = []
 
-        for sceneobject in list(self.objects.values()):
+        for sceneobject in self.objects:
             guids += sceneobject.guids
             sceneobject._guids = None
 
@@ -266,7 +276,7 @@ def find_by_itemtype(self, itemtype):
         :class:`SceneObject` or None
 
         """
-        for obj in self.objects.values():
+        for obj in self.objects:
             if isinstance(obj.item, itemtype):
                 return obj
 
@@ -285,7 +295,7 @@ def find_all_by_itemtype(self, itemtype):
 
         """
         sceneobjects = []
-        for obj in self.objects.values():
+        for obj in self.objects:
             if isinstance(obj.item, itemtype):
                 sceneobjects.append(obj)
         return sceneobjects

src/compas/scene/sceneobject.py

@@ -225,13 +225,13 @@ def childnodes(self):
     def parent(self):
         # type: () -> compas.scene.SceneObject | None
         if self.parentnode and not self.parentnode.is_root:
-            return self.scene.objects[self.parentnode.name]
+            return self.scene.objectstore[self.parentnode.name]
         return None
 
     @property
     def children(self):
         # type: () -> list[compas.scene.SceneObject]
-        return [self.scene.objects[child.name] for child in self.childnodes]
+        return [self.scene.objectstore[child.name] for child in self.childnodes]
 
     @property
     def guids(self):