fixed second review errors

invesalius/gui/widgets/canvas_renderer.py

@@ -109,9 +109,9 @@ def __init__(
         self._drawn: bool = False
         self._init_canvas()
 
-        self._over_obj = None
-        self._drag_obj = None
-        self._selected_obj = None
+        self._over_obj: Optional[CanvasObjects] = None
+        self._drag_obj: Optional[CanvasObjects] = None
+        self._selected_obj: Optional[CanvasObjects] = None
 
         self._callback_events: Dict[str, List[Callable]] = {
             "LeftButtonPressEvent": [],
@@ -130,18 +130,18 @@ def _bind_events(self) -> None:
         iren.Bind(wx.EVT_LEFT_DCLICK, self.OnDoubleClick)
         self.canvas_renderer.AddObserver("StartEvent", self.OnPaint)
 
-    def subscribe_event(self, event, callback) -> None:
+    def subscribe_event(self, event: str, callback: Callable) -> None:
         ref = WeakMethod(callback)
         self._callback_events[event].append(ref)
 
-    def unsubscribe_event(self, event, callback) -> None:
+    def unsubscribe_event(self, event: str, callback: Callable) -> None:
         for n, cb in enumerate(self._callback_events[event]):
             if cb() == callback:
                 print("removed")
                 self._callback_events[event].pop(n)
                 return
 
-    def propagate_event(self, root, event) -> None:
+    def propagate_event(self, root: Optional["CanvasObjects"], event: CanvasEvent) -> None:
         print("propagating", event.event_name, "from", root)
         node = root
         callback_name = f"on_{event.event_name}"
@@ -1097,7 +1097,7 @@ def __init__(
         self.children = []
 
         if points is None:
-            self.points = []
+            self.points: List[Union[Tuple[float, float], Tuple[float, float, float]]] = []
         else:
             self.points = points
 
@@ -1149,7 +1149,7 @@ def draw_to_canvas(self, gc: wx.GraphicsContext, canvas: CanvasRendererCTX) -> N
         #  for handler in self.handlers:
         #  handler.draw_to_canvas(gc, canvas)
 
-    def append_point(self, point) -> None:
+    def append_point(self, point: Union[Tuple[float, float], Tuple[float, float]]) -> None:
         handler = CircleHandler(self, point, is_3d=self.is_3d, fill_colour=(255, 0, 0, 255))
         handler.layer = 1
         self.add_child(handler)

invesalius/gui/widgets/clut_imagedata.py

@@ -1,9 +1,12 @@
 import math
 from dataclasses import dataclass, field
-from typing import List, Optional, Tuple, Union
+from typing import TYPE_CHECKING, List, Optional, Tuple, Union
 
 import wx
 
+if TYPE_CHECKING:
+    import numpy as np
+
 HISTOGRAM_LINE_COLOUR = (128, 128, 128)
 HISTOGRAM_FILL_COLOUR = (64, 64, 64)
 HISTOGRAM_LINE_WIDTH = 1
@@ -51,7 +54,7 @@ def __init__(
         self,
         parent: wx.Window,
         id: int,
-        histogram,
+        histogram: "np.ndarray",
         init: float,
         end: float,
         nodes: Optional[List[Node]] = None,

invesalius/gui/widgets/clut_raycasting.py

@@ -31,6 +31,8 @@
 from invesalius.pubsub import pub as Publisher
 
 if TYPE_CHECKING:
+    import numpy as np
+
     from typings.utils import SupportsGetItem
 
 FONT_COLOUR = (1, 1, 1)
@@ -344,7 +346,9 @@ def _has_clicked_in_a_point(
                     return (i, j)
         return None
 
-    def distance_from_point_line(self, p1, p2, pc) -> numpy.floating[Any]:
+    def distance_from_point_line(
+        self, p1: Tuple[float, float], p2: Tuple[float, float], pc: Tuple[float, float]
+    ) -> numpy.floating[Any]:
         """
         Calculate the distance from point pc to a line formed by p1 and p2.
         """
@@ -737,7 +741,7 @@ def SetRaycastPreset(self, preset: Dict[str, List[List[Dict[str, float]]]]) -> N
             self.to_draw_points = 0
         self.Refresh()
 
-    def SetHistogramArray(self, h_array, range) -> None:
+    def SetHistogramArray(self, h_array: "np.ndarray", range: Tuple[float, float]) -> None:
         self.histogram_array = h_array
         self.Histogram.init = range[0]
         self.Histogram.end = range[1]

typings/utils/__init__.pyi

@@ -11,6 +11,7 @@ class SupportsGetItem(Protocol, Generic[T]):
     def __getitem__(self, key: int, /) -> T: ...
 
 class CanvasObjects(Protocol):
+    parent: Self | None
     def is_over(self, x: int, y: int) -> Self | None: ...
     def draw_to_canvas(self, gc: wx.GraphicsContext, canvas: CanvasRendererCTX) -> None: ...