small changes

fastplotlib · clewis7 · Dec 12, 2022 · Dec 12, 2022 · Dec 14, 2022 · Dec 15, 2022
commit 0f2253170bf17d075dfc2c08ad78734d02e28a1d
diff --git a/fastplotlib/graphics/_base.py b/fastplotlib/graphics/_base.py
@@ -88,22 +88,36 @@ def features(self) -> List[str]:
        pass

    @abstractmethod
-    def _set_feature(self, name: str, new_data: Any, indices: Any):
+    def _set_feature(self, feature: str, new_data: Any, indices: Any):
        pass

    @abstractmethod
-    def link(self, event: str, target: Graphic, feature: str, new_data: Any, indices_mapper: callable = None):
+    def _reset_feature(self):
        pass

+    def link(self, event_type: str, target: Graphic, 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 event_type in self.registered_callbacks.keys():
+            self.registered_callbacks[event_type].append(
+                CallbackData(target=target, feature=feature, new_data=new_data))
+        else:
+            self.registered_callbacks[event_type] = list()
+            self.registered_callbacks[event_type].append(
+                CallbackData(target=target, feature=feature, new_data=new_data))
+
    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 CallbackData:
    """Class for keeping track of the info necessary for interactivity after event occurs."""
-    def __init__(self, target: Graphic, feature: str, new_data: Any):
-        self.target = target
-        self.feature = feature
-        self.new_data = new_data
+    target: Graphic
+    feature: str
+    new_data: Any
diff --git a/fastplotlib/graphics/line.py b/fastplotlib/graphics/line.py
@@ -2,7 +2,7 @@
 import pygfx
 from typing import *

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

 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):
@@ -69,15 +69,5 @@ def _set_feature(self, feature: str, new_data: Any, indices: Any = None):
        else:
            raise ValueError("name arg is not a valid feature")

-    def link(self, event_type: str, target: Graphic, 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 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_type] = list()
-            self.registered_callbacks[event_type].append(EventData(target=target, feature=feature, new_data=new_data))
+    def _reset_feature():
+        pass