gc works for Line, LineCollection, Scatter not tested, regular RAM is not gc, WIP

kushalkolar · kushalkolar · commit 7e087db3ed6c · 2023-04-03T01:21:10.000-04:00
diff --git a/fastplotlib/graphics/line.py b/fastplotlib/graphics/line.py
@@ -85,12 +85,14 @@ def __init__(
 
         self.thickness = ThicknessFeature(self, thickness)
 
-        self._world_object: pygfx.Line = pygfx.Line(
+        world_object: pygfx.Line = pygfx.Line(
             # self.data.feature_data because data is a Buffer
             geometry=pygfx.Geometry(positions=self.data(), colors=self.colors()),
             material=material(thickness=self.thickness(), vertex_colors=True)
         )
 
+        self._set_world_object(world_object)
+
         if z_position is not None:
             self.world_object.position.z = z_position
 
diff --git a/fastplotlib/graphics/line_collection.py b/fastplotlib/graphics/line_collection.py
@@ -157,7 +157,7 @@ def __init__(
                         "or must be a str of tuple/list with the same length as the data"
                     )
 
-        self._world_object = pygfx.Group()
+        self._set_world_object(pygfx.Group())
 
         for i, d in enumerate(data):
             if isinstance(z_position, list):
diff --git a/fastplotlib/graphics/scatter.py b/fastplotlib/graphics/scatter.py
@@ -72,9 +72,11 @@ def __init__(
 
         super(ScatterGraphic, self).__init__(*args, **kwargs)
 
-        self._world_object: pygfx.Points = pygfx.Points(
+        world_object = pygfx.Points(
             pygfx.Geometry(positions=self.data(), sizes=sizes, colors=self.colors()),
             material=pygfx.PointsMaterial(vertex_colors=True, vertex_sizes=True)
         )
 
+        self._set_world_object(world_object)
+
         self.world_object.position.z = z_position
diff --git a/fastplotlib/layouts/_base.py b/fastplotlib/layouts/_base.py
@@ -3,7 +3,7 @@
     Viewport, WgpuRenderer
 from wgpu.gui.auto import WgpuCanvas
 from warnings import warn
-from ..graphics._base import Graphic, WORLD_OBJECTS
+from ..graphics._base import Graphic, GraphicCollection, WORLD_OBJECTS
 from ..graphics.line_slider import LineSlider
 from typing import *
 
@@ -319,8 +319,18 @@ def delete_graphic(self, graphic: Graphic):
 
         self._graphics.remove(graphic)
 
-        # delete associated world object to free GPU VRAM
+        # for GraphicCollection objects
+        if isinstance(graphic, GraphicCollection):
+            # clear Group
+            graphic.world_object.clear()
+            # delete all child world objects in the collection
+            for g in graphic.graphics:
+                subloc = hex(id(g))
+                del WORLD_OBJECTS[subloc]
+
+        # get mem location of graphic
         loc = hex(id(graphic))
+        # delete world object
         del WORLD_OBJECTS[loc]
 
         del graphic

Original file line number	Diff line number	Diff line change
`@@ -157,7 +157,7 @@ def __init__(`
`157`	`157`	`"or must be a str of tuple/list with the same length as the data"`
`158`	`158`	`)`
`159`	`159`
`160`		`- self._world_object = pygfx.Group()`
	`160`	`+ self._set_world_object(pygfx.Group())`
`161`	`161`
`162`	`162`	`for i, d in enumerate(data):`
`163`	`163`	`if isinstance(z_position, list):`