Added generic annotation for mypy

invesalius/gui/widgets/clut_raycasting.py

@@ -137,8 +137,8 @@ def __init__(self, parent: wx.Window, id: int):
         parent -- parent of this frame
         """
         super().__init__(parent, id)
-        self.points: List[List[Dict]] = []
-        self.colours: List[List[Dict]] = []
+        self.points: List[List[Dict[str, float]]] = []
+        self.colours: List[List[Dict[str, float]]] = []
         self.curves: List[Curve] = []
         self.init: float = -1024
         self.end: float = 2000
@@ -653,7 +653,7 @@ def __sort_pixel_points(self) -> None:
         width when the user interacts with this widgets.
         """
         for n, (point, colour) in enumerate(zip(self.points, self.colours)):
-            point_colour: Iterable[Tuple[Dict, Dict]] = zip(point, colour)
+            point_colour: Iterable[Tuple[Dict[str, float], Dict[str, float]]] = zip(point, colour)
             point_colour = sorted(point_colour, key=lambda x: x[0]["x"])
             self.points[n] = [i[0] for i in point_colour]
             self.colours[n] = [i[1] for i in point_colour]
@@ -687,7 +687,7 @@ def CalculatePixelPoints(self) -> None:
             self.curves.append(curve)
         self._build_histogram()
 
-    def HounsfieldToPixel(self, graylevel: float) -> float:
+    def HounsfieldToPixel(self, graylevel: float) -> int:
         """
         Given a Hounsfield point returns a pixel point in the canvas.
         """
@@ -697,7 +697,7 @@ def HounsfieldToPixel(self, graylevel: float) -> float:
         x = (graylevel - self.init) * proportion + TOOLBAR_SIZE
         return x
 
-    def OpacityToPixel(self, opacity: int) -> int:
+    def OpacityToPixel(self, opacity: float) -> int:
         """
         Given a Opacity point returns a pixel point in the canvas.
         """
@@ -725,7 +725,7 @@ def PixelToOpacity(self, y: int) -> float:
         opacity = (height - y + self.padding) * 1.0 / height
         return opacity
 
-    def SetRaycastPreset(self, preset: Dict) -> None:
+    def SetRaycastPreset(self, preset: Dict[str, List[List[Dict[str, float]]]]) -> None:
         if not preset:
             self.to_draw_points = 0
         elif preset["advancedCLUT"]:

invesalius/gui/widgets/slice_menu.py

@@ -20,7 +20,7 @@
 # --------------------------------------------------------------------------
 import sys
 from collections import OrderedDict
-from typing import Dict, Union
+from typing import Dict, Optional, Union
 
 import wx
 
@@ -48,7 +48,7 @@ class SliceMenu(wx.Menu):
     def __init__(self) -> None:
         wx.Menu.__init__(self)
         self.ID_TO_TOOL_ITEM: Dict[Union[wx.WindowIDRef, int], wx.MenuItem] = {}
-        self.cdialog = None
+        self.cdialog: Optional[ClutImagedataDialog] = None
 
         # ------------ Sub menu of the window and level ----------
         submenu_wl = wx.Menu()

pyproject.toml

@@ -35,9 +35,9 @@ follow_imports = "normal"
 explicit_package_bases = true
 disable_error_code =  ["attr-defined", "no-redef"]
 
-[mypy-invesalius.gui.widgets.listctrl]
+[[tool.mypy.overrides]]
+module = 'invesalius.gui.widgets.listctrl'
 ignore_errors = true
-
 [[tool.mypy.overrides]]
 module = 'wx.*'
 disable_error_code = ["no-redef"] # because some classes are redefined in the stubs