FIX: NDI USB port selection error and better allignment to Distance text

Victor Hugo Souza
1 parent eb4d4519
Showing 4 changed files with 9 additions and 7 deletions Show diff stats
invesalius/data/trackers.py
invesalius/data/viewer_volume.py
invesalius/data/vtk_utils.py
invesalius/gui/dialogs.py
@@ -20,6 +20,7 @@ import invesalius.constants as const
 import invesalius.gui.dialogs as dlg
 # TODO: Disconnect tracker when a new one is connected
 # TODO: Test if there are too many prints when connection fails
+# TODO: Redesign error messages. No point in having "Could not connect to default tracker" in all trackers
 def TrackerConnection(tracker_id, trck_init, action):
@@ -958,8 +958,8 @@ class Viewer(wx.Panel):
     def CreateTextDistance(self):
         tdist = vtku.Text()
         tdist.SetSize(const.TEXT_SIZE_DIST_NAV)
-        tdist.SetPosition((const.X, 1.03-const.Y))
-        #tdist.ShadowOff()
+        tdist.SetPosition((const.X, 1.-const.Y))
+        tdist.SetVerticalJustificationToBottom()
         tdist.BoldOn()
         self.ren.AddActor(tdist.actor)
@@ -149,6 +149,7 @@ class Text(object):
                 self.mapper.SetInput(value.encode("utf-8", errors='replace'))
     def SetCoilDistanceValue(self, value):
+        #TODO: Not being used anymore. Can be deleted.
         if isinstance(value, int) or isinstance(value, float):
             value = 'Dist: ' + str("{:06.2f}".format(value)) + ' mm'
             if sys.platform == 'win32':
@@ -3807,12 +3807,11 @@ class SetNDIconfigs(wx.Dialog):
         ports = serial.tools.list_ports.comports()
         if sys.platform.startswith('win'):
             port_list = []
-            count = 0
+            desc_list = []
             for port, desc, hwid in sorted(ports):
                 port_list.append(port)
-                if 'NDI' in desc:
-                    port_selec = port, count
-                count += 1
+                desc_list.append(desc)
+            port_selec = [i for i, e in enumerate(desc_list) if 'NDI' in e]
         else:
             raise EnvironmentError('Unsupported platform')
@@ -3829,7 +3828,8 @@ class SetNDIconfigs(wx.Dialog):
         port_list, port_selec = self.serial_ports()
         self.com_ports.Append(port_list)
-        self.com_ports.SetSelection(port_selec[1])
+        if port_selec:
+            self.com_ports.SetSelection(port_selec[0])
         session = ses.Session()
         last_ndi_probe_marker = session.get('paths', 'last_ndi_probe_marker', '')
	@@ -20,6 +20,7 @@ import invesalius.constants as const		@@ -20,6 +20,7 @@ import invesalius.constants as const
20	import invesalius.gui.dialogs as dlg	20	import invesalius.gui.dialogs as dlg
21	# TODO: Disconnect tracker when a new one is connected	21	# TODO: Disconnect tracker when a new one is connected
22	# TODO: Test if there are too many prints when connection fails	22	# TODO: Test if there are too many prints when connection fails
		23	+# TODO: Redesign error messages. No point in having "Could not connect to default tracker" in all trackers
23		24
24		25
25	def TrackerConnection(tracker_id, trck_init, action):	26	def TrackerConnection(tracker_id, trck_init, action):
	@@ -149,6 +149,7 @@ class Text(object):		@@ -149,6 +149,7 @@ class Text(object):
149	self.mapper.SetInput(value.encode("utf-8", errors='replace'))	149	self.mapper.SetInput(value.encode("utf-8", errors='replace'))
150		150
151	def SetCoilDistanceValue(self, value):	151	def SetCoilDistanceValue(self, value):
		152	+ #TODO: Not being used anymore. Can be deleted.
152	if isinstance(value, int) or isinstance(value, float):	153	if isinstance(value, int) or isinstance(value, float):
153	value = 'Dist: ' + str("{:06.2f}".format(value)) + ' mm'	154	value = 'Dist: ' + str("{:06.2f}".format(value)) + ' mm'
154	if sys.platform == 'win32':	155	if sys.platform == 'win32':