Merge branch 'master' into multimodal_tracking

Renan · GitHub
2 parents f64959b9 0acb6ee2
Showing 4 changed files with 108 additions and 86 deletions Show diff stats
app.py
invesalius/constants.py
invesalius/gui/task_navigator.py
invesalius/i18n.py
@@ -87,11 +87,11 @@ session = ses.Session()
 if session.ReadSession():
     lang = session.GetLanguage()
     if lang:
-        LANG = lang
         try:
             _ = i18n.InstallLanguage(lang)
+            LANG = lang
         except FileNotFoundError:
-            LANG = None
+            pass
 class InVesalius(wx.App):
@@ -134,7 +134,7 @@ class Inv3SplashScreen(SplashScreen):
     Splash screen to be shown in InVesalius initialization.
     """
     def __init__(self):
-        # Splash screen image will depend on currently language
+        # Splash screen image will depend on the current language
         lang = LANG
         self.locale = wx.Locale(wx.LANGUAGE_ENGLISH)
@@ -143,22 +143,20 @@ class Inv3SplashScreen(SplashScreen):
         # should be created
         create_session = LANG is None
-        install_lang = 0
+        install_lang = False
         if lang:
             _ = i18n.InstallLanguage(lang)
-            install_lang = 1
-        else:
-            install_lang = 0
+            install_lang = True
         # If no language is set into session file, show dialog so
         # user can select language
-        if install_lang == 0:
+        if not install_lang:
             dialog = lang_dlg.LanguageDialog()
             # FIXME: This works ok in linux2, darwin and win32,
             # except on win64, due to wxWidgets bug
             try:
-                ok = (dialog.ShowModal() == wx.ID_OK)
+                ok = dialog.ShowModal() == wx.ID_OK
             except wx._core.PyAssertionError:
                 ok = True
             finally:
@@ -174,9 +172,8 @@ class Inv3SplashScreen(SplashScreen):
             dialog.Destroy()
-        # Session file should be created... So we set the recent
-        # choosen language
-        if (create_session):
+        # Session file should be created... So we set the recently chosen language.
+        if create_session:
             session.CreateItens()
             session.SetLanguage(lang)
             session.WriteSessionFile()
@@ -184,8 +181,7 @@ class Inv3SplashScreen(SplashScreen):
         #  session.SaveConfigFileBackup()
-        # Only after language was defined, splash screen will be
-        # shown
+        # Only after language was defined, splash screen will be shown.
         if lang:
             #import locale
@@ -206,9 +202,7 @@ class Inv3SplashScreen(SplashScreen):
                 abs_file_path = os.path.abspath(".." + os.sep)
                 path = abs_file_path
                 path = os.path.join(path, 'icons', icon_file)
-
             else:
-
                 path = os.path.join(inv_paths.ICON_DIR, icon_file)
                 if not os.path.exists(path):
                     path = os.path.join(inv_paths.ICON_DIR, "splash_en.png")
@@ -241,7 +235,7 @@ class Inv3SplashScreen(SplashScreen):
         self.control = Controller(self.main)
         self.fc = wx.CallLater(200, self.ShowMain)
-        options, args = parse_comand_line()
+        options, args = parse_command_line()
         wx.CallLater(1, use_cmd_optargs, options, args)
         # Check for updates
@@ -292,7 +286,7 @@ def non_gui_startup(options, args):
 # ------------------------------------------------------------------
-def parse_comand_line():
+def parse_command_line():
     """
     Handle command line arguments.
     """
@@ -302,7 +296,7 @@ def parse_comand_line():
     # Parse command line arguments
     parser = op.OptionParser()
-    # -d or --debug: print all pubsub messagessent
+    # -d or --debug: print all pubsub messages sent
     parser.add_option("-d", "--debug",
                       action="store_true",
                       dest="debug")
@@ -353,12 +347,6 @@ def parse_comand_line():
 def use_cmd_optargs(options, args):
-    # If debug argument...
-    if options.debug:
-        Publisher.subscribe(print_events, Publisher.ALL_TOPICS)
-        session = ses.Session()
-        session.debug = 1
-
     # If import DICOM argument...
     if options.dicom_dir:
         import_dir = options.dicom_dir
@@ -494,11 +482,18 @@ def print_events(topic=Publisher.AUTO_TOPIC, **msg_data):
     """
     utils.debug("%s\n\tParameters: %s" % (topic, msg_data))
+
 def main():
     """
     Initialize InVesalius GUI
     """
-    options, args = parse_comand_line()
+    options, args = parse_command_line()
+
+    session = ses.Session()
+    session.debug = options.debug
+
+    if options.debug:
+        Publisher.subscribe(print_events, Publisher.ALL_TOPICS)
     if options.remote_host is not None:
         from invesalius.net.remote_control import RemoteControl
@@ -517,6 +512,7 @@ def main():
         application = InVesalius(0)
         application.MainLoop()
+
 if __name__ == '__main__':
     #Is needed because of pyinstaller
     multiprocessing.freeze_support()
@@ -655,6 +655,18 @@ BOOLEAN_DIFF = 2
 BOOLEAN_AND = 3
 BOOLEAN_XOR = 4
+# -------------- User interface ---------------------
+
+# The column order in the marker panel
+#
+ID_COLUMN = 0
+SESSION_COLUMN = 1
+LABEL_COLUMN = 2
+TARGET_COLUMN = 3
+X_COLUMN = 4
+Y_COLUMN = 5
+Z_COLUMN = 6
+
 #------------ Navigation defaults -------------------
 MARKER_COLOUR = (1.0, 1.0, 0.)
@@ -61,9 +61,11 @@ import invesalius.data.slice_ as sl
 import invesalius.data.tractography as dti
 import invesalius.data.record_coords as rec
 import invesalius.data.vtk_utils as vtk_utils
+import invesalius.data.bases as db
 import invesalius.gui.dialogs as dlg
 import invesalius.project as prj
-import invesalius.data.bases as db
+import invesalius.session as ses
+
 from invesalius import utils
 from invesalius.gui import utils as gui_utils
 from invesalius.navigation.icp import ICP
@@ -1249,6 +1251,8 @@ class MarkersPanel(wx.Panel):
         self.__bind_events()
+        self.session = ses.Session()
+
         self.current_coord = 0, 0, 0, 0, 0, 0
         self.current_angle = 0, 0, 0
         self.current_seed = 0, 0, 0
@@ -1309,21 +1313,27 @@ class MarkersPanel(wx.Panel):
         # List of markers
         self.lc = wx.ListCtrl(self, -1, style=wx.LC_REPORT, size=wx.Size(0,120))
-        self.lc.InsertColumn(0, '#')
-        self.lc.InsertColumn(1, 'X')
-        self.lc.InsertColumn(2, 'Y')
-        self.lc.InsertColumn(3, 'Z')
-        self.lc.InsertColumn(4, 'Label')
-        self.lc.InsertColumn(5, 'Target')
-        self.lc.InsertColumn(6, 'Session')
-
-        self.lc.SetColumnWidth(0, 28)
-        self.lc.SetColumnWidth(1, 50)
-        self.lc.SetColumnWidth(2, 50)
-        self.lc.SetColumnWidth(3, 50)
-        self.lc.SetColumnWidth(4, 60)
-        self.lc.SetColumnWidth(5, 60)
-        self.lc.SetColumnWidth(5, 50)
+        self.lc.InsertColumn(const.ID_COLUMN, '#')
+        self.lc.SetColumnWidth(const.ID_COLUMN, 28)
+
+        self.lc.InsertColumn(const.SESSION_COLUMN, 'Session')
+        self.lc.SetColumnWidth(const.SESSION_COLUMN, 52)
+
+        self.lc.InsertColumn(const.LABEL_COLUMN, 'Label')
+        self.lc.SetColumnWidth(const.LABEL_COLUMN, 118)
+
+        self.lc.InsertColumn(const.TARGET_COLUMN, 'Target')
+        self.lc.SetColumnWidth(const.TARGET_COLUMN, 45)
+
+        if self.session.debug:
+            self.lc.InsertColumn(const.X_COLUMN, 'X')
+            self.lc.SetColumnWidth(const.X_COLUMN, 45)
+
+            self.lc.InsertColumn(const.Y_COLUMN, 'Y')
+            self.lc.SetColumnWidth(const.Y_COLUMN, 45)
+
+            self.lc.InsertColumn(const.Z_COLUMN, 'Z')
+            self.lc.SetColumnWidth(const.Z_COLUMN, 45)
         self.lc.Bind(wx.EVT_LIST_ITEM_RIGHT_CLICK, self.OnMouseRightDown)
         self.lc.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.OnItemBlink)
@@ -1341,7 +1351,6 @@ class MarkersPanel(wx.Panel):
         self.Update()
     def __bind_events(self):
-        # Publisher.subscribe(self.UpdateCurrentCoord, 'Co-registered points')
         Publisher.subscribe(self.UpdateCurrentCoord, 'Set cross focal point')
         Publisher.subscribe(self.OnDeleteMultipleMarkers, 'Delete fiducial marker')
         Publisher.subscribe(self.OnDeleteAllMarkers, 'Delete all markers')
@@ -1352,13 +1361,15 @@ class MarkersPanel(wx.Panel):
         Publisher.subscribe(self.UpdateRobotCoordinates, 'Update raw coordinates')
     def __find_target_marker(self):
-        """Return the index of the marker currently selected as target (there
-        should be at most one). If there is no such marker, return -1."""
+        """
+        Return the index of the marker currently selected as target (there
+        should be at most one). If there is no such marker, return None.
+        """
         for i in range(len(self.markers)):
             if self.markers[i].is_target:
                 return i
-        return -1
+        return None
     def __get_selected_items(self):
         """    
@@ -1368,14 +1379,15 @@ class MarkersPanel(wx.Panel):
         next = self.lc.GetFirstSelected()
-        while next != -1:
+        while next is not None:
             selection.append(next)
             next = self.lc.GetNextSelected(next)
         return selection
     def __delete_multiple_markers(self, index):
-        """ Delete multiple markers indexed by index. index must be sorted in
+        """
+        Delete multiple markers indexed by index. index must be sorted in
         the ascending order.
         """
         for i in reversed(index):
@@ -1383,11 +1395,13 @@ class MarkersPanel(wx.Panel):
             del self.robot_markers[i]
             self.lc.DeleteItem(i)
             for n in range(0, self.lc.GetItemCount()):
-                self.lc.SetItem(n, 0, str(n+1))
+                self.lc.SetItem(n, 0, str(n + 1))
         Publisher.sendMessage('Remove multiple markers', index=index)
     def __set_marker_as_target(self, idx):
-        """Set marker indexed by idx as the new target. idx must be a valid index."""
+        """
+        Set marker indexed by idx as the new target. idx must be a valid index.
+        """
         # Find the previous target
         prev_idx = self.__find_target_marker()
@@ -1396,16 +1410,16 @@ class MarkersPanel(wx.Panel):
             return
         # Unset the previous target
-        if prev_idx != -1:
+        if prev_idx is not None:
             self.markers[prev_idx].is_target = False
             self.lc.SetItemBackgroundColour(prev_idx, 'white')
             Publisher.sendMessage('Set target transparency', status=False, index=prev_idx)
-            self.lc.SetItem(prev_idx, 5, "")
+            self.lc.SetItem(prev_idx, const.TARGET_COLUMN, "")
         # Set the new target
         self.markers[idx].is_target = True
         self.lc.SetItemBackgroundColour(idx, 'RED')
-        self.lc.SetItem(idx, 5, _("Yes"))
+        self.lc.SetItem(idx, const.TARGET_COLUMN, _("Yes"))
         Publisher.sendMessage('Update target', coord=self.markers[idx].coord)
         Publisher.sendMessage('Set target transparency', status=True, index=idx)
@@ -1471,9 +1485,9 @@ class MarkersPanel(wx.Panel):
     def OnMenuEditMarkerLabel(self, evt):
         list_index = self.lc.GetFocusedItem()
         if list_index != -1:
-            new_label = dlg.ShowEnterMarkerID(self.lc.GetItemText(list_index, 4))
+            new_label = dlg.ShowEnterMarkerID(self.lc.GetItemText(list_index, const.LABEL_COLUMN))
             self.markers[list_index].label = str(new_label)
-            self.lc.SetItem(list_index, 4, new_label)
+            self.lc.SetItem(list_index, const.LABEL_COLUMN, new_label)
         else:
             wx.MessageBox(_("No data selected."), _("InVesalius 3"))
@@ -1500,7 +1514,7 @@ class MarkersPanel(wx.Panel):
             # XXX: Seems like a slightly too early point for rounding; better to round only when the value
             #      is printed to the screen or file.
             #
-            self.markers[index].colour = [round(s/255.0, 3) for s in color_new]
+            self.markers[index].colour = [round(s / 255.0, 3) for s in color_new]
             Publisher.sendMessage('Set new color', index=index, color=color_new)
@@ -1514,15 +1528,12 @@ class MarkersPanel(wx.Panel):
         Publisher.sendMessage('Robot target matrix', robot_tracker_flag=True, m_change_robot_to_head=m_target_robot)
     def OnDeleteAllMarkers(self, evt=None):
-        if evt is None:
-            result = wx.ID_OK
-        else:
+        if evt is not None:
             result = dlg.ShowConfirmationDialog(msg=_("Remove all markers? Cannot be undone."))
+            if result != wx.ID_OK:
+                return
-        if result != wx.ID_OK:
-            return
-
-        if self.__find_target_marker() != -1:
+        if self.__find_target_marker() is not None:
             Publisher.sendMessage('Disable or enable coil tracker', status=False)
             if evt is not None:
                 wx.MessageBox(_("Target deleted."), _("InVesalius 3"))
@@ -1537,17 +1548,19 @@ class MarkersPanel(wx.Panel):
         # OnDeleteMultipleMarkers is used for both pubsub and button click events
         # Pubsub is used for fiducial handle and button click for all others
-        if not evt: # called through pubsub
+        # called through pubsub
+        if not evt:
             index = []
             if label and (label in self.__list_fiducial_labels()):
                 for id_n in range(self.lc.GetItemCount()):
-                    item = self.lc.GetItem(id_n, 4)
+                    item = self.lc.GetItem(id_n, const.LABEL_COLUMN)
                     if item.GetText() == label:
                         self.lc.Focus(item.GetId())
                         index = [self.lc.GetFocusedItem()]
-        else:       # called from button click
+        # called from button click
+        else:
             index = self.__get_selected_items()
         if index:
@@ -1599,13 +1612,12 @@ class MarkersPanel(wx.Panel):
                     # If the new marker has is_target=True, we first create
                     # a marker with is_target=False, and then call __set_marker_as_target
                     if marker.is_target:
-                        self.__set_marker_as_target(len(self.markers)-1)
+                        self.__set_marker_as_target(len(self.markers) - 1)
         except:
             wx.MessageBox(_("Invalid markers file."), _("InVesalius 3"))     
     def OnMarkersVisibility(self, evt, ctrl):
-
         if ctrl.GetValue():
             Publisher.sendMessage('Hide all markers',  indexes=self.lc.GetItemCount())
             ctrl.SetLabel('Show')
@@ -1640,8 +1652,8 @@ class MarkersPanel(wx.Panel):
             wx.MessageBox(_("Error writing markers file."), _("InVesalius 3"))  
     def OnSelectColour(self, evt, ctrl):
-        #TODO: Make sure GetValue returns 3 numbers (without alpha)
-        self.marker_colour = [colour/255.0 for colour in ctrl.GetValue()][:3]
+        # TODO: Make sure GetValue returns 3 numbers (without alpha)
+        self.marker_colour = [colour / 255.0 for colour in ctrl.GetValue()][:3]
     def OnSelectSize(self, evt, ctrl):
         self.marker_size = ctrl.GetValue()
@@ -1678,11 +1690,14 @@ class MarkersPanel(wx.Panel):
         # Add item to list control in panel
         num_items = self.lc.GetItemCount()
         self.lc.InsertItem(num_items, str(num_items + 1))
-        self.lc.SetItem(num_items, 1, str(round(new_marker.x, 2)))
-        self.lc.SetItem(num_items, 2, str(round(new_marker.y, 2)))
-        self.lc.SetItem(num_items, 3, str(round(new_marker.z, 2)))
-        self.lc.SetItem(num_items, 4, new_marker.label)
-        self.lc.SetItem(num_items, 6, str(new_marker.session_id))
+        self.lc.SetItem(num_items, const.SESSION_COLUMN, str(new_marker.session_id))
+        self.lc.SetItem(num_items, const.LABEL_COLUMN, new_marker.label)
+
+        if self.session.debug:
+            self.lc.SetItem(num_items, const.X_COLUMN, str(round(new_marker.x, 1)))
+            self.lc.SetItem(num_items, const.Y_COLUMN, str(round(new_marker.y, 1)))
+            self.lc.SetItem(num_items, const.Z_COLUMN, str(round(new_marker.z, 1)))
+
         self.lc.EnsureVisible(num_items)
 class DbsPanel(wx.Panel):
@@ -21,7 +21,7 @@
 try:
     import configparser as ConfigParser
-except(ImportError):
+except ImportError:
     import ConfigParser
 import locale
@@ -66,22 +66,21 @@ def GetLocaleOS():
 def InstallLanguage(language):
     file_path = os.path.split(__file__)[0]
-    if hasattr(sys,"frozen") and (sys.frozen == "windows_exe"\
-                            or sys.frozen == "console_exe"):
+    abs_file_path = os.path.abspath(file_path + os.sep + "..")
-        abs_file_path = os.path.abspath(file_path + os.sep + ".." + os.sep + ".." + os.sep + "..")
-        language_dir = os.path.join(abs_file_path, 'locale')
-    else:
-        abs_file_path = os.path.abspath(file_path + os.sep + "..")
-        language_dir = os.path.join(abs_file_path, 'locale')
+    if hasattr(sys, "frozen") and (sys.frozen == "windows_exe" or sys.frozen == "console_exe"):
+        abs_file_path = os.path.abspath(abs_file_path + os.sep + ".." + os.sep + "..")
-    # MAC App
+    language_dir = os.path.join(abs_file_path, 'locale')
+
+    # MAC app
     if not os.path.exists(language_dir):
         abs_file_path = os.path.abspath(os.path.join(file_path, '..', '..',  '..', '..'))
         language_dir = os.path.join(abs_file_path, 'locale')
-    lang = gettext.translation('invesalius', language_dir,\
-                                   languages=[language], codeset='utf8') 
+    lang = gettext.translation('invesalius', language_dir,
+                               languages=[language], codeset='utf8')
+
     # Using unicode
     try:
         lang.install(unicode=1)
	@@ -655,6 +655,18 @@ BOOLEAN_DIFF = 2		@@ -655,6 +655,18 @@ BOOLEAN_DIFF = 2
655	BOOLEAN_AND = 3	655	BOOLEAN_AND = 3
656	BOOLEAN_XOR = 4	656	BOOLEAN_XOR = 4
657		657
		658	+# -------------- User interface ---------------------
		659	+
		660	+# The column order in the marker panel
		661	+#
		662	+ID_COLUMN = 0
		663	+SESSION_COLUMN = 1
		664	+LABEL_COLUMN = 2
		665	+TARGET_COLUMN = 3
		666	+X_COLUMN = 4
		667	+Y_COLUMN = 5
		668	+Z_COLUMN = 6
		669	+
658	#------------ Navigation defaults -------------------	670	#------------ Navigation defaults -------------------
659		671
660	MARKER_COLOUR = (1.0, 1.0, 0.)	672	MARKER_COLOUR = (1.0, 1.0, 0.)