updates to line, works w previous example

fastplotlib · clewis7 · Dec 12, 2022 · Dec 12, 2022 · Dec 14, 2022 · Dec 15, 2022
commit e203cff1bf75c23196dbad00b41e0780bb0e3b6f
diff --git a/fastplotlib/graphics/_base.py b/fastplotlib/graphics/_base.py
@@ -71,14 +71,7 @@ def __repr__(self):
        else:
            return f"fastplotlib.{self.__class__.__name__} @ {hex(id(self))}"

-    def event_handler(self, event):
-        if event.type in self.registered_callbacks.keys():
-            for target_info in self.registered_callbacks[event.type]:
-                target_info.target._set_feature(name=target_info.feature, new_data=target_info.new_data,
-                                                indices=target_info.indices)
-
 class Interaction(ABC):
-    # make them abstract properties
    @property
    @abstractmethod
    def indices(self) -> Any:
@@ -100,20 +93,17 @@ def _set_feature(self, name: str, new_data: Any, indices: Any):

    @abstractmethod
    def link(self, event: str, target: Graphic, feature: str, new_data: Any, indices_mapper: callable = None):
-        # event occurs, causes change in feature of current graphic to data indices from pick_info,
-        # also causes change in target graphic to target feature at target data with corresponding or mapped
-        # indices based on the indice_mapper function
-
-        # events can be feature changes, when feature changes want to trigger an event
-
-        # indice mapper takes in source features and maps to target features
        pass

+    def event_handler(self, event):
+        if event.type in self.registered_callbacks.keys():
+            for target_info in self.registered_callbacks[event.type]:
+                target_info.target._set_feature(feature=target_info.feature, new_data=target_info.new_data)
+
 @dataclass
 class EventData:
    """Class for keeping track of the info necessary for interactivity after event occurs."""
-    def __init__(self, target: Graphic, feature: str, new_data: Any, indices: Any):
+    def __init__(self, target: Graphic, feature: str, new_data: Any):
        self.target = target
        self.feature = feature
        self.new_data = new_data
-        self.indices = indices
diff --git a/fastplotlib/graphics/line.py b/fastplotlib/graphics/line.py
@@ -2,10 +2,9 @@
 import pygfx
 from typing import *

-from ._base import Graphic
-from ._base import EventData
+from ._base import Graphic, EventData, Interaction

-class LineGraphic(Graphic):
+class LineGraphic(Graphic, Interaction):
    def __init__(self, data: np.ndarray, zlevel: float = None, size: float = 2.0, colors: np.ndarray = None, cmap: str = None, *args, **kwargs):
        super(LineGraphic, self).__init__(data, colors=colors, cmap=cmap, *args, **kwargs)

@@ -57,29 +56,28 @@ def update_colors(self, colors: np.ndarray):

    @property
    def indices(self) -> Any:
-        return self.indices
+        return None

    @property
    def features(self) -> List[str]:
-        return self.features
+        return None

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

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

-        if event in self.registered_callbacks.keys():
-            self.registered_callbacks[event].append(EventData(target=target, feature=feature, new_data=new_data, indices=None))
+        if event_type in self.registered_callbacks.keys():
+            self.registered_callbacks[event_type].append(EventData(target=target, feature=feature, new_data=new_data))
        else:
-            self.registered_callbacks[event] = list()
-            self.registered_callbacks[event].append(EventData(target=target, feature=feature, new_data=new_data, indices=None))
+            self.registered_callbacks[event_type] = list()
+            self.registered_callbacks[event_type].append(EventData(target=target, feature=feature, new_data=new_data))