ugly but functional

fastplotlib · clewis7 · Dec 12, 2022 · Dec 12, 2022 · Dec 14, 2022 · Dec 15, 2022
commit 9309b415e45da2dd611e7b8ff0f32ea7dde8fa01
diff --git a/examples/linecollection_event.ipynb b/examples/linecollection_event.ipynb
diff --git a/fastplotlib/graphics/__init__.py b/fastplotlib/graphics/__init__.py
@@ -12,6 +12,6 @@
    "LineGraphic",
    "HistogramGraphic",
    "HeatmapGraphic",
-    "LineCollection",
-    "TextGraphic"
+    "TextGraphic",
+    "LineCollection"
 ]
diff --git a/fastplotlib/graphics/_base.py b/fastplotlib/graphics/_base.py
@@ -7,7 +7,6 @@

 from abc import ABC, abstractmethod
 from dataclasses import dataclass
-# from .linecollection import LineCollection

 class Graphic:
    def __init__(
@@ -74,14 +73,12 @@ def __repr__(self):

 class Interaction(ABC):
    @property
-    @abstractmethod
    def indices(self) -> Any:
-        pass
+        return self.indices

    @indices.setter
-    @abstractmethod
    def indices(self, indices: Any):
-        pass
+        self.indices = indices

    @property
    @abstractmethod
@@ -93,34 +90,53 @@ def _set_feature(self, feature: str, new_data: Any, indices: Any):
        pass

    @abstractmethod
-    def _reset_feature(self, feature: str, old_data: Any, indices: Any):
+    def _reset_feature(self, feature: str, old_data: Any):
        pass

-    def link(self, event_type: str, target: Graphic, feature: str, new_data: Any, indices_mapper: callable = None):
+    def link(self, event_type: str, target: Any, feature: str, new_data: Any, indices_mapper: callable = None):
        valid_events = ["click"]
        if event_type in valid_events:
            self.world_object.add_event_handler(self.event_handler, event_type)
        else:
            raise ValueError("event not possible")

+        if isinstance(target.data, List):
+            old_data = list()
+            for line in target.data:
+                old_data.append(getattr(line, feature).copy())
+        else:
+            old_data = getattr(target, feature).copy()
+
        if event_type in self.registered_callbacks.keys():
            self.registered_callbacks[event_type].append(
-                CallbackData(target=target, feature=feature, new_data=new_data, old_data=getattr(target, feature).copy()))
+                CallbackData(target=target, feature=feature, new_data=new_data, old_data=old_data, indices_mapper=indices_mapper))
        else:
            self.registered_callbacks[event_type] = list()
            self.registered_callbacks[event_type].append(
-                CallbackData(target=target, feature=feature, new_data=new_data, old_data=getattr(target, feature).copy()))
+                CallbackData(target=target, feature=feature, new_data=new_data, old_data=old_data, indices_mapper=indices_mapper))

    def event_handler(self, event):
+        if event.type == "click":
+            # storing click information for each click in self.indices
+            #self.indices(np.array(event.pick_info["index"]))
+            click_info = np.array(event.pick_info["index"])
        if event.type in self.registered_callbacks.keys():
            for target_info in self.registered_callbacks[event.type]:
-                target_info.target._reset_feature(feature=target_info.feature, old_data=target_info.old_data, indices=None)
-                target_info.target._set_feature(feature=target_info.feature, new_data=target_info.new_data, indices=None)
+                # need to map the indices to the target using indices_mapper
+                if target_info.indices_mapper is not None:
+                    indices = target_info.indices_mapper(target=target_info.target, indices=click_info)
+                else:
+                    indices = None
+                # reset feature of target using stored old data
+                target_info.target._reset_feature(feature=target_info.feature, old_data=target_info.old_data)
+                # set feature of target at indice using new data
+                target_info.target._set_feature(feature=target_info.feature, new_data=target_info.new_data[indices], indices=indices)

 @dataclass
 class CallbackData:
    """Class for keeping track of the info necessary for interactivity after event occurs."""
-    target: Graphic
+    target: Any
    feature: str
    new_data: Any
    old_data: Any
+    indices_mapper: callable = None
diff --git a/fastplotlib/graphics/image.py b/fastplotlib/graphics/image.py
@@ -1,8 +1,4 @@
-<<<<<<< HEAD
-from typing import Tuple, Any, List
-=======
 from typing import *
->>>>>>> a9990946faa8b990ee2f5ab0f2fff93d99f18d9e

 import numpy as np
 import pygfx
@@ -76,18 +72,14 @@ def __init__(
            pygfx.ImageBasicMaterial(clim=(vmin, vmax), map=get_cmap_texture(cmap))
        )

-    @property
-    def indices(self) -> Any:
-        pass
-
    @property
    def features(self) -> List[str]:
-        pass
+        return ["cmap", "data"]

    def _set_feature(self, feature: str, new_data: Any, indices: Any):
        pass

-    def _reset_feature(self):
+    def _reset_feature(self, feature: str, old_data: Any):
        pass

    @property

diff --git a/fastplotlib/graphics/line.py b/fastplotlib/graphics/line.py
@@ -56,23 +56,19 @@ def update_colors(self, colors: np.ndarray):
        self.world_object.geometry.colors.data[:] = self.colors
        self.world_object.geometry.colors.update_range()

-    @property
-    def indices(self) -> Any:
-        return None
-
    @property
    def features(self) -> List[str]:
-        return None
+        return ["colors", "data"]

    def _set_feature(self, feature: str, new_data: Any, indices: Any = None):
-        if feature in ["colors", "data"]:
+        if feature in self.features:
            update_func = getattr(self, f"update_{feature}")
            update_func(new_data)
        else:
            raise ValueError("name arg is not a valid feature")

-    def _reset_feature(self, feature: str, old_data: Any, indices: Any = None):
-        if feature in ["colors", "data"]:
+    def _reset_feature(self, feature: str, old_data: Any):
+        if feature in self.features:
            update_func = getattr(self, f"update_{feature}")
            update_func(old_data)
        else:

diff --git a/fastplotlib/graphics/linecollection.py b/fastplotlib/graphics/linecollection.py
@@ -2,10 +2,9 @@
 import pygfx
 from typing import Union, List

-from .line import LineGraphic
+from fastplotlib.graphics.line import LineGraphic
 from typing import *
-from ._base import Interaction
-
+from fastplotlib.graphics._base import Interaction
 from abc import ABC, abstractmethod


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

-        self.collection = list()
+        self.data = list()

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

-            self.collection.append(LineGraphic(d, _z, _size, _colors, _cmap))
-
-    def _reset_feature(self):
-        pass
-
-    @property
-    def indices(self) -> Any:
-        pass
-
-    @indices.setter
-    @abstractmethod
-    def indices(self, indices: Any):
-        pass
+            self.data.append(LineGraphic(d, _z, _size, _colors, _cmap))

    @property
    def features(self) -> List[str]:
-        pass
+        return ["colors", "data"]

    def _set_feature(self, feature: str, new_data: Any, indices: Any):
-        if feature in ["colors", "data"]:
-            update_func = getattr(self, f"update_{feature}")
-            self.collection[indices].update_func(new_data)
+        if feature in self.features:
+            update_func = getattr(self.data[indices], f"update_{feature}")
+            # if indices is a single indices or list of indices
+            self.data[indices].update_colors(new_data)
+        else:
+            raise ValueError("name arg is not a valid feature")
+
+    def _reset_feature(self, feature: str, old_data: Any):
+        if feature in self.features:
+            #update_func = getattr(self, f"update_{feature}")
+            for i, line in enumerate(self.data):
+                line.update_colors(old_data[i])
        else:
            raise ValueError("name arg is not a valid feature")

    def __getitem__(self, item):
-        return self.collection[item]
+        return self.data[item]