LineCollection has @world_object, fix float64 bug in LineGraphic

fastplotlib · clewis7 · Dec 12, 2022 · Dec 12, 2022 · Dec 14, 2022 · Dec 15, 2022
commit a6b53ee89e78e04f25ce53e15922384902965d11
diff --git a/examples/linecollection_event.ipynb b/examples/linecollection_event.ipynb
diff --git a/fastplotlib/graphics/line.py b/fastplotlib/graphics/line.py
@@ -28,7 +28,7 @@ def __init__(self, data: np.ndarray, z_position: float = None, size: float = 2.0
    def fix_data(self):
        # TODO: data should probably be a property of any Graphic?? Or use set_data() and get_data()
        if self.data.ndim == 1:
-            self.data = np.dstack([np.arange(self.data.size), self.data])[0]
+            self.data = np.dstack([np.arange(self.data.size), self.data])[0].astype(np.float32)

        if self.data.shape[1] != 3:
            if self.data.shape[1] != 2:

diff --git a/fastplotlib/graphics/linecollection.py b/fastplotlib/graphics/linecollection.py
@@ -8,9 +8,16 @@
 from abc import ABC, abstractmethod


-class LineCollection():
-    def __init__(self, data: List[np.ndarray], z_position: Union[List[float], float] = None, size: Union[float, List[float]] = 2.0, colors: Union[List[np.ndarray], np.ndarray] = None,
-                 cmap: Union[List[str], str] = None, *args, **kwargs):
+class LineCollection:
+    def __init__(self, data: List[np.ndarray],
+                 z_position: Union[List[float], float] = None,
+                 size: Union[float, List[float]] = 2.0,
+                 colors: Union[List[np.ndarray], np.ndarray] = None,
+                 cmap: Union[List[str], str] = None,
+                 *args,
+                 **kwargs):
+
+        self.name = None

        if not isinstance(z_position, float) and z_position is not None:
            if not len(data) == len(z_position):
@@ -26,6 +33,7 @@ def __init__(self, data: List[np.ndarray], z_position: Union[List[float], float]
                raise ValueError("args must be the same length")

        self.data = list()
+        self._world_object = pygfx.Group()

        for i, d in enumerate(data):
            if isinstance(z_position, list):
@@ -48,7 +56,14 @@ def __init__(self, data: List[np.ndarray], z_position: Union[List[float], float]
            else:
                _cmap = cmap

-            self.data.append(LineGraphic(d, _z, _size, _colors, _cmap))
+            lg = LineGraphic(d, _z, _size, _colors, _cmap)
+            self.data.append(lg)
+            self._world_object.add(lg.world_object)
+
+    # TODO: make a base class for Collection graphics and put this as a base method
+    @property
+    def world_object(self) -> pygfx.WorldObject:
+        return self._world_object

    @property
    def features(self) -> List[str]: