Merge branch 'invesalius:master' into addLogging

rishabh-ranjan1 · Aug 28, 2024 · 441bb5f · 441bb5f
2 parents 7dc1e9a + ce7aa71
commit 441bb5f
Show file tree

Hide file tree

Showing 50 changed files with 3,955 additions and 4,452 deletions.
diff --git a/app.py b/app.py
@@ -167,7 +167,7 @@ def __init__(self):
             # except on win64, due to wxWidgets bug
             try:
                 ok = dialog.ShowModal() == wx.ID_OK
-            except wx._core.PyAssertionError:
+            except wx.PyAssertionError:
                 ok = True
             finally:
                 if ok:

diff --git a/invesalius/constants.py b/invesalius/constants.py
@@ -19,7 +19,7 @@
 
 import itertools
 import sys
-from typing import Dict, Optional, Tuple, Union
+from typing import Dict, List, Optional, Tuple, Union
 
 import psutil
 import wx
@@ -290,7 +290,7 @@
 MASK_NAME_PATTERN = _("Mask %d")
 MASK_OPACITY = 0.40
 # MASK_OPACITY = 0.35
-MASK_COLOUR = [
+MASK_COLOUR: List[List[float]] = [
     [0.33, 1, 0.33],
     [1, 1, 0.33],
     [0.33, 0.91, 1],
@@ -312,7 +312,7 @@
 
 MEASURE_COLOUR = itertools.cycle([[1, 0, 0], [1, 0.4, 0], [0, 0, 1], [1, 0, 1], [0, 0.6, 0]])
 
-SURFACE_COLOUR = [
+SURFACE_COLOUR: List[Tuple[float, float, float]] = [
     (0.33, 1, 0.33),
     (1, 1, 0.33),
     (0.33, 0.91, 1),