Neuronavigation GUI revamp

invesalius/constants.py

@@ -182,6 +182,12 @@
                      _("Inverse Gray"):(256, (0, 0), (0, 0), (1,0)),
                      }
 
+#Colors for errors and positives
+RED_COLOR_FLOAT = (0.99, 0.55, 0.38)
+GREEN_COLOR_FLOAT = (0.40, 0.76, 0.65)
+RED_COLOR_RGB = (252, 141, 98)
+GREEN_COLOR_RGB = (102, 194, 165)
+
 # Volume view angle
 VOL_FRONT = wx.NewId()
 VOL_BACK = wx.NewId()
@@ -684,9 +690,8 @@
 POLARIS = 6
 POLARISP4 = 7
 OPTITRACK = 8
-ROBOT = 9
-DEBUGTRACKRANDOM = 10
-DEBUGTRACKAPPROACH = 11
+DEBUGTRACKRANDOM = 9
+DEBUGTRACKAPPROACH = 10
 DEFAULT_TRACKER = SELECT
 
 NDICOMPORT = b'COM1'
@@ -696,7 +701,7 @@
            _("Polhemus FASTRAK"), _("Polhemus ISOTRAK II"),
            _("Polhemus PATRIOT"), _("Camera tracker"),
            _("NDI Polaris"), _("NDI Polaris P4"),
-           _("Optitrack"), _("Robot tracker"),
+           _("Optitrack"),
            _("Debug tracker (random)"), _("Debug tracker (approach)")]
 
 STATIC_REF = 0
@@ -717,24 +722,25 @@
 TR3 = wx.NewId()
 SET = wx.NewId()
 
+FIDUCIAL_LABELS = ["Left Ear: ", "Right Ear: ", "Nose: "]
 IMAGE_FIDUCIALS = [
     {
         'button_id': IR1,
-        'label': 'LEI',
+        'label': 'Left Ear',
         'fiducial_name': 'LE',
         'fiducial_index': 0,
         'tip': _("Select left ear in image"),
     },
     {
         'button_id': IR2,
-        'label': 'REI',
+        'label': 'Right Ear',
         'fiducial_name': 'RE',
         'fiducial_index': 1,
         'tip': _("Select right ear in image"),
     },
     {
         'button_id': IR3,
-        'label': 'NAI',
+        'label': 'Nasion',
         'fiducial_name': 'NA',
         'fiducial_index': 2,
         'tip': _("Select nasion in image"),
@@ -744,21 +750,21 @@
 TRACKER_FIDUCIALS = [
     {
         'button_id': TR1,
-        'label': 'LET',
+        'label': 'Left Ear',
         'fiducial_name': 'LE',
         'fiducial_index': 0,
         'tip': _("Select left ear with spatial tracker"),
     },
     {
         'button_id': TR2,
-        'label': 'RET',
+        'label': 'Right Ear',
         'fiducial_name': 'RE',
         'fiducial_index': 1,
         'tip': _("Select right ear with spatial tracker"),
     },
     {
         'button_id': TR3,
-        'label': 'NAT',
+        'label': 'Nasion',
         'fiducial_name': 'NA',
         'fiducial_index': 2,
         'tip': _("Select nasion with spatial tracker"),

invesalius/control.py

@@ -127,6 +127,8 @@ def __bind_events(self):
         Publisher.subscribe(self.enable_mask_preview, 'Enable mask 3D preview')
         Publisher.subscribe(self.disable_mask_preview, 'Disable mask 3D preview')
         Publisher.subscribe(self.update_mask_preview, 'Update mask 3D preview')
+
+        Publisher.subscribe(self.LoadProject, 'Load project data')
 
     def SetBitmapSpacing(self, spacing):
         proj = prj.Project()

invesalius/data/coordinates.py

@@ -85,7 +85,6 @@ def GetCoordinatesForThread(tracker_connection, tracker_id, ref_mode):
                     const.POLARIS: PolarisCoord,
                     const.POLARISP4: PolarisP4Coord,
                     const.OPTITRACK: OptitrackCoord,
-                    const.ROBOT: RobotCoord,
                     const.DEBUGTRACKRANDOM: DebugCoordRandom,
                     const.DEBUGTRACKAPPROACH: DebugCoordRandom}
         coord, markers_flag = getcoord[tracker_id](tracker_connection, tracker_id, ref_mode)
@@ -577,14 +576,21 @@ def offset_coordinate(p_old, norm_vec, offset):
 class ReceiveCoordinates(threading.Thread):
     def __init__(self, tracker_connection, tracker_id, TrackerCoordinates, event):
         threading.Thread.__init__(self, name='ReceiveCoordinates')
-
+        self.__bind_events()
+        self.sleep_coord = const.SLEEP_COORDINATES
         self.tracker_connection = tracker_connection
         self.tracker_id = tracker_id
         self.event = event
         self.TrackerCoordinates = TrackerCoordinates
 
+    def __bind_events(self):
+        Publisher.subscribe(self.UpdateCoordSleep, 'Update coord sleep')
+
+    def UpdateCoordSleep(self, data):
+        self.sleep_coord = data
+
     def run(self):
         while not self.event.is_set():
             coord_raw, markers_flag = GetCoordinatesForThread(self.tracker_connection, self.tracker_id, const.DEFAULT_REF_MODE)
             self.TrackerCoordinates.SetCoordinates(coord_raw, markers_flag)
-            sleep(const.SLEEP_COORDINATES)
+            sleep(self.sleep_coord)

invesalius/data/tracker_connection.py

@@ -502,6 +502,88 @@ def Disconnect(self):
         super().Disconnect()
 
 
+class DebugTrackerRandomConnection(TrackerConnection):
+    def __init__(self, model=None):
+        super().__init__(model)
+
+    def Configure(self):
+        return True
+
+    def Connect(self):
+        self.connection = True
+        self.lib_mode = 'debug'
+        print('Debug device (random) started.')
+
+    def Disconnect(self):
+        self.connection = False
+        self.lib_mode = 'debug'
+        print('Debug tracker (random) disconnected.')
+
+
+class DebugTrackerApproachConnection(TrackerConnection):
+    def __init__(self, model=None):
+        super().__init__(model)
+
+    def Configure(self):
+        return True
+
+    def Connect(self):
+        self.connection = True
+        self.lib_mode = 'debug'
+        print('Debug device (approach) started.')
+
+    def Disconnect(self):
+        self.connection = False
+        self.lib_mode = 'debug'
+        print('Debug tracker (approach) disconnected.')
+
+
+TRACKER_CONNECTION_CLASSES = {
+    const.MTC: ClaronTrackerConnection,
+    const.FASTRAK: PolhemusTrackerConnection,
+    const.ISOTRAKII: PolhemusTrackerConnection,
+    const.PATRIOT: PolhemusTrackerConnection,
+    const.CAMERA: CameraTrackerConnection,
+    const.POLARIS: PolarisTrackerConnection,
+    const.POLARISP4: PolarisP4TrackerConnection,
+    const.OPTITRACK: OptitrackTrackerConnection,
+    const.DEBUGTRACKRANDOM: DebugTrackerRandomConnection,
+    const.DEBUGTRACKAPPROACH: DebugTrackerApproachConnection,
+}
+
+
+def CreateTrackerConnection(tracker_id):
+    """
+    Initialize spatial tracker connection for coordinate detection during navigation.
+
+    :param tracker_id: ID of tracking device.
+    :return spatial tracker connection instance or None if could not open device.
+    """
+    tracker_connection_class = TRACKER_CONNECTION_CLASSES[tracker_id]
+
+    # XXX: A better solution than to pass a 'model' parameter to the constructor of tracker
+    #   connection would be to have separate class for each model, possibly inheriting
+    #   the same base class, e.g., in this case, PolhemusTrackerConnection base class, which
+    #   would be inherited by FastrakTrackerConnection class, etc.
+    if tracker_id == const.FASTRAK:
+        model = 'fastrak'
+    elif tracker_id == const.ISOTRAKII:
+        model = 'isotrak'
+    elif tracker_id == const.PATRIOT:
+        model = 'patriot'
+    else:
+        model = None
+
+    tracker_connection = tracker_connection_class(
+        model=model
+    )
+    return tracker_connection
+
+
+
+'''
+Deprecated Code
+
 class RobotTrackerConnection(TrackerConnection):
     def __init__(self, model=None):
         super().__init__(model)
@@ -590,81 +672,4 @@ def SetConfiguration(self, configuration):
         self.configuration = configuration
         return True
 
-
-class DebugTrackerRandomConnection(TrackerConnection):
-    def __init__(self, model=None):
-        super().__init__(model)
-
-    def Configure(self):
-        return True
-
-    def Connect(self):
-        self.connection = True
-        self.lib_mode = 'debug'
-        print('Debug device (random) started.')
-
-    def Disconnect(self):
-        self.connection = False
-        self.lib_mode = 'debug'
-        print('Debug tracker (random) disconnected.')
-
-
-class DebugTrackerApproachConnection(TrackerConnection):
-    def __init__(self, model=None):
-        super().__init__(model)
-
-    def Configure(self):
-        return True
-
-    def Connect(self):
-        self.connection = True
-        self.lib_mode = 'debug'
-        print('Debug device (approach) started.')
-
-    def Disconnect(self):
-        self.connection = False
-        self.lib_mode = 'debug'
-        print('Debug tracker (approach) disconnected.')
-
-
-TRACKER_CONNECTION_CLASSES = {
-    const.MTC: ClaronTrackerConnection,
-    const.FASTRAK: PolhemusTrackerConnection,
-    const.ISOTRAKII: PolhemusTrackerConnection,
-    const.PATRIOT: PolhemusTrackerConnection,
-    const.CAMERA: CameraTrackerConnection,
-    const.POLARIS: PolarisTrackerConnection,
-    const.POLARISP4: PolarisP4TrackerConnection,
-    const.OPTITRACK: OptitrackTrackerConnection,
-    const.ROBOT: RobotTrackerConnection,
-    const.DEBUGTRACKRANDOM: DebugTrackerRandomConnection,
-    const.DEBUGTRACKAPPROACH: DebugTrackerApproachConnection,
-}
-
-
-def CreateTrackerConnection(tracker_id):
-    """
-    Initialize spatial tracker connection for coordinate detection during navigation.
-
-    :param tracker_id: ID of tracking device.
-    :return spatial tracker connection instance or None if could not open device.
-    """
-    tracker_connection_class = TRACKER_CONNECTION_CLASSES[tracker_id]
-
-    # XXX: A better solution than to pass a 'model' parameter to the constructor of tracker
-    #   connection would be to have separate class for each model, possibly inheriting
-    #   the same base class, e.g., in this case, PolhemusTrackerConnection base class, which
-    #   would be inherited by FastrakTrackerConnection class, etc.
-    if tracker_id == const.FASTRAK:
-        model = 'fastrak'
-    elif tracker_id == const.ISOTRAKII:
-        model = 'isotrak'
-    elif tracker_id == const.PATRIOT:
-        model = 'patriot'
-    else:
-        model = None
-
-    tracker_connection = tracker_connection_class(
-        model=model
-    )
-    return tracker_connection
+'''