use clear plugin for both scene and scene object

Author: Licini

src/compas/scene/context.py

@@ -10,7 +10,7 @@
 
 
 @pluggable(category="drawing-utils")
-def clear():
+def clear(guids=None):
     raise NotImplementedError
 
 

src/compas/scene/scene.py

@@ -47,12 +47,17 @@ def _get_node(self, sceneobject):
         raise Exception("Scene object not in scene")
 
     def clear(self):
-        clear()
+        guids = []
+        for sceneobject in self.sceneobjects:
+            guids += sceneobject.guids
+            sceneobject._guids = None
+        clear(guids=guids)
 
     def redraw(self):
+        self.clear()
+
         drawn_objects = []
         for sceneobject in self.sceneobjects:
-            sceneobject.clear()
             drawn_objects += sceneobject.draw()
 
         if drawn_objects:

src/compas/scene/sceneobject.py

@@ -4,6 +4,7 @@
 
 from abc import abstractmethod
 from .descriptors.protocol import DescriptorProtocol
+from .context import clear
 
 
 class SceneObject(object):
@@ -55,7 +56,7 @@ def draw(self):
         """The main drawing method."""
         raise NotImplementedError
 
-    @abstractmethod
     def clear(self):
         """The main clearing method."""
-        raise NotImplementedError
+        clear(guids=self.guids)
+        self._guids = None

src/compas_blender/__init__.py

@@ -10,24 +10,28 @@
     from .utilities import *  # noqa: F401 F403
 
 
-def clear():
+def clear(guids=None):
     """Clear all scene objects."""
-    # delete all objects
-    bpy.ops.object.select_all(action="SELECT")
-    bpy.ops.object.delete(use_global=True, confirm=False)
-    # delete data
-    delete_unused_data()  # noqa: F405
-    # delete collections
-    for collection in bpy.context.scene.collection.children:
-        bpy.context.scene.collection.children.unlink(collection)
-    for block in bpy.data.collections:
-        objects = [o for o in block.objects if o.users]
-        while objects:
-            bpy.data.objects.remove(objects.pop())
-        for collection in block.children:
-            block.children.unlink(collection)
-        if block.users == 0:
-            bpy.data.collections.remove(block)
+    if guids is None:
+        # delete all objects
+        bpy.ops.object.select_all(action="SELECT")
+        bpy.ops.object.delete(use_global=True, confirm=False)
+        # delete data
+        delete_unused_data()  # noqa: F405
+        # delete collections
+        for collection in bpy.context.scene.collection.children:
+            bpy.context.scene.collection.children.unlink(collection)
+        for block in bpy.data.collections:
+            objects = [o for o in block.objects if o.users]
+            while objects:
+                bpy.data.objects.remove(objects.pop())
+            for collection in block.children:
+                block.children.unlink(collection)
+            if block.users == 0:
+                bpy.data.collections.remove(block)
+    else:
+        for obj in guids:
+            bpy.data.objects.remove(obj, do_unlink=True)
 
 
 def redraw():

src/compas_blender/scene/__init__.py

@@ -55,8 +55,8 @@
 
 
 @plugin(category="drawing-utils", pluggable_name="clear", requires=["bpy"])
-def clear_blender():
-    compas_blender.clear()
+def clear_blender(guids=None):
+    compas_blender.clear(guids=guids)
 
 
 @plugin(category="drawing-utils", pluggable_name="redraw", requires=["bpy"])

src/compas_blender/scene/sceneobject.py

@@ -33,10 +33,6 @@ def __init__(self, **kwargs: Any):
         super().__init__(**kwargs)
         self.objects = []
 
-    def clear(self):
-        for obj in self.guids:
-            self.delete_object(obj)
-
     # many of the methods below will be added to a general scene object in the future
     # to make them universaly accessible they are added here for now
 
@@ -187,21 +183,6 @@ def set_object_tranformation(self, obj: bpy.types.Object, transformation: Option
         elif self.transformation:
             obj.matrix_world = conversions.transformation_to_blender(self.transformation)
 
-    def delete_object(self, obj) -> None:
-        """Delete a Blender object.
-
-        Parameters
-        ----------
-        obj : :class:`bpy.types.Object`
-            The Blender object to delete.
-
-        Returns
-        -------
-        None
-
-        """
-        bpy.data.objects.remove(obj, do_unlink=True)
-
     # =============================================================================
     # Collections
     # =============================================================================

src/compas_ghpython/scene/__init__.py

@@ -56,6 +56,16 @@
 from .brepobject import BrepObject
 
 
+@plugin(category="drawing-utils", pluggable_name="clear", requires=["Grasshopper"])
+def clear_GH(guids=None):
+    pass
+
+
+@plugin(category="drawing-utils", pluggable_name="redraw", requires=["Grasshopper"])
+def redraw_GH():
+    pass
+
+
 @plugin(category="factories", requires=["Rhino"])
 def register_scene_objects():
     register(Box, BoxObject, context="Grasshopper")

src/compas_ghpython/scene/sceneobject.py

@@ -10,7 +10,3 @@ class GHSceneObject(SceneObject):
 
     def __init__(self, **kwargs):
         super(GHSceneObject, self).__init__(**kwargs)
-
-    def clear(self):
-        """Clear the object from the Rhino scene. In GH, this is not necessary."""
-        pass

src/compas_rhino/__init__.py

@@ -57,8 +57,9 @@
 # =============================================================================
 
 
-def clear():
-    guids = get_objects()  # noqa: F405
+def clear(guids=None):
+    if guids is None:
+        guids = get_objects()  # noqa: F405
     delete_objects(guids, purge=True)  # noqa: F405
 
 

src/compas_rhino/scene/__init__.py

@@ -64,8 +64,8 @@
 
 
 @plugin(category="drawing-utils", pluggable_name="clear", requires=["Rhino"])
-def clear_rhino():
-    compas_rhino.clear()
+def clear_rhino(guids=None):
+    compas_rhino.clear(guids=guids)
 
 
 @plugin(category="drawing-utils", pluggable_name="redraw", requires=["Rhino"])