bug and filter out wheel events too

kushalkolar · kushalkolar · commit 247c191539d1 · 2024-07-31T02:30:51.000-04:00
diff --git a/fastplotlib/layouts/_utils.py b/fastplotlib/layouts/_utils.py
@@ -2,7 +2,7 @@
 
 import pygfx
 from pygfx import WgpuRenderer, Texture, Renderer
-from pygfx.renderers.wgpu.engine.renderer import EVENT_TYPE_MAP, PointerEvent
+from pygfx.renderers.wgpu.engine.renderer import EVENT_TYPE_MAP, PointerEvent, WheelEvent
 
 from wgpu.gui import WgpuCanvasBase
 
@@ -18,7 +18,7 @@ def __init__(self, target, *args, **kwargs):
     def convert_event(self, event: dict):
         event_type = event["event_type"]
 
-        if EVENT_TYPE_MAP[event_type] is PointerEvent:
+        if EVENT_TYPE_MAP[event_type] in [PointerEvent, WheelEvent]:
             for filt in self.event_filters.values():
                 if (
                     filt[0, 0] < event["x"] < filt[1, 0]
diff --git a/fastplotlib/utils/functions.py b/fastplotlib/utils/functions.py
@@ -63,7 +63,7 @@ def make_colors(n_colors: int, cmap: str, alpha: float = 1.0) -> np.ndarray:
         if n_colors > max_colors:
             raise ValueError(
                 f"You have requested <{n_colors}> colors but only <{max_colors}> exist for the "
-                f"chosen cmap: <{name}>"
+                f"chosen cmap: <{cmap}>"
             )
         return np.asarray(cm.color_stops, dtype=np.float32)[:n_colors, 1:]
 

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ def make_colors(n_colors: int, cmap: str, alpha: float = 1.0) -> np.ndarray:`
`63`	`63`	`if n_colors > max_colors:`
`64`	`64`	`raise ValueError(`
`65`	`65`	`f"You have requested <{n_colors}> colors but only <{max_colors}> exist for the "`
`66`		`- f"chosen cmap: <{name}>"`
	`66`	`+ f"chosen cmap: <{cmap}>"`
`67`	`67`	`)`
`68`	`68`	`return np.asarray(cm.color_stops, dtype=np.float32)[:n_colors, 1:]`
`69`	`69`