Using kwargs protocol from pypubsub (args1 deprecated) closes #141 (#143)

args1 pypubsub protocol was deprecated since wxpython3. In wxpython4 it was removed. This code updates invesalius to the new pypubsub protocol (kwargs).

Using kwargs protocol from pypubsub (args1 deprecated) closes #141 (#143)
args1 pypubsub protocol was deprecated since wxpython3. In wxpython4 it was removed. This code updates invesalius to the new pypubsub protocol (kwargs).
Thiago Franco de Moraes · GitHub
1 parent 6484ce45
Showing 37 changed files with 1134 additions and 1354 deletions Show diff stats
app.py
invesalius/control.py
invesalius/data/coordinates.py
invesalius/data/coregistration.py
invesalius/data/geometry.py
invesalius/data/mask.py
invesalius/data/measures.py
invesalius/data/record_coords.py
invesalius/data/slice_.py
invesalius/data/styles.py
invesalius/data/surface.py
invesalius/data/viewer_slice.py
invesalius/data/viewer_volume.py
invesalius/data/volume.py
invesalius/data/vtk_utils.py
invesalius/gui/bitmap_preview_panel.py
invesalius/gui/data_notebook.py
invesalius/gui/default_tasks.py
invesalius/gui/default_viewers.py
invesalius/gui/dialogs.py
@@ -47,7 +47,7 @@ try:
 except ImportError:
     from wx import SplashScreen
 #from wx.lib.pubsub import setupv1 #new wx
-from wx.lib.pubsub import setuparg1# as psv1
+#  from wx.lib.pubsub import setuparg1# as psv1
 #from wx.lib.pubsub import Publisher 
 #import wx.lib.pubsub as ps
 from wx.lib.pubsub import pub as Publisher
@@ -117,7 +117,7 @@ class InVesalius(wx.App):
         Open drag & drop files under darwin
         """
         path = os.path.abspath(filename)
-        Publisher.sendMessage('Open project', path)
+        Publisher.sendMessage('Open project', filepath=path)
  
     def Startup2(self):
         self.control = self.splash.control
@@ -347,10 +347,10 @@ def use_cmd_optargs(options, args):
     # If import DICOM argument...
     if options.dicom_dir:
         import_dir = options.dicom_dir
-        Publisher.sendMessage('Import directory', {'directory': import_dir, 'gui': not options.no_gui})
+        Publisher.sendMessage('Import directory', directory=import_dir, use_gui=not options.no_gui)
  
         if options.save:
-            Publisher.sendMessage('Save project', os.path.abspath(options.save))
+            Publisher.sendMessage('Save project', filepath=os.path.abspath(options.save))
             exit(0)
  
         check_for_export(options)
@@ -360,9 +360,11 @@ def use_cmd_optargs(options, args):
         import invesalius.reader.dicom_reader as dcm
         for patient in dcm.GetDicomGroups(options.import_all):
             for group in patient.GetGroups():
-                Publisher.sendMessage('Import group', {'group': group, 'gui': not options.no_gui})
+                Publisher.sendMessage('Import group',
+                                      group=group,
+                                      use_gui=not options.no_gui)
                 check_for_export(options, suffix=group.title, remove_surfaces=False)
-                Publisher.sendMessage('Remove masks', [0])
+                Publisher.sendMessage('Remove masks', mask_indexes=(0,))
         return True
  
     # Check if there is a file path somewhere in what the user wrote
@@ -373,14 +375,14 @@ def use_cmd_optargs(options, args):
             file = utils.decode(arg, FS_ENCODE)
             if os.path.isfile(file):
                 path = os.path.abspath(file)
-                Publisher.sendMessage('Open project', path)
+                Publisher.sendMessage('Open project', filepath=path)
                 check_for_export(options)
                 return True
-            
+
             file = utils.decode(arg, sys.stdin.encoding)
             if os.path.isfile(file):
                 path = os.path.abspath(file)
-                Publisher.sendMessage('Open project', path)
+                Publisher.sendMessage('Open project', filepath=path)
                 check_for_export(options)
                 return True
  
@@ -428,7 +430,8 @@ def check_for_export(options, suffix=&#39;&#39;, remove_surfaces=False):
 def export(path_, threshold_range, remove_surface=False):
     import invesalius.constants as const
  
-    Publisher.sendMessage('Set threshold values', threshold_range)
+    Publisher.sendMessage('Set threshold values',
+                          threshold_range=threshold_range)
  
     surface_options = {
         'method': {
@@ -443,17 +446,20 @@ def export(path_, threshold_range, remove_surface=False):
             'overwrite': False,
         }
     }
-    Publisher.sendMessage('Create surface from index', surface_options)
-    Publisher.sendMessage('Export surface to file', (path_, const.FILETYPE_STL))
+    Publisher.sendMessage('Create surface from index',
+                          surface_parameters=surface_options)
+    Publisher.sendMessage('Export surface to file',
+                          filename=path_, filetype=const.FILETYPE_STL)
     if remove_surface:
-        Publisher.sendMessage('Remove surfaces', [0])
+        Publisher.sendMessage('Remove surfaces',
+                              surface_indexes=(0,))
  
  
-def print_events(data):
+def print_events(topic=Publisher.AUTO_TOPIC, **msg_data):
     """
     Print pubsub messages
     """
-    utils.debug(data.topic)
+    utils.debug("%s\n\tParameters: %s" % (topic, msg_data))
  
 def main():
     """
@@ -108,40 +108,38 @@ class Controller():
  
         Publisher.subscribe(self.OnSaveProject, 'Save project')
  
-    def SetBitmapSpacing(self, pubsub_evt):
+    def SetBitmapSpacing(self, spacing):
         proj = prj.Project()
-        proj.spacing = pubsub_evt.data
+        proj.spacing = spacing
  
-    def OnCancelImport(self, pubsub_evt):
+    def OnCancelImport(self):
         #self.cancel_import = True
         Publisher.sendMessage('Hide import panel')
  
  
-    def OnCancelImportBitmap(self, pubsub_evt):
+    def OnCancelImportBitmap(self):
         #self.cancel_import = True
         Publisher.sendMessage('Hide import bitmap panel')
  
 ###########################
 ###########################
  
-    def OnShowDialogImportDirectory(self, pubsub_evt):
+    def OnShowDialogImportDirectory(self):
         self.ShowDialogImportDirectory()
  
-    def OnShowDialogImportOtherFiles(self, pubsub_evt):
-        id_type = pubsub_evt.data
+    def OnShowDialogImportOtherFiles(self, id_type):
         self.ShowDialogImportOtherFiles(id_type)
  
-    def OnShowDialogOpenProject(self, pubsub_evt):
+    def OnShowDialogOpenProject(self):
         self.ShowDialogOpenProject()
  
-    def OnShowDialogSaveProject(self, pubsub_evt):
-        saveas = pubsub_evt.data
-        self.ShowDialogSaveProject(saveas)
+    def OnShowDialogSaveProject(self, save_as):
+        self.ShowDialogSaveProject(save_as)
  
-    def OnShowDialogCloseProject(self, pubsub_evt):
+    def OnShowDialogCloseProject(self):
         self.ShowDialogCloseProject()
  
-    def OnShowBitmapFile(self, pubsub_evt):
+    def OnShowBitmapFile(self):
         self.ShowDialogImportBitmapFile()
 ###########################
  
@@ -155,10 +153,10 @@ class Controller():
             if answer:
                 self.ShowDialogSaveProject()
             self.CloseProject()
-            #Publisher.sendMessage("Enable state project", False)
+            #Publisher.sendMessage("Enable state project", state=False)
             Publisher.sendMessage('Set project name')
             Publisher.sendMessage("Stop Config Recording")
-            Publisher.sendMessage("Set slice interaction style", const.STATE_DEFAULT)
+            Publisher.sendMessage("Set slice interaction style", style=const.STATE_DEFAULT)
  
         # Import TIFF, BMP, JPEG or PNG
         dirpath = dialog.ShowImportBitmapDirDialog(self.frame)
@@ -179,10 +177,10 @@ class Controller():
             if answer:
                 self.ShowDialogSaveProject()
             self.CloseProject()
-            #Publisher.sendMessage("Enable state project", False)
+            #Publisher.sendMessage("Enable state project", state=False)
             Publisher.sendMessage('Set project name')
             Publisher.sendMessage("Stop Config Recording")
-            Publisher.sendMessage("Set slice interaction style", const.STATE_DEFAULT)
+            Publisher.sendMessage("Set slice interaction style", style=const.STATE_DEFAULT)
         # Import project
         dirpath = dialog.ShowImportDirDialog(self.frame)
         if dirpath and not os.listdir(dirpath):
@@ -200,17 +198,17 @@ class Controller():
             if answer:
                 self.ShowDialogSaveProject()
             self.CloseProject()
-            # Publisher.sendMessage("Enable state project", False)
+            # Publisher.sendMessage("Enable state project", state=False)
             Publisher.sendMessage('Set project name')
             Publisher.sendMessage("Stop Config Recording")
-            Publisher.sendMessage("Set slice interaction style", const.STATE_DEFAULT)
+            Publisher.sendMessage("Set slice interaction style", style=const.STATE_DEFAULT)
  
         # Warning for limited support to Analyze format
         if id_type == const.ID_ANALYZE_IMPORT:
             dialog.ImportAnalyzeWarning()
  
         filepath = dialog.ShowImportOtherFilesDialog(id_type)
-        Publisher.sendMessage("Open other files", filepath)
+        Publisher.sendMessage("Open other files", filepath=filepath)
  
     def ShowDialogOpenProject(self):
         # Offer to save current project if necessary
@@ -265,21 +263,21 @@ class Controller():
                 if not answer:
                     utils.debug("Close without changes")
                     self.CloseProject()
-                    Publisher.sendMessage("Enable state project", False)
+                    Publisher.sendMessage("Enable state project", state=False)
                     Publisher.sendMessage('Set project name')
                     Publisher.sendMessage("Stop Config Recording")
                 elif answer == 1:
                     self.ShowDialogSaveProject()
                     utils.debug("Save changes and close")
                     self.CloseProject()
-                    Publisher.sendMessage("Enable state project", False)
+                    Publisher.sendMessage("Enable state project", state=False)
                     Publisher.sendMessage('Set project name')
                     Publisher.sendMessage("Stop Config Recording")
                 elif answer == -1:
                     utils.debug("Cancel")
             else:
                 self.CloseProject()
-                Publisher.sendMessage("Enable state project", False)
+                Publisher.sendMessage("Enable state project", state=False)
                 Publisher.sendMessage('Set project name')
                 Publisher.sendMessage("Stop Config Recording")
  
@@ -288,13 +286,10 @@ class Controller():
  
  
 ###########################
-    def OnOpenProject(self, pubsub_evt):
-        path = pubsub_evt.data
-        self.OpenProject(path)
-
-    def OnOpenRecentProject(self, pubsub_evt):
-        filepath = pubsub_evt.data
+    def OnOpenProject(self, filepath):
+        self.OpenProject(filepath)
  
+    def OnOpenRecentProject(self, filepath):
         if os.path.exists(filepath):
             session = ses.Session()
             st = session.project_status
@@ -325,17 +320,16 @@ class Controller():
         self.Slice.window_width = proj.window
  
         Publisher.sendMessage('Update threshold limits list',
-                                   proj.threshold_range)
+                              threshold_range=proj.threshold_range)
  
         self.LoadProject()
  
         session = ses.Session()
         session.OpenProject(filepath)
-        Publisher.sendMessage("Enable state project", True)
+        Publisher.sendMessage("Enable state project", state=True)
  
-    def OnSaveProject(self, pubsub_evt):
-        path = pubsub_evt.data
-        self.SaveProject(path)
+    def OnSaveProject(self, filepath):
+        self.SaveProject(filepath)
  
     def SaveProject(self, path=None, compress=False):
         Publisher.sendMessage('Begin busy cursor')
@@ -356,7 +350,7 @@ class Controller():
         Publisher.sendMessage('End busy cursor')
  
     def CloseProject(self):
-        Publisher.sendMessage('Set slice interaction style', const.STATE_DEFAULT)
+        Publisher.sendMessage('Set slice interaction style', style=const.STATE_DEFAULT)
         Publisher.sendMessage('Hide content panel')
         Publisher.sendMessage('Close project data')
  
@@ -390,8 +384,7 @@ class Controller():
         reader.SetDirectoryPath(path)
         Publisher.sendMessage('End busy cursor')
  
-    def Progress(self, evt):
-        data = evt.data
+    def Progress(self, data):
         if (data):
             message = _("Loading file %d of %d ...")%(data[0],data[1])
             if not(self.progress_dialog):
@@ -408,19 +401,17 @@ class Controller():
                 self.progress_dialog.Close()
                 self.progress_dialog = None
  
-    def OnLoadImportPanel(self, evt):
-        patient_series = evt.data
+    def OnLoadImportPanel(self, patient_series):
         ok = self.LoadImportPanel(patient_series)
         if ok:
             Publisher.sendMessage('Show import panel')
             Publisher.sendMessage("Show import panel in frame")
             self.img_type = 1
  
-    def OnLoadImportBitmapPanel(self, evt):
-        data = evt.data
+    def OnLoadImportBitmapPanel(self, data):
         ok = self.LoadImportBitmapPanel(data)
         if ok:
-            Publisher.sendMessage('Show import bitmap panel in frame')            
+            Publisher.sendMessage('Show import bitmap panel in frame')
             self.img_type = 2
             #Publisher.sendMessage("Show import panel in invesalius.gui.frame") as frame
  
@@ -430,7 +421,7 @@ class Controller():
             #first_patient = patient_series[0]
             #Publisher.sendMessage("Load bitmap preview", first_patient)
         if  data:
-            Publisher.sendMessage("Load import bitmap panel", data)
+            Publisher.sendMessage("Load import bitmap panel", data=data)
             return True
         else:
             dialog.ImportInvalidFiles("Bitmap")
@@ -439,9 +430,9 @@ class Controller():
  
     def LoadImportPanel(self, patient_series):
         if patient_series and isinstance(patient_series, list):
-            Publisher.sendMessage("Load import panel", patient_series)
+            Publisher.sendMessage("Load import panel", dicom_groups=patient_series)
             first_patient = patient_series[0]
-            Publisher.sendMessage("Load dicom preview", first_patient)
+            Publisher.sendMessage("Load dicom preview", patient=first_patient)
             return True
         else:
             dialog.ImportInvalidFiles("DICOM")
@@ -450,10 +441,8 @@ class Controller():
  
     #----------- to import by command line ---------------------------------------------------
  
-    def OnImportMedicalImages(self, pubsub_evt):
-        directory = pubsub_evt.data['directory']
-        gui = pubsub_evt.data['gui']
-        self.ImportMedicalImages(directory, gui)
+    def OnImportMedicalImages(self, directory, use_gui):
+        self.ImportMedicalImages(directory, use_gui)
  
     def ImportMedicalImages(self, directory, gui=True):
         patients_groups = dcm.GetDicomGroups(directory)
@@ -484,19 +473,17 @@ class Controller():
             # OPTION 4: Nothing...
  
         self.LoadProject()
-        Publisher.sendMessage("Enable state project", True)
+        Publisher.sendMessage("Enable state project", state=True)
  
-    def OnImportGroup(self, pubsub_evt):
-        group = pubsub_evt.data['group']
-        gui = pubsub_evt.data['gui']
-        self.ImportGroup(group, gui)
+    def OnImportGroup(self, group, use_gui):
+        self.ImportGroup(group, use_gui)
  
     def ImportGroup(self, group, gui=True):
         matrix, matrix_filename, dicom = self.OpenDicomGroup(group, 0, [0, 0], gui=gui)
         self.CreateDicomProject(dicom, matrix, matrix_filename)
  
         self.LoadProject()
-        Publisher.sendMessage("Enable state project", True)
+        Publisher.sendMessage("Enable state project", state=True)
  
     #-------------------------------------------------------------------------------------
  
@@ -514,21 +501,23 @@ class Controller():
         self.Slice.spacing = proj.spacing
  
         Publisher.sendMessage('Load slice to viewer',
-                        (proj.mask_dict))
+                              mask_dict=proj.mask_dict)
  
  
         Publisher.sendMessage('Load slice plane') 
  
-        Publisher.sendMessage('Bright and contrast adjustment image',\
-                                   (proj.window, proj.level))
-        Publisher.sendMessage('Update window level value',\
-                                    (proj.window, proj.level))
+        Publisher.sendMessage('Bright and contrast adjustment image',
+                              window=proj.window,
+                              level=proj.level)
+        Publisher.sendMessage('Update window level value',
+                              window=proj.window,
+                              level=proj.level)
  
-        Publisher.sendMessage('Set project name', proj.name)
+        Publisher.sendMessage('Set project name', proj_name=proj.name)
         Publisher.sendMessage('Load surface dict',
-                                    proj.surface_dict)
+                                surface_dict=proj.surface_dict)
         Publisher.sendMessage('Hide surface items',
-                                     proj.surface_dict)
+                              surface_dict=proj.surface_dict)
         self.LoadImagedataInfo() # TODO: where do we insert this <<<?
  
         Publisher.sendMessage('Show content panel')
@@ -537,13 +526,11 @@ class Controller():
         if len(proj.mask_dict):
             mask_index = len(proj.mask_dict) -1
             for m in proj.mask_dict.values():
-                Publisher.sendMessage('Add mask',
-                                           (m.index, m.name,
-                                            m.threshold_range, m.colour))
+                Publisher.sendMessage('Add mask', mask=m)
                 if m.is_shown:
                     self.Slice.current_mask = proj.mask_dict[mask_index]
-                    Publisher.sendMessage('Show mask', (m.index, True))
-                    Publisher.sendMessage('Change mask selected', m.index)
+                    Publisher.sendMessage('Show mask', index=m.index, value=True)
+                    Publisher.sendMessage('Change mask selected', index=m.index)
         else:
             mask_name = const.MASK_NAME_PATTERN % (1,)
  
@@ -554,14 +541,17 @@ class Controller():
  
             colour = const.MASK_COLOUR[0]
             Publisher.sendMessage('Create new mask',
-                                       (mask_name, thresh, colour))
+                                  mask_name=mask_name,
+                                  thresh=thresh,
+                                  colour=colour)
  
         Publisher.sendMessage('Load measurement dict',
-                                    (proj.measurement_dict, self.Slice.spacing))
+                              measurement_dict=proj.measurement_dict,
+                              spacing=self.Slice.spacing)
  
-        Publisher.sendMessage(('Set scroll position', 'AXIAL'),proj.matrix_shape[0]/2)
-        Publisher.sendMessage(('Set scroll position', 'SAGITAL'),proj.matrix_shape[1]/2)
-        Publisher.sendMessage(('Set scroll position', 'CORONAL'),proj.matrix_shape[2]/2)
+        Publisher.sendMessage(('Set scroll position', 'AXIAL'), index=proj.matrix_shape[0]/2)
+        Publisher.sendMessage(('Set scroll position', 'SAGITAL'),index=proj.matrix_shape[1]/2)
+        Publisher.sendMessage(('Set scroll position', 'CORONAL'),index=proj.matrix_shape[2]/2)
  
         Publisher.sendMessage('End busy cursor')
  
@@ -675,8 +665,7 @@ class Controller():
  
         dirpath = session.CreateProject(filename)
  
-    def OnOpenBitmapFiles(self, pubsub_evt):
-        rec_data = pubsub_evt.data
+    def OnOpenBitmapFiles(self, rec_data):
         bmp_data = bmp.BitmapData()
  
         if bmp_data.IsAllBitmapSameSize():
@@ -686,12 +675,11 @@ class Controller():
             self.CreateBitmapProject(bmp_data, rec_data, matrix, matrix_filename)
  
             self.LoadProject()
-            Publisher.sendMessage("Enable state project", True)
+            Publisher.sendMessage("Enable state project", state=True)
         else:
             dialogs.BitmapNotSameSize()
  
     def OpenBitmapFiles(self, bmp_data, rec_data):
-
        name = rec_data[0]
        orientation = rec_data[1]
        sp_x = float(rec_data[2])
@@ -747,20 +735,20 @@ class Controller():
        self.Slice.window_width = float(self.matrix.max())
  
        scalar_range = int(self.matrix.min()), int(self.matrix.max())
-       Publisher.sendMessage('Update threshold limits list', scalar_range)
+       Publisher.sendMessage('Update threshold limits list',
+                             threshold_range=scalar_range)
  
        return self.matrix, self.filename#, dicom
  
  
-    def OnOpenDicomGroup(self, pubsub_evt):
-        group, interval, file_range = pubsub_evt.data
+    def OnOpenDicomGroup(self, group, interval, file_range):
         matrix, matrix_filename, dicom = self.OpenDicomGroup(group, interval, file_range, gui=True)
         self.CreateDicomProject(dicom, matrix, matrix_filename)
         self.LoadProject()
-        Publisher.sendMessage("Enable state project", True)
+        Publisher.sendMessage("Enable state project", state=True)
  
-    def OnOpenOtherFiles(self, pubsub_evt):
-        filepath = utils.decode(pubsub_evt.data, const.FS_ENCODE)
+    def OnOpenOtherFiles(self, filepath):
+        filepath = utils.decode(filepath, const.FS_ENCODE)
         if not(filepath) == None:
             name = filepath.rpartition('\\')[-1].split('.')
  
@@ -770,7 +758,7 @@ class Controller():
                 matrix, matrix_filename = self.OpenOtherFiles(group)
                 self.CreateOtherProject(str(name[0]), matrix, matrix_filename)
                 self.LoadProject()
-                Publisher.sendMessage("Enable state project", True)
+                Publisher.sendMessage("Enable state project", state=True)
             else:
                 dialog.ImportInvalidFiles(ftype="Others")
  
@@ -861,7 +849,8 @@ class Controller():
  
         scalar_range = int(self.matrix.min()), int(self.matrix.max())
  
-        Publisher.sendMessage('Update threshold limits list', scalar_range)
+        Publisher.sendMessage('Update threshold limits list',
+                              threshold_range=scalar_range)
  
         return self.matrix, self.filename, dicom
  
@@ -886,7 +875,8 @@ class Controller():
         self.Slice.window_width = ww
  
         scalar_range = int(scalar_range[0]), int(scalar_range[1])
-        Publisher.sendMessage('Update threshold limits list', scalar_range)
+        Publisher.sendMessage('Update threshold limits list',
+                              threshold_range=scalar_range)
         return self.matrix, self.filename
  
     def LoadImagedataInfo(self):
@@ -909,24 +899,20 @@ class Controller():
             [a,b] = default_threshold
             default_threshold = (a,b)
         Publisher.sendMessage('Set threshold modes',
-                                (thresh_modes,default_threshold))
+                              thresh_modes_names=thresh_modes,
+                              default_thresh=default_threshold)
  
-    def LoadRaycastingPreset(self, pubsub_evt=None):
-        if pubsub_evt:
-            label = pubsub_evt.data
-        else:
-            return
-        
-        if label != const.RAYCASTING_OFF_LABEL:
-            if label in const.RAYCASTING_FILES.keys():
+    def LoadRaycastingPreset(self, preset_name):
+        if preset_name != const.RAYCASTING_OFF_LABEL:
+            if preset_name in const.RAYCASTING_FILES.keys():
                 path = os.path.join(const.RAYCASTING_PRESETS_DIRECTORY,
-                                    const.RAYCASTING_FILES[label])
+                                    const.RAYCASTING_FILES[preset_name])
             else:
                 path = os.path.join(const.RAYCASTING_PRESETS_DIRECTORY,
-                                        label+".plist")
+                                        preset_name+".plist")
                 if not os.path.isfile(path):
                     path = os.path.join(const.USER_RAYCASTING_PRESETS_DIRECTORY,
-                                    label+".plist")
+                                    preset_name+".plist")
             preset = plistlib.readPlist(path)
             prj.Project().raycasting_preset = preset
             # Notify volume
@@ -936,17 +922,16 @@ class Controller():
             prj.Project().raycasting_preset = 0
             Publisher.sendMessage('Update raycasting preset')
  
-    def SaveRaycastingPreset(self, pubsub_evt):
-        preset_name = pubsub_evt.data
+    def SaveRaycastingPreset(self, preset_name):
         preset = prj.Project().raycasting_preset
         preset['name'] = preset_name
         preset_dir = os.path.join(const.USER_RAYCASTING_PRESETS_DIRECTORY,
                                   preset_name + '.plist')
         plistlib.writePlist(preset, preset_dir)
  
-    def ShowBooleanOpDialog(self, pubsub_evt):
+    def ShowBooleanOpDialog(self):
         dlg = dialogs.MaskBooleanDialog(prj.Project().mask_dict)
         dlg.Show()
  
-    def ApplyReorientation(self, pubsub_evt):
+    def ApplyReorientation(self):
         self.Slice.apply_reorientation()
@@ -86,7 +86,7 @@ def ClaronCoord(trck_init, trck_id, ref_mode):
                 k += 1
                 print("wait, collecting coordinates ...")
  
-    Publisher.sendMessage('Sensors ID', [trck.probeID, trck.refID])
+    Publisher.sendMessage('Sensors ID', probe_id=trck.probeID, ref_id=trck.refID)
  
     return coord
  
@@ -225,7 +225,7 @@ def DebugCoord(trk_init, trck_id, ref_mode):
     coord3 = np.array([uniform(1, 200), uniform(1, 200), uniform(1, 200),
                        uniform(-180.0, 180.0), uniform(-180.0, 180.0), uniform(-180.0, 180.0)])
  
-    Publisher.sendMessage('Sensors ID', [int(uniform(0, 5)), int(uniform(0, 5))])
+    Publisher.sendMessage('Sensors ID', probe_id=int(uniform(0, 5)), ref_id=int(uniform(0, 5)))
  
     return np.vstack([coord1, coord2, coord3])
  
@@ -72,7 +72,7 @@ class CoregistrationStatic(threading.Thread):
  
             coord = m_img[0, -1], m_img[1, -1], m_img[2, -1], psi, theta, phi
  
-            wx.CallAfter(Publisher.sendMessage, 'Co-registered points', (m_img, coord))
+            wx.CallAfter(Publisher.sendMessage, 'Co-registered points', arg=m_img, position=coord)
  
             # TODO: Optimize the value of sleep for each tracking device.
             sleep(0.175)
@@ -127,7 +127,7 @@ class CoregistrationDynamic(threading.Thread):
             coord = m_img[0, -1], m_img[1, -1], m_img[2, -1], \
                     degrees(angles[0]), degrees(angles[1]), degrees(angles[2])
  
-            wx.CallAfter(Publisher.sendMessage, 'Co-registered points', (m_img, coord))
+            wx.CallAfter(Publisher.sendMessage, 'Co-registered points', arg=m_img, position=coord)
  
             # TODO: Optimize the value of sleep for each tracking device.
             sleep(0.175)
@@ -179,7 +179,7 @@ class CoregistrationDynamic_old(threading.Thread):
  
             # Tried several combinations and different locations to send the messages,
             # however only this one does not block the GUI during navigation.
-            wx.CallAfter(Publisher.sendMessage, 'Co-registered points', coord)
+            wx.CallAfter(Publisher.sendMessage, 'Co-registered points', arg=None, position=coord)
             wx.CallAfter(Publisher.sendMessage, 'Set camera in volume', coord)
             wx.CallAfter(Publisher.sendMessage, 'Update tracker angles', angles)
  
@@ -253,8 +253,8 @@ class CoregistrationObjectStatic(threading.Thread):
             coord = m_img[0, -1], m_img[1, -1], m_img[2, -1], \
                     degrees(angles[0]), degrees(angles[1]), degrees(angles[2])
  
-            wx.CallAfter(Publisher.sendMessage, 'Co-registered points', (m_img, coord))
-            wx.CallAfter(Publisher.sendMessage, 'Update object matrix', (m_img, coord))
+            wx.CallAfter(Publisher.sendMessage, 'Co-registered points', arg=m_img, position=coord)
+            wx.CallAfter(Publisher.sendMessage, 'Update object matrix', m_img=m_img, coord=coord)
  
             # TODO: Optimize the value of sleep for each tracking device.
             sleep(0.175)
@@ -335,8 +335,8 @@ class CoregistrationObjectDynamic(threading.Thread):
             coord = m_img[0, -1], m_img[1, -1], m_img[2, -1],\
                     degrees(angles[0]), degrees(angles[1]), degrees(angles[2])
  
-            wx.CallAfter(Publisher.sendMessage, 'Co-registered points', (m_img, coord))
-            wx.CallAfter(Publisher.sendMessage, 'Update object matrix', (m_img, coord))
+            wx.CallAfter(Publisher.sendMessage, 'Co-registered points', arg=m_img, position=coord)
+            wx.CallAfter(Publisher.sendMessage, 'Update object matrix', m_img=m_img, coord=coord)
  
             # TODO: Optimize the value of sleep for each tracking device.
             sleep(0.175)
@@ -360,4 +360,4 @@ class CoregistrationObjectDynamic(threading.Thread):
             # R_dyn = M_vtk * M_obj_rot_raw.I * S0_rot_dyn.I * R_reference.I * R_stylus * M_obj_rot_raw
  
             if self._pause_:
-                return
 \ No newline at end of file
+                return
@@ -136,7 +136,7 @@ class Box(with_metaclass(utils.Singleton, object)):
         self.axial[const.AXIAL_RIGHT] = [[self.xf + (self.xs/2), self.yi, self.zi],\
                                          [self.xf + (self.xs/2), self.yf, self.zf]]
  
-        Publisher.sendMessage('Update crop limits into gui', self.GetLimits())
+        Publisher.sendMessage('Update crop limits into gui', limits=self.GetLimits())
  
  
     def GetLimits(self):
@@ -78,8 +78,8 @@ class EditionHistory(object):
         self.index = -1
         self.size = size * 2
  
-        Publisher.sendMessage("Enable undo", False)
-        Publisher.sendMessage("Enable redo", False)
+        Publisher.sendMessage("Enable undo", value=False)
+        Publisher.sendMessage("Enable redo", value=False)
  
     def new_node(self, index, orientation, array, p_array, clean):
         # Saving the previous state, used to undo/redo correctly.
@@ -100,8 +100,8 @@ class EditionHistory(object):
         self.index += 1
  
         print("INDEX", self.index, len(self.history), self.history)
-        Publisher.sendMessage("Enable undo", True)
-        Publisher.sendMessage("Enable redo", False)
+        Publisher.sendMessage("Enable undo", value=True)
+        Publisher.sendMessage("Enable redo", value=False)
  
     def undo(self, mvolume, actual_slices=None):
         h = self.history
@@ -114,7 +114,7 @@ class EditionHistory(object):
                 self.index -= 1
                 h[self.index].commit_history(mvolume)
                 self._reload_slice(self.index)
-                Publisher.sendMessage("Enable redo", True)
+                Publisher.sendMessage("Enable redo", value=True)
             elif actual_slices and actual_slices[h[self.index - 1].orientation] != h[self.index - 1].index:
                 self._reload_slice(self.index - 1)
             else:
@@ -124,10 +124,10 @@ class EditionHistory(object):
                     self.index -= 1
                     h[self.index].commit_history(mvolume)
                 self._reload_slice(self.index)
-                Publisher.sendMessage("Enable redo", True)
+                Publisher.sendMessage("Enable redo", value=True)
  
         if self.index == 0:
-            Publisher.sendMessage("Enable undo", False)
+            Publisher.sendMessage("Enable undo", value=False)
         print("AT", self.index, len(self.history), self.history[self.index].filename)
  
     def redo(self, mvolume, actual_slices=None):
@@ -142,7 +142,7 @@ class EditionHistory(object):
                 self.index += 1
                 h[self.index].commit_history(mvolume)
                 self._reload_slice(self.index)
-                Publisher.sendMessage("Enable undo", True)
+                Publisher.sendMessage("Enable undo", value=True)
             elif actual_slices and actual_slices[h[self.index + 1].orientation] != h[self.index + 1].index:
                 self._reload_slice(self.index + 1)
             else:
@@ -152,15 +152,15 @@ class EditionHistory(object):
                     self.index += 1
                     h[self.index].commit_history(mvolume)
                 self._reload_slice(self.index)
-                Publisher.sendMessage("Enable undo", True)
+                Publisher.sendMessage("Enable undo", value=True)
  
         if self.index == len(h) - 1:
-            Publisher.sendMessage("Enable redo", False)
+            Publisher.sendMessage("Enable redo", value=False)
         print("AT", self.index, len(h), h[self.index].filename)
  
     def _reload_slice(self, index):
         Publisher.sendMessage(('Set scroll position', self.history[index].orientation),
-                              self.history[index].index)
+                              index=self.history[index].index)
  
     def _config_undo_redo(self, visible):
         v_undo = False
@@ -174,14 +174,14 @@ class EditionHistory(object):
             elif self.index == len(self.history) - 1:
                 v_redo = False
  
-        Publisher.sendMessage("Enable undo", v_undo)
-        Publisher.sendMessage("Enable redo", v_redo)
+        Publisher.sendMessage("Enable undo", value=v_undo)
+        Publisher.sendMessage("Enable redo", value=v_redo)
  
     def clear_history(self):
         self.history = []
         self.index = -1
-        Publisher.sendMessage("Enable undo", False)
-        Publisher.sendMessage("Enable redo", False)
+        Publisher.sendMessage("Enable undo", value=False)
+        Publisher.sendMessage("Enable redo", value=False)
  
  
 class Mask():
@@ -273,8 +273,7 @@ class Mask():
         path = os.path.join(dirpath, mask_file)
         self._open_mask(path, tuple(shape))
  
-    def OnFlipVolume(self, pubsub_evt):
-        axis = pubsub_evt.data
+    def OnFlipVolume(self, axis):
         submatrix = self.matrix[1:, 1:, 1:]
         if axis == 0:
             submatrix[:] = submatrix[::-1]
@@ -286,8 +285,8 @@ class Mask():
             submatrix[:] = submatrix[:, :, ::-1]
             self.matrix[0, 0, 1::] = self.matrix[0, 0, :0:-1]
  
-    def OnSwapVolumeAxes(self, pubsub_evt):
-        axis0, axis1 = pubsub_evt.data
+    def OnSwapVolumeAxes(self, axes):
+        axis0, axis1 = axes
         self.matrix = self.matrix.swapaxes(axis0, axis1)
  
     def _save_mask(self, filename):
@@ -120,14 +120,9 @@ class MeasurementManager(object):
         Publisher.subscribe(self._change_measure_point_pos, 'Change measurement point position')
         Publisher.subscribe(self.OnCloseProject, 'Close project data')
  
-    def _load_measurements(self, pubsub_evt):
-        try:
-            dict, spacing = pubsub_evt.data
-        except ValueError:
-            dict = pubsub_evt.data
-            spacing = 1.0, 1.0, 1.0
-        for i in dict:
-            m = dict[i]
+    def _load_measurements(self, measurement_dict, spacing=(1.0, 1.0, 1.0)):
+        for i in measurement_dict:
+            m = measurement_dict[i]
  
             if m.location == const.AXIAL:
                 radius = min(spacing[1], spacing[2]) * const.PROP_MEASURE
@@ -154,7 +149,7 @@ class MeasurementManager(object):
  
                 if m.location == const.SURFACE:
                     Publisher.sendMessage(("Add actors " + str(m.location)),
-                        (actors, m.slice_number))
+                        actors=actors)
             self.current = None
  
             if not m.visible:
@@ -164,28 +159,7 @@ class MeasurementManager(object):
                 else:
                     Publisher.sendMessage('Redraw canvas')
  
-    def _add_point(self, pubsub_evt):
-        position = pubsub_evt.data[0]
-        type = pubsub_evt.data[1] # Linear or Angular
-        location = pubsub_evt.data[2] # 3D, AXIAL, SAGITAL, CORONAL
-
-        if location == const.SURFACE:
-            slice_number = 0
-            try:
-                radius = pubsub_evt.data[3]
-            except IndexError:
-                radius = const.PROP_MEASURE
-        else:
-            try:
-                slice_number = pubsub_evt.data[3]
-            except IndexError:
-                slice_number = 0
-
-            try:
-                radius = pubsub_evt.data[4]
-            except IndexError:
-                radius = const.PROP_MEASURE
-
+    def _add_point(self, position, type, location, slice_number=0, radius=const.PROP_MEASURE):
         to_remove = False
         if self.current is None:
             to_create = True
@@ -233,8 +207,7 @@ class MeasurementManager(object):
         m.points.append(position)
  
         if m.location == const.SURFACE:
-            Publisher.sendMessage("Add actors " + str(location),
-                    (actors, m.slice_number))
+            Publisher.sendMessage("Add actors " + str(location), actors=actors)
  
         if self.current not in self.measures:
             self.measures.append(self.current)
@@ -254,14 +227,12 @@ class MeasurementManager(object):
  
             msg =  'Update measurement info in GUI',
             Publisher.sendMessage(msg,
-                                  (index, name, colour,
-                                   location,
-                                   type_,
-                                   value))
+                                  index=index, name=name,
+                                  colour=colour, location=location,
+                                  type_=type_, value=value)
             self.current = None
  
-    def _change_measure_point_pos(self, pubsub_evt):
-        index, npoint, pos = pubsub_evt.data
+    def _change_measure_point_pos(self, index, npoint, pos):
         m, mr = self.measures[index]
         x, y, z = pos
         if npoint == 0:
@@ -288,17 +259,14 @@ class MeasurementManager(object):
             value = u"%.3f°"% m.value
  
         Publisher.sendMessage('Update measurement info in GUI',
-                              (index, name, colour,
-                               location,
-                               type_,
-                               value))
+                              index=index, name=name, colour=colour,
+                              location=location, type_=type_,
+                              value=value)
  
-    def _change_name(self, pubsub_evt):
-        index, new_name = pubsub_evt.data
-        self.measures[index].name = new_name
+    def _change_name(self, index, name):
+        self.measures[index][0].name = name
  
-    def _remove_measurements(self, pubsub_evt):
-        indexes = pubsub_evt.data
+    def _remove_measurements(self, indexes):
         for index in indexes:
             m, mr = self.measures.pop(index)
             try:
@@ -308,16 +276,15 @@ class MeasurementManager(object):
                 pass
             prj.Project().RemoveMeasurement(index)
             if m.location == const.SURFACE:
-                Publisher.sendMessage(('Remove actors ' + str(m.location)),
-                        (mr.GetActors(), m.slice_number))
+                Publisher.sendMessage('Remove actors ' + str(m.location),
+                                      actors=mr.GetActors())
         Publisher.sendMessage('Redraw canvas')
         Publisher.sendMessage('Render volume viewer')
  
         session = ses.Session()
         session.ChangeProject()
  
-    def _set_visibility(self, pubsub_evt):
-        index, visibility = pubsub_evt.data
+    def _set_visibility(self, index, visibility):
         m, mr = self.measures[index]
         m.visible = visibility
         mr.SetVisibility(visibility)
@@ -326,7 +293,7 @@ class MeasurementManager(object):
         else:
             Publisher.sendMessage('Redraw canvas')
  
-    def _rm_incomplete_measurements(self, pubsub_evt):
+    def _rm_incomplete_measurements(self):
         if self.current is None:
             return
  
@@ -334,12 +301,12 @@ class MeasurementManager(object):
         if not mr.IsComplete():
             idx = self.measures._list_measures.index((m, mr))
             self.measures.remove((m, mr))
-            Publisher.sendMessage("Remove GUI measurement", idx)
+            Publisher.sendMessage("Remove GUI measurement", measure_index=idx)
             actors = mr.GetActors()
             slice_number = self.current[0].slice_number
             if m.location == const.SURFACE:
                 Publisher.sendMessage(('Remove actors ' + str(self.current[0].location)),
-                                      (actors, slice_number))
+                                      actors=actors)
             if self.current[0].location == const.SURFACE:
                 Publisher.sendMessage('Render volume viewer')
             else:
@@ -349,7 +316,7 @@ class MeasurementManager(object):
                 #  self.measures.pop()
             self.current = None
  
-    def OnCloseProject(self, pubsub_evt):
+    def OnCloseProject(self):
         self.measures.clean()
  
  
@@ -650,7 +617,7 @@ class LinearMeasure(object):
  
     def Remove(self):
         actors = self.GetActors()
-        Publisher.sendMessage("Remove actors " + str(const.SURFACE), (actors,))
+        Publisher.sendMessage("Remove actors " + str(const.SURFACE), actors=actors)
  
     def __del__(self):
         self.Remove()
@@ -901,7 +868,7 @@ class AngularMeasure(object):
  
     def Remove(self):
         actors = self.GetActors()
-        Publisher.sendMessage("Remove actors " + str(const.SURFACE), (actors,))
+        Publisher.sendMessage("Remove actors " + str(const.SURFACE), actors=actors)
  
     def SetRenderer(self, renderer):
         if self.point_actor1:
@@ -44,8 +44,8 @@ class Record(threading.Thread):
     def __bind_events(self):
         Publisher.subscribe(self.UpdateCurrentCoords, 'Co-registered points')
  
-    def UpdateCurrentCoords(self, pubsub_evt):
-        self.coord = asarray(pubsub_evt.data[1])
+    def UpdateCurrentCoords(self, arg, position):
+        self.coord = asarray(position)
  
     def stop(self):
         self._pause_ = True
@@ -64,4 +64,4 @@ class Record(threading.Thread):
             else:
                 self.coord_list = vstack((self.coord_list, hstack((relative_time, self.coord))))
             if self._pause_:
-                return
 \ No newline at end of file
+                return
@@ -219,10 +219,9 @@ class Slice(with_metaclass(utils.Singleton, object)):
             buffer_.discard_vtk_mask()
             buffer_.discard_mask()
  
-    def OnRemoveMasks(self, pubsub_evt):
-        selected_items = pubsub_evt.data
+    def OnRemoveMasks(self, mask_indexes):
         proj = Project()
-        for item in selected_items:
+        for item in mask_indexes:
             proj.RemoveMask(item)
  
             # if the deleted mask is the current mask, cleans the current mask
@@ -234,14 +233,13 @@ class Slice(with_metaclass(utils.Singleton, object)):
                     buffer_.discard_vtk_mask()
                     buffer_.discard_mask()
  
-                Publisher.sendMessage('Show mask', (item, 0))
+                Publisher.sendMessage('Show mask', index=item, value=False)
                 Publisher.sendMessage('Reload actual slice')
  
-    def OnDuplicateMasks(self, pubsub_evt):
-        selected_items = pubsub_evt.data
+    def OnDuplicateMasks(self, mask_indexes):
         proj = Project()
         mask_dict = proj.mask_dict
-        for index in selected_items:
+        for index in mask_indexes:
             original_mask = mask_dict[index]
             # compute copy name
             name = original_mask.name
@@ -251,34 +249,32 @@ class Slice(with_metaclass(utils.Singleton, object)):
             copy_mask = original_mask.copy(new_name)
             self._add_mask_into_proj(copy_mask)
  
-    def OnEnableStyle(self, pubsub_evt):
-        state = pubsub_evt.data
-        if (state in const.SLICE_STYLES):
-            new_state = self.interaction_style.AddState(state)
-            Publisher.sendMessage('Set slice interaction style', new_state)
-        self.state = state
+    def OnEnableStyle(self, style):
+        if (style in const.SLICE_STYLES):
+            new_state = self.interaction_style.AddState(style)
+            Publisher.sendMessage('Set slice interaction style', style=new_state)
+        self.state = style
  
-    def OnDisableStyle(self, pubsub_evt):
-        state = pubsub_evt.data
-        if (state in const.SLICE_STYLES):
-            new_state = self.interaction_style.RemoveState(state)
-            Publisher.sendMessage('Set slice interaction style', new_state)
+    def OnDisableStyle(self, style):
+        if (style in const.SLICE_STYLES):
+            new_state = self.interaction_style.RemoveState(style)
+            Publisher.sendMessage('Set slice interaction style', style=new_state)
  
-            if (state == const.SLICE_STATE_EDITOR):
+            if (style == const.SLICE_STATE_EDITOR):
                 Publisher.sendMessage('Set interactor default cursor')
             self.state = new_state
  
-    def OnDisableActualStyle(self, pubsub_evt):
+    def OnDisableActualStyle(self):
         actual_state = self.interaction_style.GetActualState()
         if actual_state != const.STATE_DEFAULT:
             new_state = self.interaction_style.RemoveState(actual_state)
-            Publisher.sendMessage('Set slice interaction style', new_state)
+            Publisher.sendMessage('Set slice interaction style', style=new_state)
  
             #  if (actual_state == const.SLICE_STATE_EDITOR):
                 #  Publisher.sendMessage('Set interactor default cursor')
             self.state = new_state
  
-    def OnCloseProject(self, pubsub_evt):
+    def OnCloseProject(self):
         self.CloseProject()
  
     def CloseProject(self):
@@ -310,39 +306,32 @@ class Slice(with_metaclass(utils.Singleton, object)):
  
         Publisher.sendMessage('Select first item from slice menu')
  
-    def __set_current_mask_threshold_limits(self, pubsub_evt):
-        thresh_min = pubsub_evt.data[0]
-        thresh_max  = pubsub_evt.data[1]
+    def __set_current_mask_threshold_limits(self, threshold_range):
+        thresh_min = threshold_range[0]
+        thresh_max = threshold_range[1]
         if self.current_mask:
             index = self.current_mask.index
             self.SetMaskEditionThreshold(index, (thresh_min, thresh_max))
  
-    def __add_mask(self, pubsub_evt):
-        mask_name = pubsub_evt.data
+    def __add_mask(self, mask_name):
         self.create_new_mask(name=mask_name)
         self.SetMaskColour(self.current_mask.index, self.current_mask.colour)
  
-    def __add_mask_thresh(self, pubsub_evt):
-        mask_name = pubsub_evt.data[0]
-        thresh = pubsub_evt.data[1]
-        colour = pubsub_evt.data[2]
+    def __add_mask_thresh(self, mask_name, thresh, colour):
         self.create_new_mask(name=mask_name, threshold_range=thresh, colour=colour)
         self.SetMaskColour(self.current_mask.index, self.current_mask.colour)
         self.SelectCurrentMask(self.current_mask.index)
         Publisher.sendMessage('Reload actual slice')
  
-    def __select_current_mask(self, pubsub_evt):
-        mask_index = pubsub_evt.data
-        self.SelectCurrentMask(mask_index)
+    def __select_current_mask(self, index):
+        self.SelectCurrentMask(index)
  
-    def __set_current_mask_edition_threshold(self, evt_pubsub):
+    def __set_current_mask_edition_threshold(self, threshold_range):
         if self.current_mask:
-            threshold_range = evt_pubsub.data
             index = self.current_mask.index
             self.SetMaskEditionThreshold(index, threshold_range)
  
-    def __set_current_mask_threshold(self, evt_pubsub):
-        threshold_range = evt_pubsub.data
+    def __set_current_mask_threshold(self, threshold_range):
         index = self.current_mask.index
         self.num_gradient += 1
         self.current_mask.matrix[:] = 0
@@ -379,8 +368,7 @@ class Slice(with_metaclass(utils.Singleton, object)):
         if to_reload:
             Publisher.sendMessage('Reload actual slice')
  
-    def __set_current_mask_threshold_actual_slice(self, evt_pubsub):
-        threshold_range = evt_pubsub.data
+    def __set_current_mask_threshold_actual_slice(self, threshold_range):
         index = self.current_mask.index
         for orientation in self.buffer_slices:
             self.buffer_slices[orientation].discard_vtk_mask()
@@ -391,44 +379,41 @@ class Slice(with_metaclass(utils.Singleton, object)):
  
         Publisher.sendMessage('Reload actual slice')
  
-    def __set_current_mask_colour(self, pubsub_evt):
+    def __set_current_mask_colour(self, colour):
         # "if" is necessary because wx events are calling this before any mask
         # has been created
         if self.current_mask:
-            colour_wx = pubsub_evt.data
-            colour_vtk = [c/255.0 for c in colour_wx]
+            colour_vtk = [c/255.0 for c in colour]
             self.SetMaskColour(self.current_mask.index, colour_vtk)
  
-    def __set_mask_name(self, pubsub_evt):
-        index, name = pubsub_evt.data
+    def __set_mask_name(self, index, name):
         self.SetMaskName(index, name)
  
-    def __show_mask(self, pubsub_evt):
+    def __show_mask(self, index, value):
         # "if" is necessary because wx events are calling this before any mask
         # has been created
         if self.current_mask:
-            index, value = pubsub_evt.data
             self.ShowMask(index, value)
             if not value:
-                Publisher.sendMessage('Select mask name in combo', -1)
+                Publisher.sendMessage('Select mask name in combo', index=-1)
  
             if self._type_projection != const.PROJECTION_NORMAL:
                 self.SetTypeProjection(const.PROJECTION_NORMAL)
                 Publisher.sendMessage('Reload actual slice')
  
-    def __hide_current_mask(self, pubsub_evt):
+    def __hide_current_mask(self):
         if self.current_mask:
             index = self.current_mask.index
             value = False
-            Publisher.sendMessage('Show mask', (index, value))
+            Publisher.sendMessage('Show mask', index=index, value=value)
  
-    def __show_current_mask(self, pubsub_evt):
+    def __show_current_mask(self):
         if self.current_mask:
             index = self.current_mask.index
             value = True
-            Publisher.sendMessage('Show mask', (index, value))
+            Publisher.sendMessage('Show mask', index=index, value=value)
  
-    def __clean_current_mask(self, pubsub_evt):
+    def __clean_current_mask(self):
         if self.current_mask:
             self.current_mask.clean()
             for buffer_ in self.buffer_slices.values():
@@ -844,8 +829,8 @@ class Slice(with_metaclass(utils.Singleton, object)):
         (r,g,b) = colour[:3]
         colour_wx = [r*255, g*255, b*255]
         Publisher.sendMessage('Change mask colour in notebook',
-                                    (index, (r,g,b)))
-        Publisher.sendMessage('Set GUI items colour', colour_wx)
+                                    index=index, colour=(r,g,b))
+        Publisher.sendMessage('Set GUI items colour', colour=colour_wx)
         if update:
             # Updating mask colour on vtkimagedata.
             for buffer_ in self.buffer_slices.values():
@@ -899,8 +884,8 @@ class Slice(with_metaclass(utils.Singleton, object)):
  
             # Update data notebook (GUI)
             Publisher.sendMessage('Set mask threshold in notebook',
-                                (self.current_mask.index,
-                                self.current_mask.threshold_range))
+                                  index=self.current_mask.index,
+                                  threshold_range=self.current_mask.threshold_range)
         else:
             proj = Project()
             proj.mask_dict[index].threshold_range = threshold_range
@@ -936,32 +921,30 @@ class Slice(with_metaclass(utils.Singleton, object)):
                               "SAGITAL": SliceBuffer()}
  
         Publisher.sendMessage('Set mask threshold in notebook',
-                                    (index,
-                                        self.current_mask.threshold_range))
+                              index=index,
+                              threshold_range=self.current_mask.threshold_range)
         Publisher.sendMessage('Set threshold values in gradient',
-                                    self.current_mask.threshold_range)
-        Publisher.sendMessage('Select mask name in combo', index)
+                              threshold_range=self.current_mask.threshold_range)
+        Publisher.sendMessage('Select mask name in combo', index=index)
         Publisher.sendMessage('Update slice viewer')
     #---------------------------------------------------------------------------
  
-    def CreateSurfaceFromIndex(self, pubsub_evt):
-        surface_parameters = pubsub_evt.data
-
+    def CreateSurfaceFromIndex(self, surface_parameters):
         proj = Project()
         mask = proj.mask_dict[surface_parameters['options']['index']]
  
         self.do_threshold_to_all_slices(mask)
-        Publisher.sendMessage('Create surface', (self, mask, surface_parameters))
+        Publisher.sendMessage('Create surface',
+                              slice_=self, mask=mask,
+                              surface_parameters=surface_parameters)
  
     def GetOutput(self):
         return self.blend_filter.GetOutput()
  
-    def _set_projection_type(self, pubsub_evt):
-        tprojection = pubsub_evt.data
-        self.SetTypeProjection(tprojection)
+    def _set_projection_type(self, projection_id):
+        self.SetTypeProjection(projection_id)
  
-    def _set_interpolation_method(self, pubsub_evt):
-        interp_method = pubsub_evt.data
+    def _set_interpolation_method(self, interp_method):
         self.SetInterpolationMethod(interp_method)
  
     def SetTypeProjection(self, tprojection):
@@ -970,15 +953,15 @@ class Slice(with_metaclass(utils.Singleton, object)):
                 Publisher.sendMessage('Hide current mask')
  
             if tprojection == const.PROJECTION_NORMAL:
-                Publisher.sendMessage('Show MIP interface', False)
+                Publisher.sendMessage('Show MIP interface', flag=False)
             else:
-                Publisher.sendMessage('Show MIP interface', True)
+                Publisher.sendMessage('Show MIP interface', flag=True)
  
             self._type_projection = tprojection
             for buffer_ in self.buffer_slices.values():
                 buffer_.discard_buffer()
  
-            Publisher.sendMessage('Check projection menu', tprojection)
+            Publisher.sendMessage('Check projection menu', projection_id=tprojection)
  
     def SetInterpolationMethod(self, interp_method):
         if self.interp_method != interp_method:
@@ -987,8 +970,7 @@ class Slice(with_metaclass(utils.Singleton, object)):
                 buffer_.discard_buffer()
             Publisher.sendMessage('Reload actual slice')
  
-    def UpdateWindowLevelBackground(self, pubsub_evt):
-        window, level = pubsub_evt.data
+    def UpdateWindowLevelBackground(self, window, level):
         self.window_width = window
         self.window_level = level
  
@@ -1004,8 +986,7 @@ class Slice(with_metaclass(utils.Singleton, object)):
  
         Publisher.sendMessage('Reload actual slice')
  
-    def UpdateColourTableBackground(self, pubsub_evt):
-        values = pubsub_evt.data
+    def UpdateColourTableBackground(self, values):
         self.from_= OTHER
         self.number_of_colours= values[0]
         self.saturation_range = values[1]
@@ -1015,16 +996,16 @@ class Slice(with_metaclass(utils.Singleton, object)):
             buffer_.discard_vtk_image()
         Publisher.sendMessage('Reload actual slice')
  
-    def UpdateColourTableBackgroundPlist(self, pubsub_evt):
-        self.values = pubsub_evt.data
+    def UpdateColourTableBackgroundPlist(self, values):
+        self.values = values
         self.from_= PLIST
         for buffer_ in self.buffer_slices.values():
             buffer_.discard_vtk_image()
  
         Publisher.sendMessage('Reload actual slice')
  
-    def UpdateColourTableBackgroundWidget(self, pubsub_evt):
-        self.nodes = pubsub_evt.data
+    def UpdateColourTableBackgroundWidget(self, nodes):
+        self.nodes = nodes
         self.from_= WIDGET
         for buffer_ in self.buffer_slices.values():
             if self._type_projection in (const.PROJECTION_NORMAL,
@@ -1045,8 +1026,7 @@ class Slice(with_metaclass(utils.Singleton, object)):
  
         Publisher.sendMessage('Reload actual slice')
  
-    def UpdateSlice3D(self, pubsub_evt):
-        widget, orientation = pubsub_evt.data
+    def UpdateSlice3D(self, widget, orientation):
         img = self.buffer_slices[orientation].vtk_image
         original_orientation = Project().original_orientation
         cast = vtk.vtkImageCast()
@@ -1125,15 +1105,12 @@ class Slice(with_metaclass(utils.Singleton, object)):
  
         ## update gui related to mask
         Publisher.sendMessage('Add mask',
-                                    (mask.index,
-                                     mask.name,
-                                     mask.threshold_range,
-                                     mask.colour))
+                              mask=mask)
  
         if show:
             self.current_mask = mask
-            Publisher.sendMessage('Show mask', (mask.index, 1))
-            Publisher.sendMessage('Change mask selected', mask.index)
+            Publisher.sendMessage('Show mask', index=mask.index, value=True)
+            Publisher.sendMessage('Change mask selected', index=mask.index)
             Publisher.sendMessage('Update slice viewer')
  
     def do_ww_wl(self, image):
@@ -1336,9 +1313,8 @@ class Slice(with_metaclass(utils.Singleton, object)):
  
         return blend_imagedata.GetOutput()
  
-    def _do_boolean_op(self, pubsub_evt):
-        op, m1, m2 = pubsub_evt.data
-        self.do_boolean_op(op, m1, m2)
+    def _do_boolean_op(self, operation, mask1, mask2):
+        self.do_boolean_op(operation, mask1, mask2)
  
  
     def do_boolean_op(self, op, m1, m2):
@@ -1449,7 +1425,7 @@ class Slice(with_metaclass(utils.Singleton, object)):
         self.q_orientation = np.array((1, 0, 0, 0))
         self.center = [(s * d/2.0) for (d, s) in zip(self.matrix.shape[::-1], self.spacing)]
  
-        self.__clean_current_mask(None)
+        self.__clean_current_mask()
         if self.current_mask:
             self.current_mask.matrix[:] = 0
             self.current_mask.was_edited = False
@@ -1459,7 +1435,7 @@ class Slice(with_metaclass(utils.Singleton, object)):
  
         Publisher.sendMessage('Reload actual slice')
  
-    def __undo_edition(self, pub_evt):
+    def __undo_edition(self):
         buffer_slices = self.buffer_slices
         actual_slices = {"AXIAL": buffer_slices["AXIAL"].index,
                          "CORONAL": buffer_slices["CORONAL"].index,
@@ -1471,7 +1447,7 @@ class Slice(with_metaclass(utils.Singleton, object)):
             self.buffer_slices[o].discard_vtk_mask()
         Publisher.sendMessage('Reload actual slice')
  
-    def __redo_edition(self, pub_evt):
+    def __redo_edition(self):
         buffer_slices = self.buffer_slices
         actual_slices = {"AXIAL": buffer_slices["AXIAL"].index,
                          "CORONAL": buffer_slices["CORONAL"].index,
@@ -1487,8 +1463,7 @@ class Slice(with_metaclass(utils.Singleton, object)):
         self.matrix_filename = filename
         self.matrix = np.memmap(filename, shape=shape, dtype=dtype, mode='r+')
  
-    def OnFlipVolume(self, pubsub_evt):
-        axis = pubsub_evt.data
+    def OnFlipVolume(self, axis):
         if axis == 0:
             self.matrix[:] = self.matrix[::-1]
         elif axis == 1:
@@ -1499,8 +1474,8 @@ class Slice(with_metaclass(utils.Singleton, object)):
         for buffer_ in self.buffer_slices.values():
             buffer_.discard_buffer()
  
-    def OnSwapVolumeAxes(self, pubsub_evt):
-        axis0, axis1 = pubsub_evt.data
+    def OnSwapVolumeAxes(self, axes):
+        axis0, axis1 = axes
         self.matrix = self.matrix.swapaxes(axis0, axis1)
         if (axis0, axis1) == (2, 1):
             self.spacing = self.spacing[1], self.spacing[0], self.spacing[2]
@@ -1512,20 +1487,17 @@ class Slice(with_metaclass(utils.Singleton, object)):
         for buffer_ in self.buffer_slices.values():
             buffer_.discard_buffer()
  
-    def OnExportMask(self, pubsub_evt):
-        pass
-        ##imagedata = self.current_mask.imagedata
-        #imagedata = self.imagedata
-        #filename, filetype = pubsub_evt.data
-        #if (filetype == const.FILETYPE_IMAGEDATA):
-            #iu.Export(imagedata, filename)
-
-    def _fill_holes_auto(self, pubsub_evt):
-        data = pubsub_evt.data
-        target = data['target']
-        conn = data['conn']
-        orientation = data['orientation']
-        size = data['size']
+    def OnExportMask(self, filename, filetype):
+        imagedata = self.current_mask.imagedata
+        #  imagedata = self.imagedata
+        if (filetype == const.FILETYPE_IMAGEDATA):
+            iu.Export(imagedata, filename)
+
+    def _fill_holes_auto(self, parameters):
+        target = parameters['target']
+        conn = parameters['conn']
+        orientation = parameters['orientation']
+        size = parameters['size']
  
         if target == '2D':
             index = self.buffer_slices[orientation].index
@@ -214,12 +214,12 @@ class CrossInteractorStyle(DefaultInteractorStyle):
     def SetUp(self):
         self.viewer._set_cross_visibility(1)
         Publisher.sendMessage('Toggle toolbar item',
-                             (self.state_code, True))
+                              _id=self.state_code, value=True)
  
     def CleanUp(self):
         self.viewer._set_cross_visibility(0)
         Publisher.sendMessage('Toggle toolbar item',
-                             (self.state_code, False))
+                              _id=self.state_code, value=False)
  
     def OnCrossMouseClick(self, obj, evt):
         iren = obj.GetInteractor()
@@ -237,29 +237,29 @@ class CrossInteractorStyle(DefaultInteractorStyle):
         wx, wy, wz = self.viewer.get_coordinate_cursor(mouse_x, mouse_y, self.picker)
         px, py = self.viewer.get_slice_pixel_coord_by_world_pos(wx, wy, wz)
         coord = self.viewer.calcultate_scroll_position(px, py)
-        Publisher.sendMessage('Update cross position', (wx, wy, wz))
+        Publisher.sendMessage('Update cross position', position=(wx, wy, wz))
         self.ScrollSlice(coord)
-        Publisher.sendMessage('Set ball reference position', (wx, wy, wz))
-        Publisher.sendMessage('Co-registered points',  (None, (wx, wy, wz, 0., 0., 0.)))
+        Publisher.sendMessage('Set ball reference position', position=(wx, wy, wz))
+        Publisher.sendMessage('Co-registered points',  arg=None, position=(wx, wy, wz, 0., 0., 0.))
  
         iren.Render()
  
     def ScrollSlice(self, coord):
         if self.orientation == "AXIAL":
             Publisher.sendMessage(('Set scroll position', 'SAGITAL'),
-                                       coord[0])
+                                       index=coord[0])
             Publisher.sendMessage(('Set scroll position', 'CORONAL'),
-                                       coord[1])
+                                       index=coord[1])
         elif self.orientation == "SAGITAL":
             Publisher.sendMessage(('Set scroll position', 'AXIAL'),
-                                       coord[2])
+                                       index=coord[2])
             Publisher.sendMessage(('Set scroll position', 'CORONAL'),
-                                       coord[1])
+                                       index=coord[1])
         elif self.orientation == "CORONAL":
             Publisher.sendMessage(('Set scroll position', 'AXIAL'),
-                                       coord[2])
+                                       index=coord[2])
             Publisher.sendMessage(('Set scroll position', 'SAGITAL'),
-                                       coord[0])
+                                       index=coord[0])
  
  
 class WWWLInteractorStyle(DefaultInteractorStyle):
@@ -285,14 +285,14 @@ class WWWLInteractorStyle(DefaultInteractorStyle):
     def SetUp(self):
         self.viewer.on_wl = True
         Publisher.sendMessage('Toggle toolbar item',
-                             (self.state_code, True))
+                              _id=self.state_code, value=True)
         self.viewer.canvas.draw_list.append(self.viewer.wl_text)
         self.viewer.UpdateCanvas()
  
     def CleanUp(self):
         self.viewer.on_wl = False
         Publisher.sendMessage('Toggle toolbar item',
-                             (self.state_code, False))
+                              _id=self.state_code, value=False)
         if self.viewer.wl_text is not None:
             self.viewer.canvas.draw_list.remove(self.viewer.wl_text)
             self.viewer.UpdateCanvas()
@@ -306,7 +306,8 @@ class WWWLInteractorStyle(DefaultInteractorStyle):
             self.last_x, self.last_y = mouse_x, mouse_y
  
             Publisher.sendMessage('Bright and contrast adjustment image',
-                (self.acum_achange_window, self.acum_achange_level))
+                                  window=self.acum_achange_window,
+                                  level=self.acum_achange_level)
  
             #self.SetWLText(self.acum_achange_level,
             #              self.acum_achange_window)
@@ -314,8 +315,9 @@ class WWWLInteractorStyle(DefaultInteractorStyle):
             const.WINDOW_LEVEL['Manual'] = (self.acum_achange_window,\
                                            self.acum_achange_level)
             Publisher.sendMessage('Check window and level other')
-            Publisher.sendMessage('Update window level value',(self.acum_achange_window,
-                                                                self.acum_achange_level))
+            Publisher.sendMessage('Update window level value',
+                                  window=self.acum_achange_window,
+                                  level= self.acum_achange_level)
             #Necessary update the slice plane in the volume case exists
             Publisher.sendMessage('Update slice viewer')
             Publisher.sendMessage('Render volume viewer')
@@ -374,11 +376,11 @@ class LinearMeasureInteractorStyle(DefaultInteractorStyle):
  
     def SetUp(self):
         Publisher.sendMessage('Toggle toolbar item',
-                             (self.state_code, True))
+                             _id=self.state_code, value=True)
  
     def CleanUp(self):
         Publisher.sendMessage('Toggle toolbar item',
-                             (self.state_code, False))
+                             _id=self.state_code, value=False)
         self.picker.PickFromListOff()
         Publisher.sendMessage("Remove incomplete measurements")
  
@@ -399,9 +401,9 @@ class LinearMeasureInteractorStyle(DefaultInteractorStyle):
                 self.viewer.scroll_enabled = True
             else:
                 Publisher.sendMessage("Add measurement point",
-                                      ((x, y, z), self._type,
-                                       ORIENTATIONS[self.orientation],
-                                       slice_number, self.radius))
+                                      position=(x, y, z), type=self._type,
+                                      location=ORIENTATIONS[self.orientation],
+                                      slice_number=slice_number, radius=self.radius)
                 n = len(m.points)-1
                 self.creating = n, m, mr
                 self.viewer.UpdateCanvas()
@@ -416,13 +418,15 @@ class LinearMeasureInteractorStyle(DefaultInteractorStyle):
             if self.picker.GetViewProp():
                 renderer = self.viewer.slice_data.renderer
                 Publisher.sendMessage("Add measurement point",
-                                      ((x, y, z), self._type,
-                                       ORIENTATIONS[self.orientation],
-                                       slice_number, self.radius))
+                                      position=(x, y, z), type=self._type,
+                                      location=ORIENTATIONS[self.orientation],
+                                      slice_number=slice_number,
+                                      radius=self.radius)
                 Publisher.sendMessage("Add measurement point",
-                                      ((x, y, z), self._type,
-                                       ORIENTATIONS[self.orientation],
-                                       slice_number, self.radius))
+                                      position=(x, y, z), type=self._type,
+                                      location=ORIENTATIONS[self.orientation],
+                                      slice_number=slice_number,
+                                      radius=self.radius)
  
                 n, (m, mr) =  1, self.measures.measures[self._ori][slice_number][-1]
                 self.creating = n, m, mr
@@ -434,7 +438,7 @@ class LinearMeasureInteractorStyle(DefaultInteractorStyle):
             n, m, mr = self.selected
             x, y, z = self._get_pos_clicked()
             idx = self.measures._list_measures.index((m, mr))
-            Publisher.sendMessage('Change measurement point position', (idx, n, (x, y, z)))
+            Publisher.sendMessage('Change measurement point position', index=idx, npoint=n, pos=(x, y, z))
             self.viewer.UpdateCanvas()
             self.selected = None
             self.viewer.scroll_enabled = True
@@ -444,13 +448,13 @@ class LinearMeasureInteractorStyle(DefaultInteractorStyle):
         if self.selected:
             n, m, mr = self.selected
             idx = self.measures._list_measures.index((m, mr))
-            Publisher.sendMessage('Change measurement point position', (idx, n, (x, y, z)))
+            Publisher.sendMessage('Change measurement point position', index=idx, npoint=n, pos=(x, y, z))
             self.viewer.UpdateCanvas()
  
         elif self.creating:
             n, m, mr = self.creating
             idx = self.measures._list_measures.index((m, mr))
-            Publisher.sendMessage('Change measurement point position', (idx, n, (x, y, z)))
+            Publisher.sendMessage('Change measurement point position', index=idx, npoint=n, pos=(x, y, z))
             self.viewer.UpdateCanvas()
  
         else:
@@ -539,12 +543,12 @@ class PanMoveInteractorStyle(DefaultInteractorStyle):
  
     def SetUp(self):
         Publisher.sendMessage('Toggle toolbar item',
-                             (self.state_code, True))
+                             _id=self.state_code, value=True)
  
     def CleanUp(self):
         self.viewer.interactor.Unbind(wx.EVT_LEFT_DCLICK)
         Publisher.sendMessage('Toggle toolbar item',
-                             (self.state_code, False))
+                             _id=self.state_code, value=False)
  
     def OnPanMove(self, obj, evt):
         if self.left_pressed:
@@ -575,12 +579,12 @@ class SpinInteractorStyle(DefaultInteractorStyle):
  
     def SetUp(self):
         Publisher.sendMessage('Toggle toolbar item',
-                             (self.state_code, True))
+                              _id=self.state_code, value=True)
  
     def CleanUp(self):
         self.viewer.interactor.Unbind(wx.EVT_LEFT_DCLICK)
         Publisher.sendMessage('Toggle toolbar item',
-                             (self.state_code, False))
+                              _id=self.state_code, value=False)
  
     def OnSpinMove(self, obj, evt):
         iren = obj.GetInteractor()
@@ -620,12 +624,12 @@ class ZoomInteractorStyle(DefaultInteractorStyle):
  
     def SetUp(self):
         Publisher.sendMessage('Toggle toolbar item',
-                             (self.state_code, True))
+                             _id=self.state_code, value=True)
  
     def CleanUp(self):
         self.viewer.interactor.Unbind(wx.EVT_LEFT_DCLICK)
         Publisher.sendMessage('Toggle toolbar item',
-                             (self.state_code, False))
+                              _id=self.state_code, value=False)
  
     def OnZoomMoveLeft(self, obj, evt):
         if self.left_pressed:
@@ -654,12 +658,12 @@ class ZoomSLInteractorStyle(vtk.vtkInteractorStyleRubberBandZoom):
  
     def SetUp(self):
         Publisher.sendMessage('Toggle toolbar item',
-                             (self.state_code, True))
+                              _id=self.state_code, value=True)
  
     def CleanUp(self):
         self.viewer.interactor.Unbind(wx.EVT_LEFT_DCLICK)
         Publisher.sendMessage('Toggle toolbar item',
-                             (self.state_code, False))
+                              _id=self.state_code, value=False)
  
     def OnUnZoom(self, evt):
         mouse_x, mouse_y = self.viewer.interactor.GetLastEventPosition()
@@ -687,11 +691,11 @@ class ChangeSliceInteractorStyle(DefaultInteractorStyle):
  
     def SetUp(self):
         Publisher.sendMessage('Toggle toolbar item',
-                             (self.state_code, True))
+                             _id=self.state_code, value=True)
  
     def CleanUp(self):
         Publisher.sendMessage('Toggle toolbar item',
-                             (self.state_code, False))
+                             _id=self.state_code, value=False)
  
     def OnChangeSliceMove(self, evt, obj):
         if self.left_pressed:
@@ -779,17 +783,16 @@ class EditorInteractorStyle(DefaultInteractorStyle):
         self.viewer.interactor.SetCursor(wx.StockCursor(wx.CURSOR_DEFAULT))
         self.viewer.interactor.Render()
  
-    def set_bsize(self, pubsub_evt):
-        size = pubsub_evt.data
+    def set_bsize(self, size):
         self.config.cursor_size = size
         self.viewer.slice_data.cursor.SetSize(size)
  
-    def set_bformat(self, pubsub_evt):
-        self.config.cursor_type = pubsub_evt.data
+    def set_bformat(self, cursor_format):
+        self.config.cursor_type = cursor_format
         self._set_cursor()
  
-    def set_boperation(self, pubsub_evt):
-        self.config.operation = pubsub_evt.data
+    def set_boperation(self, operation):
+        self.config.operation = operation
  
     def _set_cursor(self):
         if self.config.cursor_type == const.BRUSH_SQUARE:
@@ -936,7 +939,7 @@ class EditorInteractorStyle(DefaultInteractorStyle):
             size += 1
  
             if size <= 100:
-                Publisher.sendMessage('Set edition brush size', size)
+                Publisher.sendMessage('Set edition brush size', size=size)
                 cursor.SetPosition(cursor.position)
                 self.viewer.interactor.Render()
         else:
@@ -954,7 +957,7 @@ class EditorInteractorStyle(DefaultInteractorStyle):
             size -= 1
  
             if size > 0:
-                Publisher.sendMessage('Set edition brush size', size)
+                Publisher.sendMessage('Set edition brush size', size=size)
                 cursor.SetPosition(cursor.position)
                 self.viewer.interactor.Render()
         else:
@@ -1005,23 +1008,23 @@ class WatershedConfig(with_metaclass(utils.Singleton, object)):
         Publisher.subscribe(self.set_3dcon, "Set watershed 3d con")
         Publisher.subscribe(self.set_gaussian_size, "Set watershed gaussian size")
  
-    def set_operation(self, pubsub_evt):
-        self.operation = WATERSHED_OPERATIONS[pubsub_evt.data]
+    def set_operation(self, operation):
+        self.operation = WATERSHED_OPERATIONS[operation]
  
-    def set_use_ww_wl(self, pubsub_evt):
-        self.use_ww_wl = pubsub_evt.data
+    def set_use_ww_wl(self, use_ww_wl):
+        self.use_ww_wl = use_ww_wl
  
-    def set_algorithm(self, pubsub_evt):
-        self.algorithm = pubsub_evt.data
+    def set_algorithm(self, algorithm):
+        self.algorithm = algorithm
  
-    def set_2dcon(self, pubsub_evt):
-        self.con_2d = pubsub_evt.data
+    def set_2dcon(self, con_2d):
+        self.con_2d = con_2d
  
-    def set_3dcon(self, pubsub_evt):
-        self.con_3d = pubsub_evt.data
+    def set_3dcon(self, con_3d):
+        self.con_3d = con_3d
  
-    def set_gaussian_size(self, pubsub_evt):
-        self.mg_size = pubsub_evt.data
+    def set_gaussian_size(self, size):
+        self.mg_size = size
  
 WALGORITHM = {"Watershed": watershed,
              "Watershed IFT": watershed_ift}
@@ -1124,13 +1127,12 @@ class WaterShedInteractorStyle(DefaultInteractorStyle):
         cursor.SetSize(self.config.cursor_size)
         self.viewer.slice_data.SetCursor(cursor)
  
-    def set_bsize(self, pubsub_evt):
-        size = pubsub_evt.data
+    def set_bsize(self, size):
         self.config.cursor_size = size
         self.viewer.slice_data.cursor.SetSize(size)
  
-    def set_bformat(self, pubsub_evt):
-        self.config.cursor_type = pubsub_evt.data
+    def set_bformat(self, brush_format):
+        self.config.cursor_type = brush_format
         self._set_cursor()
  
     def OnEnterInteractor(self, obj, evt):
@@ -1157,7 +1159,7 @@ class WaterShedInteractorStyle(DefaultInteractorStyle):
             size -= 1
  
             if size > 0:
-                Publisher.sendMessage('Set watershed brush size', size)
+                Publisher.sendMessage('Set watershed brush size', size=size)
                 cursor.SetPosition(cursor.position)
                 self.viewer.interactor.Render()
         else:
@@ -1175,7 +1177,7 @@ class WaterShedInteractorStyle(DefaultInteractorStyle):
             size += 1
  
             if size <= 100:
-                Publisher.sendMessage('Set watershed brush size', size)
+                Publisher.sendMessage('Set watershed brush size', size=size)
                 cursor.SetPosition(cursor.position)
                 self.viewer.interactor.Render()
         else:
@@ -1423,7 +1425,7 @@ class WaterShedInteractorStyle(DefaultInteractorStyle):
         if roi_m.size:
             roi_m[index] = operation
  
-    def expand_watershed(self, pubsub_evt):
+    def expand_watershed(self):
         markers = self.matrix
         image = self.viewer.slice_.matrix
         self.viewer.slice_.do_threshold_to_all_slices()
@@ -1631,7 +1633,7 @@ class ReorientImageInteractorStyle(DefaultInteractorStyle):
         self.viewer.slice_.rotations = [0, 0, 0]
         self.viewer.slice_.q_orientation = np.array((1, 0, 0, 0))
  
-        Publisher.sendMessage('Update reorient angles', (0, 0, 0))
+        Publisher.sendMessage('Update reorient angles', angles=(0, 0, 0))
  
         self._discard_buffers()
         self.viewer.slice_.current_mask.clear_history()
@@ -1687,7 +1689,7 @@ class ReorientImageInteractorStyle(DefaultInteractorStyle):
         self.viewer.slice_.q_orientation = transformations.quaternion_multiply(self.viewer.slice_.q_orientation, transformations.quaternion_about_axis(angle, axis))
  
         az, ay, ax = transformations.euler_from_quaternion(self.viewer.slice_.q_orientation)
-        Publisher.sendMessage('Update reorient angles', (ax, ay, az))
+        Publisher.sendMessage('Update reorient angles', angles=(ax, ay, az))
  
         self._discard_buffers()
         if self.viewer.slice_.current_mask:
@@ -1713,8 +1715,8 @@ class ReorientImageInteractorStyle(DefaultInteractorStyle):
         #  print (z, y, x), tcoord
         return tcoord
  
-    def _set_reorientation_angles(self, pubsub_evt):
-        ax, ay, az = pubsub_evt.data
+    def _set_reorientation_angles(self, angles):
+        ax, ay, az = angles
         q = transformations.quaternion_from_euler(az, ay, ax)
         self.viewer.slice_.q_orientation = q
  
@@ -1968,9 +1970,8 @@ class CropMaskInteractorStyle(DefaultInteractorStyle):
         self.viewer.canvas.draw_list.remove(self.draw_retangle)
         Publisher.sendMessage('Redraw canvas')
  
-    def CropMask(self, pubsub_evt):
+    def CropMask(self):
         if self.viewer.orientation == "AXIAL":
-            
             xi, xf, yi, yf, zi, zf = self.draw_retangle.box.GetLimits()
  
             xi += 1
@@ -1978,7 +1979,7 @@ class CropMaskInteractorStyle(DefaultInteractorStyle):
  
             yi += 1
             yf += 1
-            
+
             zi += 1
             zf += 1
  
@@ -1986,13 +1987,13 @@ class CropMaskInteractorStyle(DefaultInteractorStyle):
             cp_mask = self.viewer.slice_.current_mask.matrix.copy()
  
             tmp_mask = self.viewer.slice_.current_mask.matrix[zi-1:zf+1, yi-1:yf+1, xi-1:xf+1].copy()
-            
+
             self.viewer.slice_.current_mask.matrix[:] = 1
  
             self.viewer.slice_.current_mask.matrix[zi-1:zf+1, yi-1:yf+1, xi-1:xf+1] = tmp_mask
  
             self.viewer.slice_.current_mask.save_history(0, 'VOLUME', self.viewer.slice_.current_mask.matrix.copy(), cp_mask)
-            
+
             self.viewer.slice_.buffer_slices['AXIAL'].discard_mask()
             self.viewer.slice_.buffer_slices['CORONAL'].discard_mask()
             self.viewer.slice_.buffer_slices['SAGITAL'].discard_mask()
@@ -2002,9 +2003,9 @@ class CropMaskInteractorStyle(DefaultInteractorStyle):
             self.viewer.slice_.buffer_slices['SAGITAL'].discard_vtk_mask()
  
             self.viewer.slice_.current_mask.was_edited = True
-            Publisher.sendMessage('Reload actual slice')           
+            Publisher.sendMessage('Reload actual slice')
+
  
-     
 class SelectPartConfig(with_metaclass(utils.Singleton, object)):
     def __init__(self):
         self.mask = None
@@ -2066,7 +2067,7 @@ class SelectMaskPartsInteractorStyle(DefaultInteractorStyle):
                 self.config.mask.name = self.config.mask_name
                 self.viewer.slice_._add_mask_into_proj(self.config.mask)
                 self.viewer.slice_.SelectCurrentMask(self.config.mask.index)
-                Publisher.sendMessage('Change mask selected', self.config.mask.index)
+                Publisher.sendMessage('Change mask selected', index=self.config.mask.index)
  
             del self.viewer.slice_.aux_matrices['SELECT']
             self.viewer.slice_.to_show_aux = ''
@@ -171,11 +171,10 @@ class SurfaceManager():
  
         Publisher.subscribe(self.OnImportSurfaceFile, 'Import surface file')
  
-    def OnDuplicate(self, pubsub_evt):
-        selected_items = pubsub_evt.data
+    def OnDuplicate(self, surface_indexes):
         proj = prj.Project()
         surface_dict = proj.surface_dict
-        for index in selected_items:
+        for index in surface_indexes:
             original_surface = surface_dict[index]
             # compute copy name
             name = original_surface.name
@@ -190,14 +189,13 @@ class SurfaceManager():
                                            volume = original_surface.volume,
                                            area = original_surface.area)
  
-    def OnRemove(self, pubsub_evt):
-        selected_items = pubsub_evt.data
+    def OnRemove(self, surface_indexes):
         proj = prj.Project()
  
         old_dict = self.actors_dict
         new_dict = {}
-        if selected_items:
-            for index in selected_items:
+        if surface_indexes:
+            for index in surface_indexes:
                 proj.RemoveSurface(index)
                 if index in old_dict:
                     actor = old_dict[index]
@@ -207,21 +205,21 @@ class SurfaceManager():
                         if i > index:
                             new_dict[i-1] = old_dict[i]
                     old_dict = new_dict
-                    Publisher.sendMessage('Remove surface actor from viewer', actor)
+                    Publisher.sendMessage('Remove surface actor from viewer', actor=actor)
             self.actors_dict = new_dict
  
-        if self.last_surface_index in selected_items:
+        if self.last_surface_index in surface_indexes:
             if self.actors_dict:
                 self.last_surface_index = 0
             else:
                 self.last_surface_index = None
  
-    def OnSeedSurface(self, pubsub_evt):
+    def OnSeedSurface(self, seeds):
         """
         Create a new surface, based on the last selected surface,
         using as reference seeds user add to surface of reference.
         """
-        points_id_list = pubsub_evt.data
+        points_id_list = seeds
         index = self.last_surface_index
         proj = prj.Project()
         surface = proj.surface_dict[index]
@@ -229,10 +227,10 @@ class SurfaceManager():
         new_polydata = pu.JoinSeedsParts(surface.polydata,
                                           points_id_list)
         index = self.CreateSurfaceFromPolydata(new_polydata)
-        Publisher.sendMessage('Show single surface', (index, True))
+        Publisher.sendMessage('Show single surface', index=index, visibility=True)
         #self.ShowActor(index, True)
  
-    def OnSplitSurface(self, pubsub_evt):
+    def OnSplitSurface(self):
         """
         Create n new surfaces, based on the last selected surface,
         according to their connectivity.
@@ -248,9 +246,9 @@ class SurfaceManager():
             index_list.append(index)
             #self.ShowActor(index, True)
  
-        Publisher.sendMessage('Show multiple surfaces', (index_list, True))
+        Publisher.sendMessage('Show multiple surfaces', index_list=index_list, visibility=True)
  
-    def OnLargestSurface(self, pubsub_evt):
+    def OnLargestSurface(self):
         """
         Create a new surface, based on largest part of the last
         selected surface.
@@ -261,13 +259,12 @@ class SurfaceManager():
  
         new_polydata = pu.SelectLargestPart(surface.polydata)
         new_index = self.CreateSurfaceFromPolydata(new_polydata)
-        Publisher.sendMessage('Show single surface', (new_index, True))
+        Publisher.sendMessage('Show single surface', index=new_index, visibility=True)
  
-    def OnImportSurfaceFile(self, pubsub_evt):
+    def OnImportSurfaceFile(self, filename):
         """
         Creates a new surface from a surface file (STL, PLY, OBJ or VTP)
         """
-        filename = pubsub_evt.data
         self.CreateSurfaceFromFile(filename)
  
     def CreateSurfaceFromFile(self, filename):
@@ -368,42 +365,34 @@ class SurfaceManager():
  
         self.last_surface_index = surface.index
  
-        Publisher.sendMessage('Load surface actor into viewer', actor)
+        Publisher.sendMessage('Load surface actor into viewer', actor=actor)
  
-        Publisher.sendMessage('Update surface info in GUI',
-                              (surface.index, surface.name,
-                               surface.colour, surface.volume,
-                               surface.area, surface.transparency))
+        Publisher.sendMessage('Update surface info in GUI', surface=surface)
         return surface.index
  
-    def OnCloseProject(self, pubsub_evt):
+    def OnCloseProject(self):
         self.CloseProject()
  
     def CloseProject(self):
         for index in self.actors_dict:
-            Publisher.sendMessage('Remove surface actor from viewer', self.actors_dict[index])
+            Publisher.sendMessage('Remove surface actor from viewer', actor=self.actors_dict[index])
         del self.actors_dict
         self.actors_dict = {}
  
         # restarting the surface index
         Surface.general_index = -1
  
-    def OnSelectSurface(self, pubsub_evt):
-        index = pubsub_evt.data
-        #self.last_surface_index = index
+    def OnSelectSurface(self, surface_index):
+        #self.last_surface_index = surface_index
         # self.actors_dict.
         proj = prj.Project()
-        surface = proj.surface_dict[index]
-        Publisher.sendMessage('Update surface info in GUI',
-                              (index, surface.name,
-                               surface.colour, surface.volume,
-                               surface.area, surface.transparency))
-        self.last_surface_index = index
+        surface = proj.surface_dict[surface_index]
+        Publisher.sendMessage('Update surface info in GUI', surface=surface)
+        self.last_surface_index = surface_index
         #  if surface.is_shown:
-        self.ShowActor(index, True)
+        self.ShowActor(surface_index, True)
  
-    def OnLoadSurfaceDict(self, pubsub_evt):
-        surface_dict = pubsub_evt.data
+    def OnLoadSurfaceDict(self, surface_dict):
         for key in surface_dict:
             surface = surface_dict[key]
  
@@ -436,27 +425,23 @@ class SurfaceManager():
             self.actors_dict[surface.index] = actor
  
             # Send actor by pubsub to viewer's render
-            Publisher.sendMessage('Load surface actor into viewer', (actor))
+            Publisher.sendMessage('Load surface actor into viewer', actor=actor)
  
             Publisher.sendMessage('Update status text in GUI',
-                                        _("Ready"))
+                                  label=_("Ready"))
  
             # The following lines have to be here, otherwise all volumes disappear
-            Publisher.sendMessage('Update surface info in GUI',
-                                        (surface.index, surface.name,
-                                         surface.colour, surface.volume,
-                                         surface.area, surface.transparency))
+            Publisher.sendMessage('Update surface info in GUI', surface=surface)
             if not surface.is_shown:
                 self.ShowActor(key, False)
  
     ####
     #(mask_index, surface_name, quality, fill_holes, keep_largest)
  
-    def AddNewActor(self, pubsub_evt):
+    def AddNewActor(self, slice_, mask, surface_parameters):
         """
         Create surface actor, save into project and send it to viewer.
         """
-        slice_, mask, surface_parameters = pubsub_evt.data
         matrix = slice_.matrix
         filename_img = slice_.matrix_filename
         spacing = slice_.spacing
@@ -825,31 +810,27 @@ class SurfaceManager():
             del measured_polydata
             del to_measure
  
-            Publisher.sendMessage('Load surface actor into viewer', actor)
+            Publisher.sendMessage('Load surface actor into viewer', actor=actor)
  
             # Send actor by pubsub to viewer's render
             if overwrite and self.actors_dict.keys():
                 old_actor = self.actors_dict[self.last_surface_index]
-                Publisher.sendMessage('Remove surface actor from viewer', old_actor)
+                Publisher.sendMessage('Remove surface actor from viewer', actor=old_actor)
  
             # Save actor for future management tasks
             self.actors_dict[surface.index] = actor
  
-            Publisher.sendMessage('Update surface info in GUI',
-                                        (surface.index, surface.name,
-                                        surface.colour, surface.volume,
-                                        surface.area,
-                                        surface.transparency))
+            Publisher.sendMessage('Update surface info in GUI', surface=surface)
  
             #When you finalize the progress. The bar is cleaned.
             UpdateProgress = vu.ShowProgress(1)
             UpdateProgress(0, _("Ready"))
-            Publisher.sendMessage('Update status text in GUI', _("Ready"))
+            Publisher.sendMessage('Update status text in GUI', label=_("Ready"))
  
             Publisher.sendMessage('End busy cursor')
             del actor
  
-    def UpdateSurfaceInterpolation(self, pub_evt):
+    def UpdateSurfaceInterpolation(self):
         interpolation = int(ses.Session().surface_interpolation)
         key_actors = self.actors_dict.keys()
  
@@ -861,20 +842,18 @@ class SurfaceManager():
         """
         Remove actor, according to given actor index.
         """
-        Publisher.sendMessage('Remove surface actor from viewer', (index))
+        Publisher.sendMessage('Remove surface actor from viewer', actor=index)
         self.actors_dict.pop(index)
         # Remove surface from project's surface_dict
         proj = prj.Project()
         proj.surface_dict.pop(index)
  
-    def OnChangeSurfaceName(self, pubsub_evt):
-        index, name = pubsub_evt.data
+    def OnChangeSurfaceName(self, index, name):
         proj = prj.Project()
         proj.surface_dict[index].name = name
  
-    def OnShowSurface(self, pubsub_evt):
-        index, value = pubsub_evt.data
-        self.ShowActor(index, value)
+    def OnShowSurface(self, index, visibility):
+        self.ShowActor(index, visibility)
  
     def ShowActor(self, index, value):
         """
@@ -886,30 +865,27 @@ class SurfaceManager():
         proj.surface_dict[index].is_shown = value
         Publisher.sendMessage('Render volume viewer')
  
-    def SetActorTransparency(self, pubsub_evt):
+    def SetActorTransparency(self, surface_index, transparency):
         """
         Set actor transparency (oposite to opacity) according to given actor
         index and value.
         """
-        index, value = pubsub_evt.data
-        self.actors_dict[index].GetProperty().SetOpacity(1-value)
+        self.actors_dict[surface_index].GetProperty().SetOpacity(1-transparency)
         # Update value in project's surface_dict
         proj = prj.Project()
-        proj.surface_dict[index].transparency = value
+        proj.surface_dict[surface_index].transparency = transparency
         Publisher.sendMessage('Render volume viewer')
  
-    def SetActorColour(self, pubsub_evt):
+    def SetActorColour(self, surface_index, colour):
         """
         """
-        index, colour = pubsub_evt.data
-        self.actors_dict[index].GetProperty().SetColor(colour[:3])
+        self.actors_dict[surface_index].GetProperty().SetColor(colour[:3])
         # Update value in project's surface_dict
         proj = prj.Project()
-        proj.surface_dict[index].colour = colour
+        proj.surface_dict[surface_index].colour = colour
         Publisher.sendMessage('Render volume viewer')
  
-    def OnExportSurface(self, pubsub_evt):
-        filename, filetype = pubsub_evt.data
+    def OnExportSurface(self, filename, filetype):
         ftype_prefix = {
             const.FILETYPE_STL: '.stl',
             const.FILETYPE_VTP: '.vtp',
@@ -132,29 +132,27 @@ class ContourMIPConfig(wx.Panel):
  
         Publisher.subscribe(self._set_projection_type, 'Set projection type')
  
-    def OnSetMIPSize(self, evt):
+    def OnSetMIPSize(self, number_slices):
         val = self.mip_size_spin.GetValue()
-        Publisher.sendMessage('Set MIP size %s' % self.orientation, val)
+        Publisher.sendMessage('Set MIP size %s' % self.orientation, number_slices=val)
  
     def OnSetMIPBorder(self, evt):
         val = self.border_spin.GetValue()
-        Publisher.sendMessage('Set MIP border %s' % self.orientation, val)
+        Publisher.sendMessage('Set MIP border %s' % self.orientation, border_size=val)
  
     def OnCheckInverted(self, evt):
         val = self.inverted.GetValue()
-        Publisher.sendMessage('Set MIP Invert %s' % self.orientation, val)
+        Publisher.sendMessage('Set MIP Invert %s' % self.orientation, invert=val)
  
-    def _set_projection_type(self, pubsub_evt):
-        tprojection = pubsub_evt.data
-
-        if tprojection in (const.PROJECTION_MIDA,
-                           const.PROJECTION_CONTOUR_MIDA):
+    def _set_projection_type(self, projection_id):
+        if projection_id in (const.PROJECTION_MIDA,
+                             const.PROJECTION_CONTOUR_MIDA):
             self.inverted.Enable()
         else:
             self.inverted.Disable()
  
-        if tprojection in (const.PROJECTION_CONTOUR_MIP,
-                           const.PROJECTION_CONTOUR_MIDA):
+        if projection_id in (const.PROJECTION_CONTOUR_MIP,
+                             const.PROJECTION_CONTOUR_MIDA):
             self.border_spin.Enable()
             self.txt_mip_border.Enable()
         else:
@@ -664,8 +662,7 @@ class Viewer(wx.Panel):
         self.UpdateCanvas()
         self.on_text = True
  
-    def __set_layout(self, pubsub_evt):
-        layout = pubsub_evt.data
+    def __set_layout(self, layout):
         self.SetLayout(layout)
  
     def __config_interactor(self):
@@ -693,8 +690,7 @@ class Viewer(wx.Panel):
  
         self.state = state
  
-    def UpdateWindowLevelValue(self, pubsub_evt):
-        window, level = pubsub_evt.data
+    def UpdateWindowLevelValue(self, window, level):
         self.acum_achange_window, self.acum_achange_level = (window, level)
         self.SetWLText(window, level)
  
@@ -704,18 +700,18 @@ class Viewer(wx.Panel):
         Publisher.sendMessage('Update all slice')
         Publisher.sendMessage('Update clut imagedata widget')
  
-    def UpdateWindowLevelText(self, pubsub_evt):
-        window, level = pubsub_evt.data
-        self.acum_achange_window, self.acum_achange_level = (window, level)
+    def UpdateWindowLevelText(self, window, level):
+        self.acum_achange_window, self.acum_achange_level = window, level
         self.SetWLText(window, level)
         self.interactor.Render()
  
     def OnClutChange(self, evt):
         Publisher.sendMessage('Change colour table from background image from widget',
-                              evt.GetNodes())
+                              nodes=evt.GetNodes())
         slc = sl.Slice()
         Publisher.sendMessage('Update window level value',
-                              (slc.window_width, slc.window_level))
+                              window=slc.window_width,
+                              level=slc.window_level)
  
     def SetWLText(self, window_width, window_level):
         value = STR_WL%(window_level, window_width)
@@ -930,46 +926,45 @@ class Viewer(wx.Panel):
         ren.GetActiveCamera().Zoom(1.0)
         self.interactor.Render()
  
-    def ChangeBrushColour(self, pubsub_evt):
-        vtk_colour = pubsub_evt.data[3]
+    def ChangeBrushColour(self, colour):
+        vtk_colour = colour
         self._brush_cursor_colour = vtk_colour
         if (self.cursor):
             for slice_data in self.slice_data_list:
                 slice_data.cursor.SetColour(vtk_colour)
  
-    def SetBrushColour(self, pubsub_evt):
-        colour_wx = pubsub_evt.data
-        colour_vtk = [colour/float(255) for colour in colour_wx]
+    def SetBrushColour(self, colour):
+        colour_vtk = [colour/float(255) for colour in colour]
         self._brush_cursor_colour = colour_vtk
         if self.slice_data.cursor:
             self.slice_data.cursor.SetColour(colour_vtk)
  
-    def UpdateSlicesNavigation(self, pubsub_evt):
+    def UpdateSlicesNavigation(self, arg, position):
         # Get point from base change
-        ux, uy, uz = pubsub_evt.data[1][:3]
+        ux, uy, uz = position[:3]
         px, py = self.get_slice_pixel_coord_by_world_pos(ux, uy, uz)
         coord = self.calcultate_scroll_position(px, py)
  
         self.cross.SetFocalPoint((ux, uy, uz))
         self.ScrollSlice(coord)
-        Publisher.sendMessage('Set ball reference position', (ux, uy, uz))
+        Publisher.sendMessage('Set ball reference position', position=(ux, uy, uz))
  
     def ScrollSlice(self, coord):
         if self.orientation == "AXIAL":
             Publisher.sendMessage(('Set scroll position', 'SAGITAL'),
-                                       coord[0])
+                                       index=coord[0])
             Publisher.sendMessage(('Set scroll position', 'CORONAL'),
-                                       coord[1])
+                                       index=coord[1])
         elif self.orientation == "SAGITAL":
             Publisher.sendMessage(('Set scroll position', 'AXIAL'),
-                                       coord[2])
+                                       index=coord[2])
             Publisher.sendMessage(('Set scroll position', 'CORONAL'),
-                                       coord[1])
+                                       index=coord[1])
         elif self.orientation == "CORONAL":
             Publisher.sendMessage(('Set scroll position', 'AXIAL'),
-                                       coord[2])
+                                       index=coord[2])
             Publisher.sendMessage(('Set scroll position', 'SAGITAL'),
-                                       coord[0])
+                                       index=coord[0])
  
     def get_slice_data(self, render):
         #for slice_data in self.slice_data_list:
@@ -1251,39 +1246,37 @@ class Viewer(wx.Panel):
         Publisher.subscribe(self.UpdateInterpolatedSlice, "Update Slice Interpolation")
  
  
-    def RefreshViewer(self, pubsub_evt):
+    def RefreshViewer(self):
         self.Refresh()
  
-    def SetDefaultCursor(self, pusub_evt):
+    def SetDefaultCursor(self):
         self.interactor.SetCursor(wx.StockCursor(wx.CURSOR_DEFAULT))
  
-    def SetSizeNSCursor(self, pusub_evt):
+    def SetSizeNSCursor(self):
         self.interactor.SetCursor(wx.StockCursor(wx.CURSOR_SIZENS))
  
-    def SetSizeWECursor(self, pusub_evt):
+    def SetSizeWECursor(self):
         self.interactor.SetCursor(wx.StockCursor(wx.CURSOR_SIZEWE))
  
-    def SetSizeNWSECursor(self, pubsub_evt):
+    def SetSizeNWSECursor(self):
         if sys.platform.startswith('linux'):
             self.interactor.SetCursor(wx.StockCursor(wx.CURSOR_SIZENWSE))
         else:
             self.interactor.SetCursor(wx.StockCursor(wx.CURSOR_SIZING))
  
-    def OnExportPicture(self, pubsub_evt):
-        id, filename, filetype = pubsub_evt.data
-
+    def OnExportPicture(self, orientation, filename, filetype):
         dict = {"AXIAL": const.AXIAL,
                 "CORONAL": const.CORONAL,
                 "SAGITAL": const.SAGITAL}
  
-        if id == dict[self.orientation]:
+        if orientation == dict[self.orientation]:
             Publisher.sendMessage('Begin busy cursor')
             if _has_win32api:
                 utils.touch(filename)
                 win_filename = win32api.GetShortPathName(filename)
-                self._export_picture(id, win_filename, filetype)
+                self._export_picture(orientation, win_filename, filetype)
             else:
-                self._export_picture(id, filename, filetype)
+                self._export_picture(orientation, filename, filetype)
             Publisher.sendMessage('End busy cursor')
  
     def _export_picture(self, id, filename, filetype):
@@ -1340,13 +1333,13 @@ class Viewer(wx.Panel):
  
         Publisher.sendMessage('End busy cursor')
  
-    def OnShowText(self, pubsub_evt):
+    def OnShowText(self):
         self.ShowTextActors()
  
-    def OnHideText(self, pubsub_evt):
+    def OnHideText(self):
         self.HideTextActors()
  
-    def OnCloseProject(self, pubsub_evt):
+    def OnCloseProject(self):
         self.CloseProject()
  
     def CloseProject(self):
@@ -1371,11 +1364,10 @@ class Viewer(wx.Panel):
         self.wl_text = None
         self.pick = vtk.vtkWorldPointPicker()
  
-    def OnSetInteractorStyle(self, pubsub_evt):
-        state = pubsub_evt.data
-        self.SetInteractorStyle(state)
+    def OnSetInteractorStyle(self, style):
+        self.SetInteractorStyle(style)
  
-        if (state not in [const.SLICE_STATE_EDITOR, const.SLICE_STATE_WATERSHED]):
+        if (style not in [const.SLICE_STATE_EDITOR, const.SLICE_STATE_WATERSHED]):
             Publisher.sendMessage('Set interactor default cursor')
  
     def __bind_events_wx(self):
@@ -1386,8 +1378,7 @@ class Viewer(wx.Panel):
         self.interactor.Bind(wx.EVT_RIGHT_UP, self.OnContextMenu)
         self.interactor.Bind(wx.EVT_SIZE, self.OnSize)
  
-    def LoadImagedata(self, pubsub_evt):
-        mask_dict = pubsub_evt.data
+    def LoadImagedata(self, mask_dict):
         self.SetInput(mask_dict)
  
     def LoadRenderers(self, imagedata):
@@ -1509,9 +1500,8 @@ class Viewer(wx.Panel):
  
         renderer.AddActor(cross_actor)
  
-    def __update_cross_position(self, pubsub_evt):
-        pos = pubsub_evt.data
-        self.cross.SetFocalPoint(pos)
+    def __update_cross_position(self, position):
+        self.cross.SetFocalPoint(position)
  
     def _set_cross_visibility(self, visibility):
         self.cross_actor.SetVisibility(visibility)
@@ -1569,8 +1559,8 @@ class Viewer(wx.Panel):
  
         return slice_data
  
-    def UpdateInterpolatedSlice(self, pub_sub):
-        if self.slice_actor != None:    
+    def UpdateInterpolatedSlice(self):
+        if self.slice_actor != None:
             if ses.Session().slice_interpolation:
                 self.slice_actor.InterpolateOff()
             else:
@@ -1578,15 +1568,13 @@ class Viewer(wx.Panel):
             self.interactor.Render()
  
  
-    def SetInterpolatedSlices(self, pub_sub):
-        self.interpolation_slice_status = status = pub_sub.data
-        
+    def SetInterpolatedSlices(self, flag):
+        self.interpolation_slice_status = flag
         if self.slice_actor != None:
-            if status == True:
+            if self.interpolation_slice_status == True:
                 self.slice_actor.InterpolateOn()
             else:
                 self.slice_actor.InterpolateOff()
-            
             self.interactor.Render()
  
     def __update_camera(self):
@@ -1605,7 +1593,7 @@ class Viewer(wx.Panel):
         self.slice_data.actor.SetDisplayExtent(image.GetExtent())
         self.slice_data.renderer.ResetCameraClippingRange()
  
-    def UpdateRender(self, evt):
+    def UpdateRender(self):
         self.interactor.Render()
  
     def UpdateCanvas(self, evt=None):
@@ -1655,8 +1643,8 @@ class Viewer(wx.Panel):
     def UpdateSlice3D(self, pos):
         original_orientation = project.Project().original_orientation
         pos = self.scroll.GetThumbPosition()
-        Publisher.sendMessage('Change slice from slice plane',\
-                                   (self.orientation, pos))
+        Publisher.sendMessage('Change slice from slice plane',
+                              orientation=self.orientation, index=pos)
  
     def OnScrollBar(self, evt=None, update3D=True):
         pos = self.scroll.GetThumbPosition()
@@ -1667,7 +1655,7 @@ class Viewer(wx.Panel):
             # Update other slice's cross according to the new focal point from
             # the actual orientation.
             focal_point = self.cross.GetFocalPoint()
-            Publisher.sendMessage('Update cross position', focal_point)
+            Publisher.sendMessage('Update cross position', position=focal_point)
             Publisher.sendMessage('Update slice viewer')
         else:
             self.interactor.Render()
@@ -1722,7 +1710,7 @@ class Viewer(wx.Panel):
  
         elif evt.GetKeyCode() in projections:
             self.slice_.SetTypeProjection(projections[evt.GetKeyCode()])
-            Publisher.sendMessage('Set projection type', projections[evt.GetKeyCode()])
+            Publisher.sendMessage('Set projection type', projection_id=projections[evt.GetKeyCode()])
             Publisher.sendMessage('Reload actual slice')
             skip = False
  
@@ -1766,28 +1754,24 @@ class Viewer(wx.Panel):
             self.slice_data.SetSize((w, h))
         evt.Skip()
  
-    def OnSetMIPSize(self, pubsub_evt):
-        val = pubsub_evt.data
-        self.number_slices = val
+    def OnSetMIPSize(self, number_slices):
+        self.number_slices = number_slices
         self.ReloadActualSlice()
  
-    def OnSetMIPBorder(self, pubsub_evt):
-        val = pubsub_evt.data
-        self.slice_.n_border = val
+    def OnSetMIPBorder(self, border_size):
+        self.slice_.n_border = border_size
         buffer_ = self.slice_.buffer_slices[self.orientation]
         buffer_.discard_buffer()
         self.ReloadActualSlice()
  
-    def OnSetMIPInvert(self, pubsub_evt):
-        val = pubsub_evt.data
-        self._mip_inverted = val
+    def OnSetMIPInvert(self, invert):
+        self._mip_inverted = invert
         buffer_ = self.slice_.buffer_slices[self.orientation]
         buffer_.discard_buffer()
         self.ReloadActualSlice()
  
-    def OnShowMIPInterface(self, pubsub_evt):
-        value = pubsub_evt.data
-        if value:
+    def OnShowMIPInterface(self, flag):
+        if flag:
             if not self.mip_ctrls.Shown:
                 self.mip_ctrls.Show()
                 self.GetSizer().Add(self.mip_ctrls, 0, wx.EXPAND|wx.GROW|wx.ALL, 2)
@@ -1797,9 +1781,8 @@ class Viewer(wx.Panel):
             self.GetSizer().Detach(self.mip_ctrls)
             self.Layout()
  
-    def OnSetOverwriteMask(self, pubsub_evt):
-        value = pubsub_evt.data
-        self.overwrite_mask = value
+    def OnSetOverwriteMask(self, flag):
+        self.overwrite_mask = flag
  
     def set_slice_number(self, index):
         inverted = self.mip_ctrls.inverted.GetValue()
@@ -1831,28 +1814,27 @@ class Viewer(wx.Panel):
         self.__update_display_extent(image)
         self.cross.SetModelBounds(self.slice_data.actor.GetBounds())
  
-    def ChangeSliceNumber(self, pubsub_evt):
-        index = pubsub_evt.data
+    def ChangeSliceNumber(self, index):
         #self.set_slice_number(index)
         self.scroll.SetThumbPosition(index)
         pos = self.scroll.GetThumbPosition()
         self.set_slice_number(pos)
         self.interactor.Render()
  
-    def ReloadActualSlice(self, pubsub_evt=None):
+    def ReloadActualSlice(self):
         pos = self.scroll.GetThumbPosition()
         self.set_slice_number(pos)
         self.interactor.Render()
  
-    def OnUpdateScroll(self, pubsub_evt):
+    def OnUpdateScroll(self):
         max_slice_number = sl.Slice().GetNumberOfSlices(self.orientation)
         self.scroll.SetScrollbar(wx.SB_VERTICAL, 1, max_slice_number,
                                  max_slice_number)
  
-    def OnSwapVolumeAxes(self, pubsub_evt):
+    def OnSwapVolumeAxes(self, axes):
         # Adjusting cursor spacing to match the spacing from the actual slice
         # orientation
-        axis0, axis1 = pubsub_evt.data
+        axis0, axis1 = axes
         cursor = self.slice_data.cursor
         spacing = cursor.spacing
         if (axis0, axis1) == (2, 1):
@@ -1864,34 +1846,32 @@ class Viewer(wx.Panel):
  
         self.slice_data.renderer.ResetCamera()
  
-    def AddActors(self, pubsub_evt):
+    def AddActors(self, actors, slice_number):
         "Inserting actors"
-        actors, n = pubsub_evt.data
         pos = self.scroll.GetThumbPosition()
         #try:
-            #renderer = self.renderers_by_slice_number[n]
+            #renderer = self.renderers_by_slice_number[slice_number]
             #for actor in actors:
                 #renderer.AddActor(actor)
         #except KeyError:
             #pass
-        if pos == n:
+        if pos == slice_number:
             for actor in actors:
                 self.slice_data.renderer.AddActor(actor)
  
-        self.actors_by_slice_number[n].extend(actors)
+        self.actors_by_slice_number[slice_number].extend(actors)
  
-    def RemoveActors(self, pubsub_evt):
+    def RemoveActors(self, actors, slice_number):
         "Remove a list of actors"
-        actors, n = pubsub_evt.data
         try:
-            renderer = self.renderers_by_slice_number[n]
+            renderer = self.renderers_by_slice_number[slice_number]
         except KeyError:
             for actor in actors:
-                self.actors_by_slice_number[n].remove(actor)
+                self.actors_by_slice_number[slice_number].remove(actor)
                 self.slice_data.renderer.RemoveActor(actor)
         else:
             for actor in actors:
                 # Remove the actor from the renderer
                 renderer.RemoveActor(actor)
                 # and remove the actor from the actor's list
-                self.actors_by_slice_number[n].remove(actor)
+                self.actors_by_slice_number[slice_number].remove(actor)
@@ -264,8 +264,7 @@ class Viewer(wx.Panel):
         Publisher.subscribe(self.OnUpdateAngleThreshold, 'Update angle threshold')
         Publisher.subscribe(self.OnUpdateDistThreshold, 'Update dist threshold')
  
-    def SetStereoMode(self, pubsub_evt):
-        mode = pubsub_evt.data
+    def SetStereoMode(self, mode):
         ren_win = self.interactor.GetRenderWindow()
  
         if mode == const.STEREO_OFF:
@@ -293,23 +292,19 @@ class Viewer(wx.Panel):
  
         self.interactor.Render()
  
-    def _check_ball_reference(self, pubsub_evt):
-        st = pubsub_evt.data
-        if st == const.SLICE_STATE_CROSS:
+    def _check_ball_reference(self, style):
+        if style == const.SLICE_STATE_CROSS:
             self._mode_cross = True
             self._check_and_set_ball_visibility()
             self.interactor.Render()
  
-    def _uncheck_ball_reference(self, pubsub_evt):
-        st = pubsub_evt.data
-        if st == const.SLICE_STATE_CROSS:
+    def _uncheck_ball_reference(self, style):
+        if style == const.SLICE_STATE_CROSS:
             self._mode_cross = False
             self.RemoveBallReference()
             self.interactor.Render()
  
-    def OnSensors(self, pubsub_evt):
-        probe_id = pubsub_evt.data[0]
-        ref_id = pubsub_evt.data[1]
+    def OnSensors(self, probe_id, ref_id):
         if not self.sen1:
             self.CreateSensorID()
  
@@ -345,39 +340,36 @@ class Viewer(wx.Panel):
  
         self.interactor.Render()
  
-    def OnRemoveSensorsID(self, pubsub_evt):
+    def OnRemoveSensorsID(self):
         if self.sen1:
             self.ren.RemoveActor(self.sen1.actor)
             self.ren.RemoveActor(self.sen2.actor)
             self.sen1 = self.sen2 = False
             self.interactor.Render()
  
-    def OnShowSurface(self, pubsub_evt):
-        index, value = pubsub_evt.data
-        if value:
+    def OnShowSurface(self, index, visibility):
+        if visibility:
             self._to_show_ball += 1
         else:
             self._to_show_ball -= 1
         self._check_and_set_ball_visibility()
  
-    def OnStartSeed(self, pubsub_evt):
-        index = pubsub_evt.data
+    def OnStartSeed(self):
         self.seed_points = []
  
-    def OnEndSeed(self, pubsub_evt):
+    def OnEndSeed(self):
         Publisher.sendMessage("Create surface from seeds",
-                                    self.seed_points)
+                              seeds=self.seed_points)
  
-    def OnExportPicture(self, pubsub_evt):
-        id, filename, filetype = pubsub_evt.data
-        if id == const.VOLUME:
+    def OnExportPicture(self, orientation, filename, filetype):
+        if orientation == const.VOLUME:
             Publisher.sendMessage('Begin busy cursor')
             if _has_win32api:
                 utils.touch(filename)
                 win_filename = win32api.GetShortPathName(filename)
-                self._export_picture(id, win_filename, filetype)
+                self._export_picture(orientation, win_filename, filetype)
             else:
-                self._export_picture(id, filename, filetype)
+                self._export_picture(orientation, filename, filetype)
             Publisher.sendMessage('End busy cursor')
  
     def _export_picture(self, id, filename, filetype):
@@ -419,7 +411,7 @@ class Viewer(wx.Panel):
                 wx.MessageBox(_("InVesalius was not able to export this picture"), _("Export picture error"))
  
  
-    def OnCloseProject(self, pubsub_evt):
+    def OnCloseProject(self):
         if self.raycasting_volume:
             self.raycasting_volume = False
  
@@ -436,22 +428,21 @@ class Viewer(wx.Panel):
         self.SetInteractorStyle(const.STATE_DEFAULT)
         self._last_state = const.STATE_DEFAULT
  
-    def OnHideText(self, pubsub_evt):
+    def OnHideText(self):
         self.text.Hide()
         self.interactor.Render()
  
-    def OnShowText(self, pubsub_evt):
+    def OnShowText(self):
         if self.on_wl:
             self.text.Show()
             self.interactor.Render()
  
-    def AddActors(self, pubsub_evt):
+    def AddActors(self, actors):
         "Inserting actors"
-        actors = pubsub_evt.data[0]
         for actor in actors:
             self.ren.AddActor(actor)
  
-    def RemoveVolume(self, pub_evt):
+    def RemoveVolume(self):
         volumes = self.ren.GetVolumes()
         if (volumes.GetNumberOfItems()):
             self.ren.RemoveVolume(volumes.GetLastProp())
@@ -459,9 +450,8 @@ class Viewer(wx.Panel):
             self._to_show_ball -= 1
             self._check_and_set_ball_visibility()
  
-    def RemoveActors(self, pubsub_evt):
+    def RemoveActors(self, actors):
         "Remove a list of actors"
-        actors = pubsub_evt.data[0]
         for actor in actors:
             self.ren.RemoveActor(actor)
  
@@ -501,25 +491,22 @@ class Viewer(wx.Panel):
         actor = self.points_reference.pop(point)
         self.ren.RemoveActor(actor)
  
-    def AddMarker(self, pubsub_evt):
+    def AddMarker(self, ball_id, size, colour, coord):
         """
         Markers created by navigation tools and rendered in volume viewer.
         """
-        self.ball_id = pubsub_evt.data[0]
-        ballsize = pubsub_evt.data[1]
-        ballcolour = pubsub_evt.data[2][:3]
-        coord = pubsub_evt.data[3]
+        self.ball_id = ball_id
         x, y, z = bases.flip_x(coord)
  
         ball_ref = vtk.vtkSphereSource()
-        ball_ref.SetRadius(ballsize)
+        ball_ref.SetRadius(size)
         ball_ref.SetCenter(x, y, z)
  
         mapper = vtk.vtkPolyDataMapper()
         mapper.SetInputConnection(ball_ref.GetOutputPort())
  
         prop = vtk.vtkProperty()
-        prop.SetColor(ballcolour)
+        prop.SetColor(colour)
  
         #adding a new actor for the present ball
         self.staticballs.append(vtk.vtkActor())
@@ -532,38 +519,37 @@ class Viewer(wx.Panel):
         #self.UpdateRender()
         self.Refresh()
  
-    def HideAllMarkers(self, pubsub_evt):
-        ballid = pubsub_evt.data
+    def HideAllMarkers(self, indexes):
+        ballid = indexes
         for i in range(0, ballid):
             self.staticballs[i].SetVisibility(0)
         self.UpdateRender()
  
-    def ShowAllMarkers(self, pubsub_evt):
-        ballid = pubsub_evt.data
+    def ShowAllMarkers(self, indexes):
+        ballid = indexes
         for i in range(0, ballid):
             self.staticballs[i].SetVisibility(1)
         self.UpdateRender()
  
-    def RemoveAllMarkers(self, pubsub_evt):
-        ballid = pubsub_evt.data
+    def RemoveAllMarkers(self, indexes):
+        ballid = indexes
         for i in range(0, ballid):
             self.ren.RemoveActor(self.staticballs[i])
         self.staticballs = []
         self.UpdateRender()
  
-    def RemoveMarker(self, pubsub_evt):
-        index = pubsub_evt.data
+    def RemoveMarker(self, index):
         for i in reversed(index):
             self.ren.RemoveActor(self.staticballs[i])
             del self.staticballs[i]
             self.ball_id = self.ball_id - 1
         self.UpdateRender()
  
-    def BlinkMarker(self, pubsub_evt):
+    def BlinkMarker(self, index):
         if self.timer:
             self.timer.Stop()
             self.staticballs[self.index].SetVisibility(1)
-        self.index = pubsub_evt.data
+        self.index = index
         self.timer = wx.Timer(self)
         self.Bind(wx.EVT_TIMER, self.OnBlinkMarker, self.timer)
         self.timer.Start(500)
@@ -574,31 +560,29 @@ class Viewer(wx.Panel):
         self.Refresh()
         self.timer_count += 1
  
-    def StopBlinkMarker(self, pubsub_evt):
+    def StopBlinkMarker(self, index=None):
         if self.timer:
             self.timer.Stop()
-            if pubsub_evt.data is None:
+            if index is None:
                 self.staticballs[self.index].SetVisibility(1)
                 self.Refresh()
             self.index = False
  
-    def OnTargetMarkerTransparency(self, pubsub_evt):
-        status = pubsub_evt.data[0]
-        index = pubsub_evt.data[1]
+    def OnTargetMarkerTransparency(self, status, index):
         if status:
             self.staticballs[index].GetProperty().SetOpacity(1)
             # self.staticballs[index].GetProperty().SetOpacity(0.4)
         else:
             self.staticballs[index].GetProperty().SetOpacity(1)
  
-    def OnUpdateAngleThreshold(self, pubsub_evt):
-        self.anglethreshold = pubsub_evt.data
+    def OnUpdateAngleThreshold(self, angle):
+        self.anglethreshold = angle
  
-    def OnUpdateDistThreshold(self, pubsub_evt):
-        self.distthreshold = pubsub_evt.data
+    def OnUpdateDistThreshold(self, dist_threshold):
+        self.distthreshold = dist_threshold
  
-    def ActivateTargetMode(self, pubsub_evt):
-        self.target_mode = pubsub_evt.data
+    def ActivateTargetMode(self, evt=None, target_mode=None):
+        self.target_mode = target_mode
         if self.target_coord and self.target_mode:
             self.CreateTargetAim()
  
@@ -691,8 +675,7 @@ class Viewer(wx.Panel):
         else:
             self.DisableCoilTracker()
  
-    def OnUpdateObjectTargetGuide(self, pubsub_evt):
-        coord = pubsub_evt.data[1]
+    def OnUpdateObjectTargetGuide(self, m_img, coord):
         if self.target_coord and self.target_mode:
  
             target_dist = distance.euclidean(coord[0:3],
@@ -811,13 +794,12 @@ class Viewer(wx.Panel):
  
             self.Refresh()
  
-    def OnUpdateTargetCoordinates(self, pubsub_evt):
-        self.target_coord = pubsub_evt.data[0:6]
+    def OnUpdateTargetCoordinates(self, coord):
+        self.target_coord = coord
         self.target_coord[1] = -self.target_coord[1]
         self.CreateTargetAim()
  
-    def OnRemoveTarget(self, pubsub_evt):
-        status = pubsub_evt.data
+    def OnRemoveTarget(self, status):
         if not status:
             self.target_mode = None
             self.target_coord = None
@@ -1108,12 +1090,12 @@ class Viewer(wx.Panel):
             self.ren.RemoveActor(self.ball_actor)
             self.ball_actor = None
  
-    def SetBallReferencePosition(self, pubsub_evt):
+    def SetBallReferencePosition(self, position):
         if self._to_show_ball:
             if not self.ball_actor:
                 self.ActivateBallReference()
  
-            coord = pubsub_evt.data
+            coord = position
             x, y, z = bases.flip_x(coord)
             self.ball_actor.SetPosition(x, y, z)
  
@@ -1198,18 +1180,15 @@ class Viewer(wx.Panel):
  
         # self.ren.AddActor(self.obj_axes)
  
-    def OnNavigationStatus(self, pubsub_evt):
-        self.nav_status = pubsub_evt.data
+    def OnNavigationStatus(self, status):
+        self.nav_status = status
         self.pTarget = self.CenterOfMass()
         if self.obj_actor and self.nav_status:
             self.obj_actor.SetVisibility(self.obj_state)
             if not self.obj_state:
                 self.Refresh()
  
-    def UpdateObjectOrientation(self, pubsub_evt):
-
-        m_img = pubsub_evt.data[0]
-
+    def UpdateObjectOrientation(self, m_img, coord):
         m_img[:3, -1] = np.asmatrix(bases.flip_x_m((m_img[0, -1], m_img[1, -1], m_img[2, -1]))).reshape([3, 1])
  
         m_img_vtk = vtk.vtkMatrix4x4()
@@ -1223,22 +1202,19 @@ class Viewer(wx.Panel):
  
         self.Refresh()
  
-    def UpdateTrackObjectState(self, pubsub_evt):
-        if pubsub_evt.data[0]:
-            self.obj_name = pubsub_evt.data[1]
-
+    def UpdateTrackObjectState(self, evt=None, flag=None, obj_name=None):
+        if flag:
+            self.obj_name = obj_name
             if not self.obj_actor:
                 self.AddObjectActor(self.obj_name)
-
         else:
             if self.obj_actor:
                 self.ren.RemoveActor(self.obj_actor)
                 self.obj_actor = None
-
         self.Refresh()
  
-    def UpdateShowObjectState(self, pubsub_evt):
-        self.obj_state = pubsub_evt.data
+    def UpdateShowObjectState(self, state):
+        self.obj_state = state
         if self.obj_actor and not self.obj_state:
             self.obj_actor.SetVisibility(self.obj_state)
             self.Refresh()
@@ -1371,8 +1347,8 @@ class Viewer(wx.Panel):
             diff_y = mouse_y - self.last_y
             self.last_x, self.last_y = mouse_x, mouse_y
             Publisher.sendMessage('Set raycasting relative window and level',
-                (diff_x, diff_y))
-            Publisher.sendMessage('Refresh raycasting widget points', None)
+                                  diff_wl=diff_x, diff_ww=diff_y)
+            Publisher.sendMessage('Refresh raycasting widget points')
             self.interactor.Render()
  
     def OnWindowLevelClick(self, obj, evt):
@@ -1387,31 +1363,29 @@ class Viewer(wx.Panel):
         if const.RAYCASTING_WWWL_BLUR:
             self.style.EndZoom()
  
-    def OnEnableStyle(self, pubsub_evt):
-        state = pubsub_evt.data
-        if (state in const.VOLUME_STYLES):
-            new_state = self.interaction_style.AddState(state)
+    def OnEnableStyle(self, style):
+        if (style in const.VOLUME_STYLES):
+            new_state = self.interaction_style.AddState(style)
             self.SetInteractorStyle(new_state)
         else:
-            new_state = self.interaction_style.RemoveState(state)
+            new_state = self.interaction_style.RemoveState(style)
             self.SetInteractorStyle(new_state)
  
-    def OnDisableStyle(self, pubsub_evt):
-        state = pubsub_evt.data
-        new_state = self.interaction_style.RemoveState(state)
+    def OnDisableStyle(self, style):
+        new_state = self.interaction_style.RemoveState(style)
         self.SetInteractorStyle(new_state)
  
-    def ResetCamClippingRange(self, pubsub_evt):
+    def ResetCamClippingRange(self):
         self.ren.ResetCamera()
         self.ren.ResetCameraClippingRange()
  
-    def SetVolumeCameraState(self, pubsub_evt):
-        self.camera_state = pubsub_evt.data
+    def SetVolumeCameraState(self, camera_state):
+        self.camera_state = camera_state
  
-    def SetVolumeCamera(self, pubsub_evt):
+    def SetVolumeCamera(self, arg, position):
         if self.camera_state:
             # TODO: exclude dependency on initial focus
-            cam_focus = np.array(bases.flip_x(pubsub_evt.data[1][:3]))
+            cam_focus = np.array(bases.flip_x(position[:3]))
             cam = self.ren.GetActiveCamera()
  
             if self.initial_focus is None:
@@ -1442,8 +1416,7 @@ class Viewer(wx.Panel):
         #self.interactor.Render()
         self.Refresh()
  
-    def OnExportSurface(self, pubsub_evt):
-        filename, filetype = pubsub_evt.data
+    def OnExportSurface(self, filename, filetype):
         if filetype not in (const.FILETYPE_STL,
                             const.FILETYPE_VTP,
                             const.FILETYPE_PLY,
@@ -1487,23 +1460,22 @@ class Viewer(wx.Panel):
             writer.SetInput(renwin)
             writer.Write()
  
-    def OnEnableBrightContrast(self, pubsub_evt):
+    def OnEnableBrightContrast(self):
         style = self.style
         style.AddObserver("MouseMoveEvent", self.OnMove)
         style.AddObserver("LeftButtonPressEvent", self.OnClick)
         style.AddObserver("LeftButtonReleaseEvent", self.OnRelease)
  
-    def OnDisableBrightContrast(self, pubsub_evt):
+    def OnDisableBrightContrast(self):
         style = vtk.vtkInteractorStyleTrackballCamera()
         self.interactor.SetInteractorStyle(style)
         self.style = style
  
-    def OnSetWindowLevelText(self, pubsub_evt):
+    def OnSetWindowLevelText(self, ww, wl):
         if self.raycasting_volume:
-            ww, wl = pubsub_evt.data
             self.text.SetValue("WL: %d  WW: %d"%(wl, ww))
  
-    def OnShowRaycasting(self, pubsub_evt):
+    def OnShowRaycasting(self):
         if not self.raycasting_volume:
             self.raycasting_volume = True
             self._to_show_ball += 1
@@ -1511,7 +1483,7 @@ class Viewer(wx.Panel):
             if self.on_wl:
                 self.text.Show()
  
-    def OnHideRaycasting(self, pubsub_evt):
+    def OnHideRaycasting(self):
         self.raycasting_volume = False
         self.text.Hide()
         self._to_show_ball -= 1
@@ -1524,13 +1496,11 @@ class Viewer(wx.Panel):
         self.interactor.Update()
         evt.Skip()
  
-    def ChangeBackgroundColour(self, pubsub_evt):
-        colour = pubsub_evt.data
+    def ChangeBackgroundColour(self, colour):
         self.ren.SetBackground(colour[:3])
         self.UpdateRender()
  
-    def LoadActor(self, pubsub_evt):
-        actor = pubsub_evt.data
+    def LoadActor(self, actor):
         self.added_actor = 1
         ren = self.ren
         ren.AddActor(actor)
@@ -1547,31 +1517,26 @@ class Viewer(wx.Panel):
         self._to_show_ball += 1
         self._check_and_set_ball_visibility()
  
-    def RemoveActor(self, pubsub_evt):
+    def RemoveActor(self, actor):
         utils.debug("RemoveActor")
-        actor = pubsub_evt.data
         ren = self.ren
         ren.RemoveActor(actor)
         self.interactor.Render()
         self._to_show_ball -= 1
         self._check_and_set_ball_visibility()
  
-    def RemoveAllActor(self, pubsub_evt):
+    def RemoveAllActor(self):
         utils.debug("RemoveAllActor")
         self.ren.RemoveAllProps()
         Publisher.sendMessage('Render volume viewer')
  
-    def LoadSlicePlane(self, pubsub_evt):
+    def LoadSlicePlane(self):
         self.slice_plane = SlicePlane()
  
-    def LoadVolume(self, pubsub_evt):
+    def LoadVolume(self, volume, colour, ww, wl):
         self.raycasting_volume = True
         self._to_show_ball += 1
  
-        volume = pubsub_evt.data[0]
-        colour = pubsub_evt.data[1]
-        ww, wl = pubsub_evt.data[2]
-
         self.light = self.ren.GetLights().GetNextItem()
  
         self.ren.AddVolume(volume)
@@ -1593,16 +1558,14 @@ class Viewer(wx.Panel):
         self._check_and_set_ball_visibility()
         self.UpdateRender()
  
-    def UnloadVolume(self, pubsub_evt):
-        volume = pubsub_evt.data
+    def UnloadVolume(self, volume):
         self.ren.RemoveVolume(volume)
         del volume
         self.raycasting_volume = False
         self._to_show_ball -= 1
         self._check_and_set_ball_visibility()
  
-    def OnSetViewAngle(self, evt_pubsub):
-        view = evt_pubsub.data
+    def OnSetViewAngle(self, view):
         self.SetViewAngle(view)
  
     def SetViewAngle(self, view):
@@ -1657,14 +1620,14 @@ class Viewer(wx.Panel):
         orientation_widget.On()
         orientation_widget.InteractiveOff()
  
-    def UpdateRender(self, evt_pubsub=None):
+    def UpdateRender(self):
         self.interactor.Render()
  
-    def SetWidgetInteractor(self, evt_pubsub=None):
-        evt_pubsub.data.SetInteractor(self.interactor._Iren)
+    def SetWidgetInteractor(self, widget=None):
+        widget.SetInteractor(self.interactor._Iren)
  
-    def AppendActor(self, evt_pubsub=None):
-        self.ren.AddActor(evt_pubsub.data)
+    def AppendActor(self, actor):
+        self.ren.AddActor(actor)
  
     def OnInsertSeed(self, obj, evt):
         x,y = self.interactor.GetEventPosition()
@@ -1693,7 +1656,10 @@ class Viewer(wx.Panel):
                     # Publisher.sendMessage("Add measure to list",
                             # (u"3D", _(u"%.3f mm" % m.GetValue())))
             Publisher.sendMessage("Add measurement point",
-                    ((x, y,z), const.LINEAR, const.SURFACE, radius))
+                                  position=(x, y,z),
+                                  type=const.LINEAR,
+                                  location=const.SURFACE,
+                                  radius=radius)
             self.interactor.Render()
  
     def OnInsertAngularMeasurePoint(self, obj, evt):
@@ -1724,21 +1690,23 @@ class Viewer(wx.Panel):
                                                 # type_, location,
                                                 # value))
             Publisher.sendMessage("Add measurement point",
-                    ((x, y,z), const.ANGULAR, const.SURFACE, radius))
+                                  position=(x, y,z),
+                                  type=const.ANGULAR,
+                                  location=const.SURFACE,
+                                  radius=radius)
             self.interactor.Render()
  
-    def Reposition3DPlane(self, evt_pubsub):
-        position = evt_pubsub.data
+    def Reposition3DPlane(self, plane_label):
         if not(self.added_actor) and not(self.raycasting_volume):
-            if not(self.repositioned_axial_plan) and (position == 'Axial'):
+            if not(self.repositioned_axial_plan) and (plane_label == 'Axial'):
                 self.SetViewAngle(const.VOL_ISO)
                 self.repositioned_axial_plan = 1
  
-            elif not(self.repositioned_sagital_plan) and (position == 'Sagital'):
+            elif not(self.repositioned_sagital_plan) and (plane_label == 'Sagital'):
                 self.SetViewAngle(const.VOL_ISO)
                 self.repositioned_sagital_plan = 1
  
-            elif not(self.repositioned_coronal_plan) and (position == 'Coronal'):
+            elif not(self.repositioned_coronal_plan) and (plane_label == 'Coronal'):
                 self.SetViewAngle(const.VOL_ISO)
                 self.repositioned_coronal_plan = 1
  
@@ -1825,39 +1793,36 @@ class SlicePlane:
         selected_prop2 = plane_y.GetSelectedPlaneProperty()           
         selected_prop2.SetColor(0, 1, 0)
  
-        Publisher.sendMessage('Set Widget Interactor', plane_x)
-        Publisher.sendMessage('Set Widget Interactor', plane_y)
-        Publisher.sendMessage('Set Widget Interactor', plane_z)
+        Publisher.sendMessage('Set Widget Interactor', widget=plane_x)
+        Publisher.sendMessage('Set Widget Interactor', widget=plane_y)
+        Publisher.sendMessage('Set Widget Interactor', widget=plane_z)
  
         self.Render()
  
-    def Enable(self, evt_pubsub=None):
-        if (evt_pubsub):
-            label = evt_pubsub.data
-            if(label == "Axial"):
+    def Enable(self, plane_label=None):
+        if plane_label:
+            if(plane_label == "Axial"):
                 self.plane_z.On()
-            elif(label == "Coronal"):
+            elif(plane_label == "Coronal"):
                 self.plane_y.On()
-            elif(label == "Sagital"):
+            elif(plane_label == "Sagital"):
                 self.plane_x.On()
-        
-            Publisher.sendMessage('Reposition 3D Plane', label)
-
+            Publisher.sendMessage('Reposition 3D Plane', plane_label=plane_label)
         else:
             self.plane_z.On()
             self.plane_x.On()
             self.plane_y.On()
-            Publisher.sendMessage('Set volume view angle', const.VOL_ISO)
+            Publisher.sendMessage('Set volume view angle',
+                                  view=const.VOL_ISO)
         self.Render()
  
-    def Disable(self, evt_pubsub=None):
-        if (evt_pubsub):
-            label = evt_pubsub.data
-            if(label == "Axial"):
+    def Disable(self, plane_label=None):
+        if plane_label:
+            if(plane_label == "Axial"):
                 self.plane_z.Off()
-            elif(label == "Coronal"):
+            elif(plane_label == "Coronal"):
                 self.plane_y.Off()
-            elif(label == "Sagital"):
+            elif(plane_label == "Sagital"):
                 self.plane_x.Off()
         else:
             self.plane_z.Off()
@@ -1869,23 +1834,33 @@ class SlicePlane:
     def Render(self):
         Publisher.sendMessage('Render volume viewer')    
  
-    def ChangeSlice(self, pubsub_evt = None):
-        orientation, number = pubsub_evt.data
-
+    def ChangeSlice(self, orientation, index):
         if  orientation == "CORONAL" and self.plane_y.GetEnabled():
-            Publisher.sendMessage('Update slice 3D', (self.plane_y,orientation))
+            Publisher.sendMessage('Update slice 3D',
+                                  widget=self.plane_y,
+                                  orientation=orientation)
             self.Render()
         elif orientation == "SAGITAL" and self.plane_x.GetEnabled():
-            Publisher.sendMessage('Update slice 3D', (self.plane_x,orientation))
+            Publisher.sendMessage('Update slice 3D', 
+                                  widget=self.plane_x,
+                                  orientation=orientation)
             self.Render()
         elif orientation == 'AXIAL' and self.plane_z.GetEnabled() :
-            Publisher.sendMessage('Update slice 3D', (self.plane_z,orientation))
+            Publisher.sendMessage('Update slice 3D',
+                                  widget=self.plane_z,
+                                  orientation=orientation)
             self.Render()
  
-    def UpdateAllSlice(self, pubsub_evt):
-        Publisher.sendMessage('Update slice 3D', (self.plane_y,"CORONAL"))
-        Publisher.sendMessage('Update slice 3D', (self.plane_x,"SAGITAL"))
-        Publisher.sendMessage('Update slice 3D', (self.plane_z,"AXIAL"))
+    def UpdateAllSlice(self):
+        Publisher.sendMessage('Update slice 3D',
+                              widget=self.plane_y,
+                              orientation="CORONAL")
+        Publisher.sendMessage('Update slice 3D',
+                              widget=self.plane_x,
+                              orientation="SAGITAL")
+        Publisher.sendMessage('Update slice 3D',
+                              widget=self.plane_z,
+                              orientation="AXIAL")
  
  
     def DeletePlanes(self):
@@ -110,17 +110,17 @@ class Volume():
         Publisher.subscribe(self.ChangeBackgroundColour,
                         'Change volume viewer background colour')
  
-        Publisher.subscribe(self.ResetRayCasting, 'Reset Reaycasting')
+        Publisher.subscribe(self.ResetRayCasting, 'Reset Raycasting')
  
         Publisher.subscribe(self.OnFlipVolume, 'Flip volume')
  
-    def ResetRayCasting(self, pub_evt):
+    def ResetRayCasting(self):
         if self.exist:
             self.exist = None
             self.LoadVolume()
  
  
-    def OnCloseProject(self, pubsub_evt):
+    def OnCloseProject(self):
         self.CloseProject()
  
     def CloseProject(self):
@@ -134,9 +134,9 @@ class Volume():
  
         if self.exist:
             self.exist = None
-            Publisher.sendMessage('Remove surface actor from viewer', self.volume)
+            Publisher.sendMessage('Remove surface actor from viewer', actor=self.volume)
             Publisher.sendMessage('Disable volume cut menu')
-            Publisher.sendMessage('Unload volume', self.volume)
+            Publisher.sendMessage('Unload volume', volume=self.volume)
  
             del self.image
             del self.imagedata
@@ -155,19 +155,19 @@ class Volume():
             self.color_transfer = None
             Publisher.sendMessage('Render volume viewer')
  
-    def OnLoadVolume(self, pubsub_evt):
-        label = pubsub_evt.data
+    def OnLoadVolume(self, label):
+        label = label
         #self.LoadConfig(label)
         self.LoadVolume()
  
-    def OnHideVolume(self, pubsub_evt):
+    def OnHideVolume(self):
         print('Hide Volume')
         self.volume.SetVisibility(0)
         if (self.plane and self.plane_on):
             self.plane.Disable()
         Publisher.sendMessage('Render volume viewer')
  
-    def OnShowVolume(self, pubsub_evt = None):
+    def OnShowVolume(self):
         print('Show volume')
         if self.exist:
             print('Volume exists')
@@ -177,18 +177,19 @@ class Volume():
             Publisher.sendMessage('Render volume viewer')
         else:
             print('Volume doesnt exit')
-            Publisher.sendMessage('Load raycasting preset', const.RAYCASTING_LABEL)
+            Publisher.sendMessage('Load raycasting preset',
+                                  preset_name=const.RAYCASTING_LABEL)
             self.LoadConfig()
             self.LoadVolume()
             self.exist = 1
  
-    def OnUpdatePreset(self, pubsub_evt):
+    def OnUpdatePreset(self):
         self.__load_preset_config()
  
         if self.config:
             if self.to_reload:
                 self.exist = False
-                Publisher.sendMessage('Unload volume', self.volume)
+                Publisher.sendMessage('Unload volume', volume=self.volume)
  
             if self.exist:
                 self.__load_preset()
@@ -200,10 +201,10 @@ class Volume():
                 self.exist = 1
  
             colour = self.GetBackgroundColour()
-            Publisher.sendMessage('Change volume viewer background colour', colour)
-            Publisher.sendMessage('Change volume viewer gui colour', colour)
+            Publisher.sendMessage('Change volume viewer background colour', colour=colour)
+            Publisher.sendMessage('Change volume viewer gui colour', colour=colour)
         else:
-            Publisher.sendMessage('Unload volume', self.volume)
+            Publisher.sendMessage('Unload volume', volume=self.volume)
             del self.image
             del self.imagedata
             del self.final_imagedata
@@ -221,7 +222,7 @@ class Volume():
             self.color_transfer = None
             Publisher.sendMessage('Render volume viewer')
  
-    def OnFlipVolume(self, pubsub_evt):
+    def OnFlipVolume(self, axis):
         print("Flipping Volume")
         self.loaded_image = False
         del self.image
@@ -252,28 +253,24 @@ class Volume():
         self.SetShading()
         self.SetTypeRaycasting()
  
-    def OnSetCurve(self, pubsub_evt):
-        self.curve = pubsub_evt.data
+    def OnSetCurve(self, curve):
+        self.curve = curve
         self.CalculateWWWL()
         ww = self.ww
         wl = self.wl
-        Publisher.sendMessage('Set volume window and level text',
-                                   (ww, wl))
+        Publisher.sendMessage('Set volume window and level text', ww=ww, wl=wl)
  
-    def OnSetRelativeWindowLevel(self, pubsub_evt):
-        diff_wl, diff_ww = pubsub_evt.data
+    def OnSetRelativeWindowLevel(self, diff_wl, diff_ww):
         ww = self.ww + diff_ww
         wl = self.wl + diff_wl
-        Publisher.sendMessage('Set volume window and level text',
-                                   (ww, wl))
+        Publisher.sendMessage('Set volume window and level text', ww=ww, wl=wl)
         self.SetWWWL(ww, wl)
         self.ww = ww
         self.wl = wl
  
-    def OnSetWindowLevel(self, pubsub_evt):
-        ww, wl, n = pubsub_evt.data
-        self.curve = n
-        self.SetWWWL(ww,wl)
+    def OnSetWindowLevel(self, ww, wl, curve):
+        self.curve = curve
+        self.SetWWWL(ww, wl)
  
     def SetWWWL(self, ww, wl):
         if self.config['advancedCLUT']:
@@ -321,7 +318,7 @@ class Volume():
         self.ww = last_point - first_point
         self.wl = first_point + self.ww / 2.0
  
-    def Refresh(self, pubsub_evt):
+    def Refresh(self):
         self.__update_colour_table()
  
     def Create16bColorTable(self, scale):
@@ -445,11 +442,11 @@ class Volume():
                             self.config['backgroundColorBlueComponent'])
         return colour
  
-    def ChangeBackgroundColour(self, pubsub_evt):
+    def ChangeBackgroundColour(self, colour):
         if (self.config):
-            self.config['backgroundColorRedComponent'] = pubsub_evt.data[0] * 255
-            self.config['backgroundColorGreenComponent'] = pubsub_evt.data[1] * 255
-            self.config['backgroundColorBlueComponent'] = pubsub_evt.data[2] * 255
+            self.config['backgroundColorRedComponent'] = colour[0] * 255
+            self.config['backgroundColorGreenComponent'] = colour[1] * 255
+            self.config['backgroundColorBlueComponent'] = colour[2] * 255
  
     def BuildTable():
         curve_table = p['16bitClutCurves']
@@ -663,16 +660,16 @@ class Volume():
             self.plane.SetVolumeMapper(volume_mapper)
  
         Publisher.sendMessage('Load volume into viewer',
-                                    (volume, colour, (self.ww, self.wl)))
+                              volume=volume, colour=colour,
+                              ww=self.ww, wl=self.wl)
  
         del flip
         del cast
  
-    def OnEnableTool(self, pubsub_evt):
-        tool_name, enable = pubsub_evt.data
+    def OnEnableTool(self, tool_name, flag):
         if tool_name == _("Cut plane"):
             if self.plane:
-                if enable:
+                if flag:
                     self.plane_on = True
                     self.plane.Enable()
                 else:
@@ -695,8 +692,10 @@ class Volume():
         accumulate.Update()
         n_image = numpy_support.vtk_to_numpy(accumulate.GetOutput().GetPointData().GetScalars())
         del accumulate
-        Publisher.sendMessage('Load histogram', (n_image,
-                                                     image.GetScalarRange()))
+        init, end = image.GetScalarRange()
+        Publisher.sendMessage('Load histogram', histogram=n_image, init=init, end=end)
+
+                              
  
     def TranslateScale(self, scale, value):
         #if value < 0:
@@ -747,8 +746,8 @@ class CutPlane:
         plane_actor.GetProperty().BackfaceCullingOn()
         plane_actor.GetProperty().SetOpacity(0)
         plane_widget.AddObserver("InteractionEvent", self.Update)
-        Publisher.sendMessage('AppendActor', self.plane_actor)
-        Publisher.sendMessage('Set Widget Interactor', self.plane_widget)
+        Publisher.sendMessage('AppendActor', actor=self.plane_actor)
+        Publisher.sendMessage('Set Widget Interactor', widget=self.plane_widget)
         plane_actor.SetVisibility(1)
         plane_widget.On() 
         self.plane = plane = vtk.vtkPlane()
@@ -775,21 +774,21 @@ class CutPlane:
         self.plane_actor.VisibilityOn()
         self.plane.SetNormal(plane_source.GetNormal())
         self.plane.SetOrigin(plane_source.GetOrigin())
-        Publisher.sendMessage('Render volume viewer', None)
+        Publisher.sendMessage('Render volume viewer')
  
-    def Enable(self, evt_pubsub=None):
+    def Enable(self):
         self.plane_widget.On()
         self.plane_actor.VisibilityOn()
         self.volume_mapper.AddClippingPlane(self.plane)
-        Publisher.sendMessage('Render volume viewer', None)
+        Publisher.sendMessage('Render volume viewer')
  
-    def Disable(self,evt_pubsub=None):
+    def Disable(self):
         self.plane_widget.Off() 
         self.plane_actor.VisibilityOff()
         self.volume_mapper.RemoveClippingPlane(self.plane)
-        Publisher.sendMessage('Render volume viewer', None)
+        Publisher.sendMessage('Render volume viewer')
  
-    def Reset(self, evt_pubsub=None):
+    def Reset(self):
         plane_source = self.plane_source
         plane_widget = self.plane_widget
         plane_source.SetOrigin(self.origin)
@@ -799,10 +798,10 @@ class CutPlane:
         self.plane_actor.VisibilityOn() 
         self.plane.SetNormal(self.normal)
         self.plane.SetOrigin(self.origin)
-        Publisher.sendMessage('Render volume viewer', None)  
+        Publisher.sendMessage('Render volume viewer')  
  
     def DestroyObjs(self):
-        Publisher.sendMessage('Remove surface actor from viewer', self.plane_actor)
+        Publisher.sendMessage('Remove surface actor from viewer', actor=self.plane_actor)
         self.Disable()
         del self.plane_widget   
         del self.plane_source
@@ -81,8 +81,7 @@ def ShowProgress(number_of_filters = 1,
         progress[0] = progress[0] + ratio*difference
         # Tell GUI to update progress status value
         if (dialog_type == "GaugeProgress"):
-            Publisher.sendMessage('Update status in GUI',
-                                        (progress[0], label))
+            Publisher.sendMessage('Update status in GUI', value=progress[0], label=label)
         else:
             if (progress[0] >= 99.999):
                 progress[0] = 100
@@ -249,7 +249,7 @@ class Preview(wx.Panel):
         my_evt.SetEventObject(self)
         self.GetEventHandler().ProcessEvent(my_evt)
  
-        Publisher.sendMessage('Set bitmap in preview panel', self.bitmap_info.pos)
+        Publisher.sendMessage('Set bitmap in preview panel', pos=self.bitmap_info.pos)
  
         evt.Skip()
  
@@ -369,15 +369,14 @@ class BitmapPreviewSeries(wx.Panel):
         self._display_previews()
  
  
-    def RemovePanel(self, pub_sub):
-        data = pub_sub.data
+    def RemovePanel(self, data):
         for p, f in zip(self.previews, self.files):
             if p.bitmap_info != None:
                 if data.encode('utf-8') in p.bitmap_info.data:
                     self.files.remove(f)
                     p.Hide()
                     self._display_previews()
-                    Publisher.sendMessage('Update max of slidebar in single preview image', len(self.files))
+                    Publisher.sendMessage('Update max of slidebar in single preview image', max_value=len(self.files))
  
                     self.Update()
                     self.Layout()
@@ -539,8 +538,7 @@ class SingleImagePreview(wx.Panel):
         Publisher.subscribe(self.UpdateMaxValueSliderBar, 'Update max of slidebar in single preview image')
         Publisher.subscribe(self.ShowBlackSlice, 'Show black slice in single preview image')
  
-    def ShowBitmapByPosition(self, evt):
-        pos = evt.data
+    def ShowBitmapByPosition(self, pos):
         if pos != None:
             self.ShowSlice(int(pos))
  
@@ -584,8 +582,8 @@ class SingleImagePreview(wx.Panel):
         self.slider.SetValue(0)
         self.ShowSlice()
  
-    def UpdateMaxValueSliderBar(self, pub_sub):
-        self.slider.SetMax(pub_sub.data - 1)
+    def UpdateMaxValueSliderBar(self, max_value):
+        self.slider.SetMax(max_value - 1)
         self.slider.Refresh()
         self.slider.Update()
  
@@ -98,20 +98,20 @@ class NotebookPanel(wx.Panel):
                                  'Fold mask page')
  
  
-    def _FoldSurface(self, pubusb_evt):
+    def _FoldSurface(self):
         """
         Fold surface notebook page.
         """
         self.book.SetSelection(1)
  
-    def _FoldMeasure(self, pubsub_evt):
+    def _FoldMeasure(self):
         """
         Fold measure notebook page.
         """
         self.book.SetSelection(2)
  
  
-    def _FoldMask(self, pubsub_evt):
+    def _FoldMask(self):
         """
         Fold mask notebook page.
         """
@@ -334,7 +334,8 @@ class ButtonControlPanel(wx.Panel):
             mask_name, thresh, colour = dialog.GetValue()
             if mask_name:
                 Publisher.sendMessage('Create new mask',
-                                            (mask_name, thresh, colour))
+                                      mask_name=mask_name,
+                                      thresh=thresh, colour=colour)
         dialog.Destroy()
  
     def OnRemove(self):
@@ -343,7 +344,7 @@ class ButtonControlPanel(wx.Panel):
     def OnDuplicate(self):
         selected_items = self.parent.listctrl.GetSelected()
         if selected_items:
-            Publisher.sendMessage('Duplicate masks', selected_items)
+            Publisher.sendMessage('Duplicate masks', mask_indexes=selected_items)
         else:
            dlg.MaskSelectionRequiredForDuplication()
  
@@ -398,7 +399,7 @@ class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
         selected_items = self.GetSelected()
  
         if selected_items:
-            Publisher.sendMessage('Remove masks', selected_items)
+            Publisher.sendMessage('Remove masks', mask_indexes=selected_items)
         else:
             dlg.MaskSelectionRequiredForRemoval()
             return
@@ -421,8 +422,8 @@ class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
         if new_dict:
             if index == self.current_index:
                 self.SetItemImage(0, 1)
-                Publisher.sendMessage('Change mask selected', 0)
-                Publisher.sendMessage('Show mask', (0, 1))
+                Publisher.sendMessage('Change mask selected', index=0)
+                Publisher.sendMessage('Show mask', index=0, value=1)
                 Publisher.sendMessage('Refresh viewer')
                 for key in new_dict:
                     if key:
@@ -433,27 +434,26 @@ class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
                 self.SetItemImage(self.current_index, 1)
  
  
-    def OnCloseProject(self, pubsub_evt):
+    def OnCloseProject(self):
         self.DeleteAllItems()
         self.mask_list_index = {}
  
-    def OnChangeCurrentMask(self, pubsub_evt):
-        mask_index = pubsub_evt.data
+    def OnChangeCurrentMask(self, index):
         try:
-            self.SetItemImage(mask_index, 1)
-            self.current_index = mask_index
+            self.SetItemImage(index, 1)
+            self.current_index = index
         except wx._core.PyAssertionError:
             #in SetItem(): invalid item index in SetItem
             pass
         for key in self.mask_list_index.keys():
-            if key != mask_index:
+            if key != index:
                 self.SetItemImage(key, 0)
  
-    def __hide_current_mask(self, pubsub_evt):
+    def __hide_current_mask(self):
         if self.mask_list_index:
             self.SetItemImage(self.current_index, 0)
  
-    def __show_current_mask(self, pubsub_evt):
+    def __show_current_mask(self):
         if self.mask_list_index:
             self.SetItemImage(self.current_index, 1)
  
@@ -488,7 +488,7 @@ class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
  
     def OnEditLabel(self, evt):
         Publisher.sendMessage('Change mask name',
-                                   (evt.GetIndex(), evt.GetLabel()))
+                              index=evt.GetIndex(), name=evt.GetLabel())
         evt.Skip()
  
     def OnItemActivated(self, evt):
@@ -499,9 +499,9 @@ class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
             for key in self.mask_list_index.keys():
                 if key != index:
                     self.SetItemImage(key, 0)
-            Publisher.sendMessage('Change mask selected',index)
+            Publisher.sendMessage('Change mask selected', index=index)
             self.current_index = index
-        Publisher.sendMessage('Show mask', (index, flag))
+        Publisher.sendMessage('Show mask', index=index, value=flag)
  
     def CreateColourBitmap(self, colour):
         """
@@ -536,19 +536,16 @@ class MasksListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
                 #  self.SetItemImage(key, 0)
         #  self.current_index = index
  
-    def AddMask(self, pubsub_evt):
-        index, mask_name, threshold_range, colour = pubsub_evt.data
-        image = self.CreateColourBitmap(colour)
+    def AddMask(self, mask):
+        image = self.CreateColourBitmap(mask.colour)
         image_index = self.imagelist.Add(image)
-        self.mask_list_index[index] = image_index
-        self.InsertNewItem(index, mask_name, str(threshold_range))
+        self.mask_list_index[mask.index] = image_index
+        self.InsertNewItem(mask.index, mask.name, str(mask.threshold_range))
  
-    def EditMaskThreshold(self, pubsub_evt):
-        index, threshold_range = pubsub_evt.data
+    def EditMaskThreshold(self, index, threshold_range):
         self.SetStringItem(index, 2, str(threshold_range))
  
-    def EditMaskColour(self, pubsub_evt):
-        index, colour = pubsub_evt.data
+    def EditMaskColour(self, index, colour):
         image = self.CreateColourBitmap(colour)
         image_index = self.mask_list_index[index]
         self.imagelist.Replace(image_index, image)
@@ -678,7 +675,8 @@ class SurfaceButtonControlPanel(wx.Panel):
         if ok:
             surface_options = dialog.GetValue()
  
-            Publisher.sendMessage('Create surface from index', surface_options)
+            Publisher.sendMessage('Create surface from index',
+                                  surface_parameters=surface_options)
         dialog.Destroy()
  
     def OnRemove(self):
@@ -688,14 +686,14 @@ class SurfaceButtonControlPanel(wx.Panel):
     def OnDuplicate(self):
         selected_items = self.parent.listctrl.GetSelected()
         if selected_items:
-            Publisher.sendMessage('Duplicate surfaces', selected_items)
+            Publisher.sendMessage('Duplicate surfaces', surface_indexes=selected_items)
         else:
            dlg.SurfaceSelectionRequiredForDuplication()
  
     def OnOpenMesh(self):
         filename = dlg.ShowImportMeshFilesDialog()
         if filename:
-            Publisher.sendMessage('Import surface file', filename)
+            Publisher.sendMessage('Import surface file', filename=filename)
  
  
 class SurfacesListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
@@ -744,8 +742,7 @@ class SurfacesListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
         elif (keycode == wx.WXK_DELETE):
             self.RemoveSurfaces()
  
-    def OnHideSurface(self, pubsub_evt):
-        surface_dict = pubsub_evt.data
+    def OnHideSurface(self, surface_dict):
         for key in surface_dict:
             if not surface_dict[key].is_shown:
                 self.SetItemImage(key, False)
@@ -770,11 +767,11 @@ class SurfacesListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
                 old_dict = new_dict
             self.surface_list_index = new_dict
  
-            Publisher.sendMessage('Remove surfaces', selected_items)
+            Publisher.sendMessage('Remove surfaces', surface_indexes=selected_items)
         else:
            dlg.SurfaceSelectionRequiredForRemoval()
  
-    def OnCloseProject(self, pubsub_evt):
+    def OnCloseProject(self):
         self.DeleteAllItems()
         self.surface_list_index = {}
         self.surface_bmp_idx_to_name = {}
@@ -786,7 +783,7 @@ class SurfacesListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
  
         last_surface_index = evt.Index
         Publisher.sendMessage('Change surface selected',
-                                    last_surface_index)
+                              surface_index=last_surface_index)
         evt.Skip()
  
     def GetSelected(self):
@@ -837,7 +834,7 @@ class SurfacesListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
         self.image_gray = Image.open(os.path.join(const.ICON_DIR, "object_colour.jpg"))
  
     def OnEditLabel(self, evt):
-        Publisher.sendMessage('Change surface name', (evt.GetIndex(), evt.GetLabel()))
+        Publisher.sendMessage('Change surface name', index=evt.GetIndex(), name=evt.GetLabel())
         evt.Skip()
  
     def OnItemActivated(self, evt):
@@ -845,38 +842,36 @@ class SurfacesListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
         evt.Skip()
  
     def OnCheckItem(self, index, flag):
-        Publisher.sendMessage('Show surface', (index, flag))
+        Publisher.sendMessage('Show surface', index=index, visibility=flag)
  
-    def OnShowSingle(self, pubsub_evt):
-        index, visibility = pubsub_evt.data
+    def OnShowSingle(self, index, visibility):
         for key in self.surface_list_index.keys():
             if key != index:
                 self.SetItemImage(key, not visibility)
                 Publisher.sendMessage('Show surface',
-                                            (key, not visibility))
+                                      index=key, visibility=not visibility)
         self.SetItemImage(index, visibility)
         Publisher.sendMessage('Show surface',
-                                   (index, visibility))
+                              index=index, visibility=visibility)
  
-    def OnShowMultiple(self, pubsub_evt):
-        index_list, visibility = pubsub_evt.data
+    def OnShowMultiple(self, index_list, visibility):
         for key in self.surface_list_index.keys():
             if key not in index_list:
                 self.SetItemImage(key, not visibility)
                 Publisher.sendMessage('Show surface',
-                                            (key, not visibility))
+                                      index=key, visibility=not visibility)
         for index in index_list:
             self.SetItemImage(index, visibility)
             Publisher.sendMessage('Show surface',
-                                       (index, visibility))
+                                  index=index, visibility=visibility)
  
-    def AddSurface(self, pubsub_evt):
-        index = pubsub_evt.data[0]
-        name = pubsub_evt.data[1]
-        colour = pubsub_evt.data[2]
-        volume = "%.3f"%pubsub_evt.data[3]
-        area = "%.3f"%pubsub_evt.data[4]
-        transparency = "%d%%"%(int(100*pubsub_evt.data[5]))
+    def AddSurface(self, surface):
+        index = surface.index
+        name = surface.name
+        colour = surface.colour
+        volume = "%.3f" % surface.volume
+        area = "%.3f" % surface.area
+        transparency = "%d%%" % (int(100*surface.transparency))
  
         if index not in self.surface_list_index:
             image = self.CreateColourBitmap(colour)
@@ -941,20 +936,18 @@ class SurfacesListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
  
         return wx.BitmapFromImage(wx_image.Scale(16, 16))
  
-    def EditSurfaceTransparency(self, pubsub_evt):
+    def EditSurfaceTransparency(self, surface_index, transparency):
         """
         Set actor transparency (oposite to opacity) according to given actor
         index and value.
         """
-        index, value = pubsub_evt.data
-        self.SetStringItem(index, 4, "%d%%"%(int(value*100)))
+        self.SetStringItem(surface_index, 4, "%d%%"%(int(transparency*100)))
  
-    def EditSurfaceColour(self, pubsub_evt):
+    def EditSurfaceColour(self, surface_index, colour):
         """
         """
-        index, colour = pubsub_evt.data
         image = self.CreateColourBitmap(colour)
-        image_index = self.surface_list_index[index]
+        image_index = self.surface_list_index[surface_index]
         self.imagelist.Replace(image_index, image)
         self.Refresh()
  
@@ -1007,15 +1000,14 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
         elif (keycode == wx.WXK_DELETE):
             self.RemoveMeasurements()
  
-    def OnRemoveGUIMeasure(self, pubsub_evt):
-        idx = pubsub_evt.data
-        self.DeleteItem(idx)
+    def OnRemoveGUIMeasure(self, measure_index):
+        self.DeleteItem(measure_index)
  
         old_dict = self._list_index
         new_dict = {}
         j = 0
         for i in old_dict:
-            if i != idx:
+            if i != measure_index:
                 new_dict[j] = old_dict[i]
                 j+=1
         self._list_index = new_dict
@@ -1041,12 +1033,12 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
                         new_dict[i-1] = old_dict[i]
                 old_dict = new_dict
             self._list_index = new_dict
-            Publisher.sendMessage('Remove measurements', selected_items)
+            Publisher.sendMessage('Remove measurements', indexes=selected_items)
         else:
            dlg.MeasureSelectionRequiredForRemoval()
  
  
-    def OnCloseProject(self, pubsub_evt):
+    def OnCloseProject(self):
         self.DeleteAllItems()
         self._list_index = {}
         self._bmp_idx_to_name = {}
@@ -1057,8 +1049,8 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
         # things will stop working, e.g.: OnCheckItem
  
         last_index = evt.Index
-        Publisher.sendMessage('Change measurement selected',
-                                    last_index)
+        #  Publisher.sendMessage('Change measurement selected',
+                                    #  last_index)
         evt.Skip()
  
     def GetSelected(self):
@@ -1110,7 +1102,7 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
  
  
     def OnEditLabel(self, evt):
-        Publisher.sendMessage('Change measurement name', (evt.GetIndex(), evt.GetLabel()))
+        Publisher.sendMessage('Change measurement name', index=evt.GetIndex(), name=evt.GetLabel())
         evt.Skip()
  
     def OnItemActivated(self, evt):
@@ -1119,38 +1111,32 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
  
  
     def OnCheckItem(self, index, flag):
-        Publisher.sendMessage('Show measurement', (index, flag))
+        Publisher.sendMessage('Show measurement', index=index, visibility=flag)
  
-    def OnShowSingle(self, pubsub_evt):
-        index, visibility = pubsub_evt.data
+    def OnShowSingle(self, index, visibility):
         for key in self._list_index.keys():
             if key != index:
                 self.SetItemImage(key, not visibility)
                 Publisher.sendMessage('Show measurement',
-                                            (key, not visibility))
+                                      index=key, visibility=not visibility)
         self.SetItemImage(index, visibility)
         Publisher.sendMessage('Show measurement',
-                                   (index, visibility))
+                              index=index, visibility=visibility)
  
-    def OnShowMultiple(self, pubsub_evt):
-        index_list, visibility = pubsub_evt.data
+    def OnShowMultiple(self, index_list, visibility):
         for key in self._list_index.keys():
             if key not in index_list:
                 self.SetItemImage(key, not visibility)
                 Publisher.sendMessage('Show measurement',
-                                            (key, not visibility))
+                                      index=key, visibility=not visibility)
         for index in index_list:
             self.SetItemImage(index, visibility)
             Publisher.sendMessage('Show measurement',
-                                       (index, visibility))
+                                  index=index, visibility=visibility)
  
-    def OnLoadData(self, pubsub_evt):
-        try:
-            items_dict, spacing = pubsub_evt.data
-        except ValueError:
-            items_dict = pubsub_evt.data
-        for i in items_dict:
-            m = items_dict[i]
+    def OnLoadData(self, measurement_dict, spacing=(1.0, 1.0, 1.0)):
+        for i in measurement_dict:
+            m = measurement_dict[i]
             image = self.CreateColourBitmap(m.colour)
             image_index = self.imagelist.Add(image)
  
@@ -1169,14 +1155,7 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
             if not m.visible:
                 self.SetItemImage(i, False)
  
-    def AddItem_(self, pubsub_evt):
-        index = pubsub_evt.data[0]
-        name = pubsub_evt.data[1]
-        colour = pubsub_evt.data[2]
-        location = pubsub_evt.data[3]
-        type_ = pubsub_evt.data[4]
-        value = pubsub_evt.data[5]
-
+    def AddItem_(self, index, name, colour, location, type_, value):
         if index not in self._list_index:
             image = self.CreateColourBitmap(colour)
             image_index = self.imagelist.Add(image)
@@ -1241,12 +1220,11 @@ class MeasuresListCtrlPanel(wx.ListCtrl, listmix.TextEditMixin):
             wx_image.SetData(new_image.tobytes())
         return wx.BitmapFromImage(wx_image.Scale(16, 16))
  
-    def EditItemColour(self, pubsub_evt):
+    def EditItemColour(self, measure_index, colour):
         """
         """
-        index, colour = pubsub_evt.data
         image = self.CreateColourBitmap(colour)
-        image_index = self._list_index[index]
+        image_index = self._list_index[measure_index]
         self.imagelist.Replace(image_index, image)
         self.Refresh()
  
@@ -204,8 +204,7 @@ class LowerTaskPanel(wx.Panel):
     def __bind_events(self):
         Publisher.subscribe(self.OnEnableState, "Enable state project")
  
-    def OnEnableState(self, pubsub_evt):
-        state = pubsub_evt.data
+    def OnEnableState(self, state):
         if state:
             self.SetStateProjectOpen()
         else:
@@ -305,25 +304,24 @@ class UpperTaskPanel(wx.Panel):
         Publisher.subscribe(self.OnFoldExport, 'Fold export task')
         Publisher.subscribe(self.SetNavigationMode, "Set navigation mode")
  
-    def OnOverwrite(self, pubsub_evt):
-        self.overwrite = pubsub_evt.data['options']['overwrite']
+    def OnOverwrite(self, surface_parameters):
+        self.overwrite = surface_parameters['options']['overwrite']
  
-    def OnFoldSurface(self, pubsub_evt):
+    def OnFoldSurface(self):
         if not self.overwrite:
             self.fold_panel.Expand(self.fold_panel.GetFoldPanel(2))
  
-    def OnFoldExport(self, pubsub_evt):
+    def OnFoldExport(self):
         self.fold_panel.Expand(self.fold_panel.GetFoldPanel(3))
  
-    def OnEnableState(self, pubsub_evt):
-        state = pubsub_evt.data
+    def OnEnableState(self, state):
         if state:
             self.SetStateProjectOpen()
         else:
             self.SetStateProjectClose()
  
-    def SetNavigationMode(self, pubsub_evt):
-        self.navigation_mode_status = status = pubsub_evt.data
+    def SetNavigationMode(self, status):
+        self.navigation_mode_status = status
         name = _("Navigation system")
         panel = navigator.TaskPanel
         if status and (self.fold_panel.GetCount()<=4):
@@ -130,11 +130,11 @@ class Panel(wx.Panel):
  
     def OnMaximize(self, evt):
         if evt.GetPane().name == self.s4.name:
-            Publisher.sendMessage('Show raycasting widget', None)
+            Publisher.sendMessage('Show raycasting widget')
  
     def OnRestore(self, evt):
         if evt.GetPane().name == self.s4.name:
-            Publisher.sendMessage('Hide raycasting widget', None)
+            Publisher.sendMessage('Hide raycasting widget')
  
     def __init_four_way_splitter(self):
  
@@ -156,7 +156,7 @@ class Panel(wx.Panel):
         p4 = volume_viewer.Viewer(self)
         splitter.AppendWindow(p4)
  
-    def _Exit(self, pubsub_evt):
+    def _Exit(self):
         self.aui_manager.UnInit()
  
     def __init_mix(self):
@@ -256,28 +256,28 @@ class VolumeInteraction(wx.Panel):
  
     def __update_curve_wwwl_text(self, curve):
         ww, wl = self.clut_raycasting.GetCurveWWWl(curve)
-        Publisher.sendMessage('Set raycasting wwwl', (ww, wl, curve))
+        Publisher.sendMessage('Set raycasting wwwl', ww=ww, wl=wl, curve=curve)
  
-    def ShowRaycastingWidget(self, evt_pubsub=None):
+    def ShowRaycastingWidget(self):
         self.can_show_raycasting_widget = 1
         if self.clut_raycasting.to_draw_points:
             p = self.aui_manager.GetPane(self.clut_raycasting)
             p.Show()
             self.aui_manager.Update()
  
-    def HideRaycastingWidget(self, evt_pubsub=None):
+    def HideRaycastingWidget(self):
         self.can_show_raycasting_widget = 0
         p = self.aui_manager.GetPane(self.clut_raycasting)
         p.Hide()
         self.aui_manager.Update()
  
     def OnPointChanged(self, evt):
-        Publisher.sendMessage('Set raycasting refresh', None)
-        Publisher.sendMessage('Set raycasting curve', evt.GetCurve())
+        Publisher.sendMessage('Set raycasting refresh')
+        Publisher.sendMessage('Set raycasting curve', curve=evt.GetCurve())
         Publisher.sendMessage('Render volume viewer')
  
     def OnCurveSelected(self, evt):
-        Publisher.sendMessage('Set raycasting curve', evt.GetCurve())
+        Publisher.sendMessage('Set raycasting curve', curve=evt.GetCurve())
         Publisher.sendMessage('Render volume viewer')
  
     def OnChangeCurveWL(self, evt):
@@ -285,7 +285,7 @@ class VolumeInteraction(wx.Panel):
         self.__update_curve_wwwl_text(curve)
         Publisher.sendMessage('Render volume viewer')
  
-    def OnSetRaycastPreset(self, evt_pubsub):
+    def OnSetRaycastPreset(self):
         preset = project.Project().raycasting_preset
         p = self.aui_manager.GetPane(self.clut_raycasting)
         self.clut_raycasting.SetRaycastPreset(preset)
@@ -296,17 +296,15 @@ class VolumeInteraction(wx.Panel):
             p.Hide()
         self.aui_manager.Update()
  
-    def LoadHistogram(self, pubsub_evt):
-        histogram = pubsub_evt.data[0]
-        init, end = pubsub_evt.data[1]
+    def LoadHistogram(self, histogram, init, end):
         self.clut_raycasting.SetRange((init, end))
         self.clut_raycasting.SetHistogramArray(histogram, (init, end))
  
-    def RefreshPoints(self, pubsub_evt):
+    def RefreshPoints(self):
         self.clut_raycasting.CalculatePixelPoints()
         self.clut_raycasting.Refresh()
  
-    def _Exit(self, pubsub_evt):
+    def _Exit(self):
         self.aui_manager.UnInit()
  
  
@@ -434,7 +432,7 @@ class VolumeToolPanel(wx.Panel):
         Publisher.subscribe(self.StatusTargetSelect, 'Disable or enable coil tracker')
         Publisher.subscribe(self.StatusObjTracker, 'Status target button')
  
-    def DisablePreset(self, pubsub_evt):
+    def DisablePreset(self):
         self.off_item.Check(1)
  
  
@@ -459,12 +457,12 @@ class VolumeToolPanel(wx.Panel):
     def OnButtonSlicePlane(self, evt):
         self.button_slice_plane.PopupMenu(self.slice_plane_menu)
  
-    def StatusObjTracker(self, pubsub_evt):
-        self.status_obj_tracker = pubsub_evt.data
+    def StatusObjTracker(self, status):
+        self.status_obj_tracker = status
         self.StatusNavigation()
  
-    def StatusTargetSelect(self, pubsub_evt):
-        self.status_target_select = pubsub_evt.data
+    def StatusTargetSelect(self, status):
+        self.status_target_select = status
         self.StatusNavigation()
  
     def StatusNavigation(self):
@@ -477,19 +475,18 @@ class VolumeToolPanel(wx.Panel):
     def OnButtonTarget(self, evt):
         if not self.button_target.IsPressed() and evt is not False:
             self.button_target._pressed = True
-            Publisher.sendMessage('Target navigation mode', self.button_target._pressed)
+            Publisher.sendMessage('Target navigation mode', target_mode=self.button_target._pressed)
         elif self.button_target.IsPressed() or evt is False:
             self.button_target._pressed = False
-            Publisher.sendMessage('Target navigation mode', self.button_target._pressed)
+            Publisher.sendMessage('Target navigation mode', target_mode=self.button_target._pressed)
  
     def OnSavePreset(self, evt):
         d = wx.TextEntryDialog(self, _("Preset name"))
         if d.ShowModal() == wx.ID_OK:
             preset_name = d.GetValue()
-            Publisher.sendMessage(_("Save raycasting preset"),
-                                       preset_name)
+            Publisher.sendMessage("Save raycasting preset", preset_name=preset_name)
  
-    def __init_menus(self, pubsub_evt=None):
+    def __init_menus(self):
         # MENU RELATED TO RAYCASTING TYPES
         menu = self.menu = wx.Menu()
         #print "\n\n"
@@ -576,7 +573,7 @@ class VolumeToolPanel(wx.Panel):
         self.Fit()
         self.Update()
  
-    def DisableVolumeCutMenu(self, pusub_evt):
+    def DisableVolumeCutMenu(self):
         self.menu.Enable(RAYCASTING_TOOLS, 0)
         item = ID_TO_TOOL_ITEM[self.id_cutplane]
         item.Check(0)
@@ -596,23 +593,23 @@ class VolumeToolPanel(wx.Panel):
         label = item.GetLabel()
  
         if not (checked):
-            Publisher.sendMessage('Disable plane', label)
+            Publisher.sendMessage('Disable plane', plane_label=label)
         else:
-            Publisher.sendMessage('Enable plane', label)
+            Publisher.sendMessage('Enable plane', plane_label=label)
  
     def OnMenuStereo(self, evt):
         id = evt.GetId() 
         mode = ID_TO_STEREO_NAME[id]
-        Publisher.sendMessage('Set stereo mode', mode)
+        Publisher.sendMessage('Set stereo mode', mode=mode)
  
  
-    def Uncheck(self, pubsub_evt):        
+    def Uncheck(self):
         for item in self.slice_plane_menu.GetMenuItems():
             if (item.IsChecked()):
                 item.Check(0)
  
-    def ChangeButtonColour(self, pubsub_evt):
-        colour = [i*255 for i in pubsub_evt.data]
+    def ChangeButtonColour(self, colour):
+        colour = [i*255 for i in colour]
         self.button_colour.SetColour(colour)
  
     def OnMenuRaycasting(self, evt):
@@ -622,7 +619,7 @@ class VolumeToolPanel(wx.Panel):
             # Raycassting type was selected
             name = ID_TO_NAME[id]
             Publisher.sendMessage('Load raycasting preset',
-                                          ID_TO_NAME[id])
+                                  preset_name=ID_TO_NAME[id])
             # Enable or disable tools
             if name != const.RAYCASTING_OFF_LABEL:
  	            self.menu_raycasting.Enable(RAYCASTING_TOOLS, 1)
@@ -639,12 +636,12 @@ class VolumeToolPanel(wx.Panel):
             #            i.Check(0)
             if not TOOL_STATE[id]:
                 Publisher.sendMessage('Enable raycasting tool',
-                                          [ID_TO_TOOL[id],1])
+                                      tool_name=ID_TO_TOOL[id], flag=1)
                 TOOL_STATE[id] = True
                 item.Check(1)
             else:
                 Publisher.sendMessage('Enable raycasting tool',
-                                            [ID_TO_TOOL[id],0])
+                                      tool_name=ID_TO_TOOL[id], flag=0)
                 TOOL_STATE[id] = False
                 item.Check(0)
  
@@ -655,10 +652,10 @@ class VolumeToolPanel(wx.Panel):
         self.button_view.SetBitmapSelected(bmp)
  
         Publisher.sendMessage('Set volume view angle',
-                                   evt.GetId())
+                              view=evt.GetId())
         self.Refresh()
  
     def OnSelectColour(self, evt):
         colour = c = [i/255.0 for i in evt.GetValue()]
-        Publisher.sendMessage('Change volume viewer background colour', colour)
+        Publisher.sendMessage('Change volume viewer background colour', colour=colour)
  
@@ -726,7 +726,7 @@ class UpdateMessageDialog(wx.Dialog):
         self.Close()
         self.Destroy()
  
-    def _OnCloseInV(self, pubsub_evt):
+    def _OnCloseInV(self):
         # Closes and destroy this dialog.
         self.Close()
         self.Destroy()
@@ -1880,12 +1880,12 @@ class ClutImagedataDialog(wx.Dialog):
  
     def OnClutChange(self, evt):
         Publisher.sendMessage('Change colour table from background image from widget',
-                              evt.GetNodes())
+                              nodes=evt.GetNodes())
         Publisher.sendMessage('Update window level text',
-                              (self.clut_widget.window_width,
-                               self.clut_widget.window_level))
+                              window=self.clut_widget.window_width,
+                              level=self.clut_widget.window_level)
  
-    def _refresh_widget(self, pubsub_evt):
+    def _refresh_widget(self):
         self.clut_widget.Refresh()
  
     def Show(self, gen_evt=True, show=True):
@@ -2068,7 +2068,8 @@ class MaskBooleanDialog(wx.Dialog):
         m1 = self.mask1.GetClientData(self.mask1.GetSelection())
         m2 = self.mask2.GetClientData(self.mask2.GetSelection())
  
-        Publisher.sendMessage('Do boolean operation', (op, m1, m2))
+        Publisher.sendMessage('Do boolean operation',
+                              operation=op, mask1=m1, mask2=m2)
         Publisher.sendMessage('Reload actual slice')
         Publisher.sendMessage('Refresh viewer')
  
@@ -2152,13 +2153,13 @@ class ReorientImageDialog(wx.Dialog):
         self.btnapply.Bind(wx.EVT_BUTTON, self.apply_reorientation)
         self.Bind(wx.EVT_CLOSE, self.OnClose)
  
-    def _update_angles(self, pubsub_evt):
-        anglex, angley, anglez = pubsub_evt.data
+    def _update_angles(self, angles):
+        anglex, angley, anglez = angles
         self.anglex.SetValue("%.3f" % np.rad2deg(anglex))
         self.angley.SetValue("%.3f" % np.rad2deg(angley))
         self.anglez.SetValue("%.3f" % np.rad2deg(anglez))
  
-    def _close_dialog(self, pubsub_evt):
+    def _close_dialog(self):
         self.Destroy()
  
     def apply_reorientation(self, evt):
@@ -2167,13 +2168,13 @@ class ReorientImageDialog(wx.Dialog):
  
     def OnClose(self, evt):
         self._closed = True
-        Publisher.sendMessage('Disable style', const.SLICE_STATE_REORIENT)
-        Publisher.sendMessage('Enable style', const.STATE_DEFAULT)
+        Publisher.sendMessage('Disable style', style=const.SLICE_STATE_REORIENT)
+        Publisher.sendMessage('Enable style', style=const.STATE_DEFAULT)
         self.Destroy()
  
     def OnSelect(self, evt):
         im_code = self.interp_method.GetClientData(self.interp_method.GetSelection())
-        Publisher.sendMessage('Set interpolation method', im_code)
+        Publisher.sendMessage('Set interpolation method', interp_method=im_code)
  
     def OnSetFocus(self, evt):
         self._last_ax = self.anglex.GetValue()
@@ -2191,7 +2192,7 @@ class ReorientImageDialog(wx.Dialog):
                 self.angley.SetValue(self._last_ay)
                 self.anglez.SetValue(self._last_az)
                 return
-            Publisher.sendMessage('Set reorientation angles', (ax, ay, az))
+            Publisher.sendMessage('Set reorientation angles', angles=(ax, ay, az))
  
  
 class ImportBitmapParameters(wx.Dialog):
@@ -2350,7 +2351,7 @@ class ImportBitmapParameters(wx.Dialog):
         values = [self.tx_name.GetValue(), orientation,\
                   self.fsp_spacing_x.GetValue(), self.fsp_spacing_y.GetValue(),\
                   self.fsp_spacing_z.GetValue(), self.interval]
-        Publisher.sendMessage('Open bitmap files', values)
+        Publisher.sendMessage('Open bitmap files', rec_data=values)
  
         self.Close()
         self.Destroy()
@@ -2759,7 +2760,7 @@ class FFillOptionsDialog(wx.Dialog):
     def OnClose(self, evt):
         print("ONCLOSE")
         if self.config.dlg_visible:
-            Publisher.sendMessage('Disable style', const.SLICE_STATE_MASK_FFILL)
+            Publisher.sendMessage('Disable style', style=const.SLICE_STATE_MASK_FFILL)
         evt.Skip()
         self.Destroy()
  
@@ -2845,7 +2846,7 @@ class SelectPartsOptionsDialog(wx.Dialog):
  
     def OnClose(self, evt):
         if self.config.dlg_visible:
-            Publisher.sendMessage('Disable style', const.SLICE_STATE_SELECT_MASK_PARTS)
+            Publisher.sendMessage('Disable style', style=const.SLICE_STATE_SELECT_MASK_PARTS)
         evt.Skip()
         self.Destroy()
  
@@ -3048,7 +3049,7 @@ class FFillSegmentationOptionsDialog(wx.Dialog):
  
     def OnClose(self, evt):
         if self.config.dlg_visible:
-            Publisher.sendMessage('Disable style', const.SLICE_STATE_MASK_FFILL)
+            Publisher.sendMessage('Disable style', style=const.SLICE_STATE_MASK_FFILL)
         evt.Skip()
         self.Destroy()
  
@@ -3068,14 +3069,8 @@ class CropOptionsDialog(wx.Dialog):
  
         self._init_gui()
  
-    def UpdateValues(self, pubsub_evt):
-
-        if type(pubsub_evt) == list:
-            data = pubsub_evt
-        else:
-            data = pubsub_evt.data
-
-        xi, xf, yi, yf, zi, zf = data
+    def UpdateValues(self, limits):
+        xi, xf, yi, yf, zi, zf = limits
  
         self.tx_axial_i.SetValue(str(zi))
         self.tx_axial_f.SetValue(str(zf))
@@ -3170,12 +3165,12 @@ class CropOptionsDialog(wx.Dialog):
     def OnOk(self, evt):
         self.config.dlg_visible = False
         Publisher.sendMessage('Crop mask')
-        Publisher.sendMessage('Disable style', const.SLICE_STATE_CROP_MASK)
+        Publisher.sendMessage('Disable style', style=const.SLICE_STATE_CROP_MASK)
         evt.Skip()
  
     def OnClose(self, evt):
         self.config.dlg_visible = False
-        Publisher.sendMessage('Disable style', const.SLICE_STATE_CROP_MASK)
+        Publisher.sendMessage('Disable style', style=const.SLICE_STATE_CROP_MASK)
         evt.Skip()
         self.Destroy()
  
@@ -3260,14 +3255,14 @@ class FillHolesAutoDialog(wx.Dialog):
             conn = self.panel3dcon.GetConnSelected()
             orientation = 'VOLUME'
  
-        data = {
+        parameters = {
             'target': target,
             'conn': conn,
             'orientation': orientation,
             'size': self.spin_size.GetValue(),
         }
  
-        Publisher.sendMessage("Fill holes automatically", data)
+        Publisher.sendMessage("Fill holes automatically", parameters=parameters)
  
  
     def OnBtnClose(self, evt):
@@ -686,8 +686,8 @@ class DicomPreviewSlice(wx.Panel):
         self.selected_dicom = self.selected_panel.dicom_info
         self.GetEventHandler().ProcessEvent(my_evt)
  
-        Publisher.sendMessage("Selected Import Images", [self.first_selection, \
-                                                                 self.last_selection])  
+        Publisher.sendMessage("Selected Import Images",
+                              selection=(self.first_selection, self.last_selection))
  
     def OnScroll(self, evt=None):
         if evt:
@@ -248,14 +248,14 @@ class Frame(wx.Frame):
         # TODO: Allow saving and restoring perspectives
         self.perspective_all = aui_manager.SavePerspective()
  
-    def _BeginBusyCursor(self, pubsub_evt):
+    def _BeginBusyCursor(self):
         """
         Start busy cursor.
         Note: _EndBusyCursor should be called after.
         """
         wx.BeginBusyCursor()
  
-    def _EndBusyCursor(self, pubsub_evt):
+    def _EndBusyCursor(self):
         """
         End busy cursor.
         Note: _BeginBusyCursor should have been called previously.
@@ -266,7 +266,7 @@ class Frame(wx.Frame):
             #no matching wxBeginBusyCursor() for wxEndBusyCursor()
             pass
  
-    def _Exit(self, pubsub_evt):
+    def _Exit(self):
         """
         Exit InVesalius.
         """
@@ -275,7 +275,7 @@ class Frame(wx.Frame):
         if hasattr(sys,"frozen") and sys.platform == 'darwin':
             sys.exit(0)
  
-    def _HideContentPanel(self, pubsub_evt):
+    def _HideContentPanel(self):
         """
         Hide data and tasks panels.
         """
@@ -284,7 +284,7 @@ class Frame(wx.Frame):
         aui_manager.GetPane("Tasks").Show(1)
         aui_manager.Update()
  
-    def _HideImportPanel(self, evt_pubsub):
+    def _HideImportPanel(self):
         """
         Hide import panel and show tasks.
         """
@@ -294,39 +294,37 @@ class Frame(wx.Frame):
         aui_manager.GetPane("Tasks").Show(1)
         aui_manager.Update()
  
-    def _HideTask(self, pubsub_evt):
+    def _HideTask(self):
         """
         Hide task panel.
         """
         self.aui_manager.GetPane("Tasks").Hide()
         self.aui_manager.Update()
  
-    def _SetProjectName(self, pubsub_evt):
+    def _SetProjectName(self, proj_name=""):
         """
         Set project name into frame's title.
         """
-        proj_name = pubsub_evt.data
-
         if not(proj_name):
             self.SetTitle("InVesalius 3")
         else:
             self.SetTitle("%s - InVesalius 3"%(proj_name))
  
-    def _ShowContentPanel(self, evt_pubsub):
+    def _ShowContentPanel(self):
         """
         Show viewers and task, hide import panel.
         """
         Publisher.sendMessage("Set layout button full")
         aui_manager = self.aui_manager
         aui_manager.GetPane("Import").Show(0)
-        
+
         aui_manager.GetPane("ImportBMP").Show(0)
  
         aui_manager.GetPane("Data").Show(1)
         aui_manager.GetPane("Tasks").Show(1)
         aui_manager.Update()
  
-    def _ShowImportNetwork(self, evt_pubsub):
+    def _ShowImportNetwork(self):
         """
         Show viewers and task, hide import panel.
         """
@@ -338,7 +336,7 @@ class Frame(wx.Frame):
         aui_manager.GetPane("Import").Show(0)
         aui_manager.Update()
  
-    def _ShowImportBitmap(self, evt_pubsub):
+    def _ShowImportBitmap(self):
         """
         Show viewers and task, hide import panel.
         """
@@ -350,15 +348,14 @@ class Frame(wx.Frame):
         aui_manager.GetPane("Import").Show(0)
         aui_manager.Update()
  
-    def _ShowHelpMessage(self, evt_pubsub):
+    def _ShowHelpMessage(self, message):
         aui_manager = self.aui_manager
         pos = aui_manager.GetPane("Data").window.GetScreenPosition()
-        msg =  evt_pubsub.data
-        self.mw = MessageWatershed(self, msg)
+        self.mw = MessageWatershed(self, message)
         self.mw.SetPosition(pos)
         self.mw.Show()
  
-    def _ShowImportPanel(self, evt_pubsub):
+    def _ShowImportPanel(self):
         """
         Show only DICOM import panel. as dicom        """
         Publisher.sendMessage("Set layout button data only")
@@ -368,14 +365,14 @@ class Frame(wx.Frame):
         aui_manager.GetPane("Tasks").Show(0)
         aui_manager.Update()
  
-    def _ShowTask(self, pubsub_evt):
+    def _ShowTask(self):
         """
         Show task panel.
         """
         self.aui_manager.GetPane("Tasks").Show()
         self.aui_manager.Update()
  
-    def _UpdateAUI(self, pubsub_evt):
+    def _UpdateAUI(self):
         """
         Refresh AUI panels/data.
         """
@@ -457,19 +454,19 @@ class Frame(wx.Frame):
             self.OnReorientImg()
  
         elif id == const.ID_THRESHOLD_SEGMENTATION:
-            Publisher.sendMessage("Show panel", const.ID_THRESHOLD_SEGMENTATION)
+            Publisher.sendMessage("Show panel", panel_id=const.ID_THRESHOLD_SEGMENTATION)
             Publisher.sendMessage('Disable actual style')
-            Publisher.sendMessage('Enable style', const.STATE_DEFAULT)
+            Publisher.sendMessage('Enable style', style=const.STATE_DEFAULT)
  
         elif id == const.ID_MANUAL_SEGMENTATION:
-            Publisher.sendMessage("Show panel", const.ID_MANUAL_SEGMENTATION)
+            Publisher.sendMessage("Show panel", panel_id=const.ID_MANUAL_SEGMENTATION)
             Publisher.sendMessage('Disable actual style')
-            Publisher.sendMessage('Enable style', const.SLICE_STATE_EDITOR)
+            Publisher.sendMessage('Enable style', style=const.SLICE_STATE_EDITOR)
  
         elif id == const.ID_WATERSHED_SEGMENTATION:
-            Publisher.sendMessage("Show panel", const.ID_WATERSHED_SEGMENTATION)
+            Publisher.sendMessage("Show panel", panel_id=const.ID_WATERSHED_SEGMENTATION)
             Publisher.sendMessage('Disable actual style')
-            Publisher.sendMessage('Enable style', const.SLICE_STATE_WATERSHED)
+            Publisher.sendMessage('Enable style', style=const.SLICE_STATE_WATERSHED)
  
         elif id == const.ID_FLOODFILL_MASK:
             self.OnFillHolesManually()
@@ -507,13 +504,13 @@ class Frame(wx.Frame):
             Publisher.sendMessage('New mask from shortcut')
  
     def OnInterpolatedSlices(self, status):
-        Publisher.sendMessage('Set interpolated slices', status)
+        Publisher.sendMessage('Set interpolated slices', flag=status)
  
     def OnNavigationMode(self, status):
         if status and self._show_navigator_message and sys.platform != 'win32':
             wx.MessageBox(_('Currently the Navigation mode is only working on Windows'), 'Info', wx.OK | wx.ICON_INFORMATION)
             self._show_navigator_message = False
-        Publisher.sendMessage('Set navigation mode', status)
+        Publisher.sendMessage('Set navigation mode', status=status)
         if not status:
             Publisher.sendMessage('Remove sensors ID')
  
@@ -554,7 +551,7 @@ class Frame(wx.Frame):
             ses.Session().WriteSessionFile()
  
             Publisher.sendMessage('Remove Volume')
-            Publisher.sendMessage('Reset Reaycasting')
+            Publisher.sendMessage('Reset Raycasting')
             Publisher.sendMessage('Update Slice Interpolation')
             Publisher.sendMessage('Update Slice Interpolation MenuBar')
             Publisher.sendMessage('Update Navigation Mode MenuBar')
@@ -570,7 +567,7 @@ class Frame(wx.Frame):
         """
         Save project.
         """
-        Publisher.sendMessage('Show save dialog', False)
+        Publisher.sendMessage('Show save dialog', save_as=False)
  
     def ShowGettingStarted(self):
         """
@@ -596,7 +593,7 @@ class Frame(wx.Frame):
         """
         Show import Analyze, NiFTI1 or PAR/REC dialog.
         """
-        Publisher.sendMessage('Show import other files dialog', id_file)
+        Publisher.sendMessage('Show import other files dialog', id_type=id_file)
  
     def ShowRetrieveDicomPanel(self):
         Publisher.sendMessage('Show retrieve dicom panel')
@@ -611,20 +608,20 @@ class Frame(wx.Frame):
         """
         Show save as dialog.
         """
-        Publisher.sendMessage('Show save dialog', True)
+        Publisher.sendMessage('Show save dialog', save_as=True)
  
     def ShowBitmapImporter(self):
         """
         Tiff, BMP, JPEG and PNG
         """
-        Publisher.sendMessage('Show bitmap dialog', True)
+        Publisher.sendMessage('Show bitmap dialog')
  
     def FlipVolume(self, axis):
-        Publisher.sendMessage('Flip volume', axis)
+        Publisher.sendMessage('Flip volume', axis=axis)
         Publisher.sendMessage('Reload actual slice')
  
     def SwapAxes(self, axes):
-        Publisher.sendMessage('Swap volume axes', axes)
+        Publisher.sendMessage('Swap volume axes', axes=axes)
         Publisher.sendMessage('Update scroll')
         Publisher.sendMessage('Reload actual slice')
  
@@ -642,31 +639,31 @@ class Frame(wx.Frame):
         Publisher.sendMessage('Reload actual slice')
  
     def OnReorientImg(self):
-        Publisher.sendMessage('Enable style', const.SLICE_STATE_REORIENT)
+        Publisher.sendMessage('Enable style', style=const.SLICE_STATE_REORIENT)
         rdlg = dlg.ReorientImageDialog()
         rdlg.Show()
  
     def OnFillHolesManually(self):
-        Publisher.sendMessage('Enable style', const.SLICE_STATE_MASK_FFILL)
+        Publisher.sendMessage('Enable style', style=const.SLICE_STATE_MASK_FFILL)
  
     def OnFillHolesAutomatically(self):
         fdlg = dlg.FillHolesAutoDialog(_(u"Fill holes automatically"))
         fdlg.Show()
  
     def OnRemoveMaskParts(self):
-        Publisher.sendMessage('Enable style', const.SLICE_STATE_REMOVE_MASK_PARTS)
+        Publisher.sendMessage('Enable style', style=const.SLICE_STATE_REMOVE_MASK_PARTS)
  
     def OnSelectMaskParts(self):
-        Publisher.sendMessage('Enable style', const.SLICE_STATE_SELECT_MASK_PARTS)
+        Publisher.sendMessage('Enable style', style=const.SLICE_STATE_SELECT_MASK_PARTS)
  
     def OnFFillSegmentation(self):
-        Publisher.sendMessage('Enable style', const.SLICE_STATE_FFILL_SEGMENTATION)
+        Publisher.sendMessage('Enable style', style=const.SLICE_STATE_FFILL_SEGMENTATION)
  
     def OnInterpolatedSlices(self, status):
-        Publisher.sendMessage('Set interpolated slices', status)
-    
+        Publisher.sendMessage('Set interpolated slices', flag=status)
+
     def OnCropMask(self):
-        Publisher.sendMessage('Enable style', const.SLICE_STATE_CROP_MASK)
+        Publisher.sendMessage('Enable style', style=const.SLICE_STATE_CROP_MASK)
  
 # ------------------------------------------------------------------
 # ------------------------------------------------------------------
@@ -959,20 +956,19 @@ class MenuBar(wx.MenuBar):
         else:
             return False
  
-    def OnUpdateSliceInterpolation(self, pubsub_evt):
+    def OnUpdateSliceInterpolation(self):
         v = self.SliceInterpolationStatus()
         self.view_menu.Check(const.ID_VIEW_INTERPOLATED, v)
  
-    def OnUpdateNavigationMode(self, pubsub_evt):
+    def OnUpdateNavigationMode(self):
         v = self.NavigationModeStatus()
         self.mode_menu.Check(const.ID_MODE_NAVIGATION, v)
  
-    def OnEnableState(self, pubsub_evt):
+    def OnEnableState(self, state):
         """
         Based on given state, enables or disables menu items which
         depend if project is open or not.
         """
-        state = pubsub_evt.data
         if state:
             self.SetStateProjectOpen()
         else:
@@ -992,41 +988,38 @@ class MenuBar(wx.MenuBar):
         for item in self.enable_items:
             self.Enable(item, True)
  
-    def OnEnableUndo(self, pubsub_evt):
-        value = pubsub_evt.data
+    def OnEnableUndo(self, value):
         if value:
             self.FindItemById(wx.ID_UNDO).Enable(True)
         else:
             self.FindItemById(wx.ID_UNDO).Enable(False)
  
-    def OnEnableRedo(self, pubsub_evt):
-        value = pubsub_evt.data
+    def OnEnableRedo(self, value):
         if value:
             self.FindItemById(wx.ID_REDO).Enable(True)
         else:
             self.FindItemById(wx.ID_REDO).Enable(False)
  
-    def OnEnableNavigation(self, pubsub_evt):
+    def OnEnableNavigation(self, status):
         """
         Disable mode menu when navigation is on.
-        :param pubsub_evt: Navigation status
+        :param status: Navigation status
         """
-        value = pubsub_evt.data
+        value = status
         if value:
             self.FindItemById(const.ID_MODE_NAVIGATION).Enable(False)
         else:
             self.FindItemById(const.ID_MODE_NAVIGATION).Enable(True)
  
-    def OnAddMask(self, pubsub_evt):
+    def OnAddMask(self, mask):
         self.num_masks += 1
         self.bool_op_menu.Enable(self.num_masks >= 2)
  
-    def OnRemoveMasks(self, pubsub_evt):
-        self.num_masks -= len(pubsub_evt.data)
+    def OnRemoveMasks(self, mask_indexes):
+        self.num_masks -= len(mask_indexes)
         self.bool_op_menu.Enable(self.num_masks >= 2)
  
-    def OnShowMask(self, pubsub_evt):
-        index, value = pubsub_evt.data
+    def OnShowMask(self, index, value):
         self.clean_mask_menu.Enable(value)
         self.crop_mask_menu.Enable(value)
  
@@ -1054,7 +1047,7 @@ class ProgressBar(wx.Gauge):
         sub = Publisher.subscribe
         sub(self._Layout, 'ProgressBar Reposition')
  
-    def _Layout(self, evt_pubsub=None):
+    def _Layout(self):
         """
         Compute new size and position, according to parent resize
         """
@@ -1104,12 +1097,11 @@ class StatusBar(wx.StatusBar):
         sub(self._SetProgressValue, 'Update status in GUI')
         sub(self._SetProgressLabel, 'Update status text in GUI')
  
-    def _SetProgressValue(self, pubsub_evt):
+    def _SetProgressValue(self, value, label):
         """
         Set both percentage value in gauge and text progress label in
         status.
         """
-        value, label = pubsub_evt.data
         self.progress_bar.SetPercentage(value)
         self.SetStatusText(label, 0)
         if (int(value) >= 99):
@@ -1123,11 +1115,10 @@ class StatusBar(wx.StatusBar):
             except(wx._core.PyAssertionError):
                 utils.debug("wx._core.PyAssertionError")
  
-    def _SetProgressLabel(self, pubsub_evt):
+    def _SetProgressLabel(self, label):
         """
         Set text progress label.
         """
-        label = pubsub_evt.data
         self.SetStatusText(label, 0)
  
 # ------------------------------------------------------------------
@@ -1262,12 +1253,11 @@ class ProjectToolBar(AuiToolBar):
         #                   "Print medical image...",
         #                   BMP_PRINT)
  
-    def _EnableState(self, pubsub_evt):
+    def _EnableState(self, state):
         """
         Based on given state, enable or disable menu items which
         depend if project is open or not.
         """
-        state = pubsub_evt.data
         if state:
             self.SetStateProjectOpen()
         else:
@@ -1445,19 +1435,18 @@ class ObjectToolBar(AuiToolBar):
         #                bitmap = BMP_ANNOTATE,
         #                kind = wx.ITEM_CHECK)
  
-    def _EnableState(self, pubsub_evt):
+    def _EnableState(self, state):
         """
         Based on given state, enable or disable menu items which
         depend if project is open or not.
         """
-        state = pubsub_evt.data
         if state:
             self.SetStateProjectOpen()
         else:
             self.SetStateProjectClose()
         self.Refresh()
  
-    def _UntoggleAllItems(self, pubsub_evt=None):
+    def _UntoggleAllItems(self):
         """
         Untoggle all items on toolbar.
         """
@@ -1467,14 +1456,14 @@ class ObjectToolBar(AuiToolBar):
                 self.ToggleTool(id, False)
         self.Refresh()
  
-    def _ToggleLinearMeasure(self, pubsub_evt):
+    def _ToggleLinearMeasure(self):
         """
         Force measure distance tool to be toggled and bind pubsub
         events to other classes whici are interested on this.
         """
         id = const.STATE_MEASURE_DISTANCE
         self.ToggleTool(id, True)
-        Publisher.sendMessage('Enable style', id)
+        Publisher.sendMessage('Enable style', style=id)
         Publisher.sendMessage('Untoggle slice toolbar items')
         for item in const.TOOL_STATES:
             state = self.GetToolToggled(item)
@@ -1482,14 +1471,14 @@ class ObjectToolBar(AuiToolBar):
                 self.ToggleTool(item, False)
  
  
-    def _ToggleAngularMeasure(self, pubsub_evt):
+    def _ToggleAngularMeasure(self):
         """
         Force measure angle tool to be toggled and bind pubsub
         events to other classes which are interested on this.
         """
         id = const.STATE_MEASURE_ANGLE
         self.ToggleTool(id, True)
-        Publisher.sendMessage('Enable style', id)
+        Publisher.sendMessage('Enable style', style=id)
         Publisher.sendMessage('Untoggle slice toolbar items')
         for item in const.TOOL_STATES:
             state = self.GetToolToggled(item)
@@ -1508,10 +1497,10 @@ class ObjectToolBar(AuiToolBar):
             Publisher.sendMessage('Fold measure task')
  
         if state:
-            Publisher.sendMessage('Enable style', id)
+            Publisher.sendMessage('Enable style', style=id)
             Publisher.sendMessage('Untoggle slice toolbar items')
         else:
-            Publisher.sendMessage('Disable style', id)
+            Publisher.sendMessage('Disable style', style=id)
  
         for item in const.TOOL_STATES:
             state = self.GetToolToggled(item)
@@ -1519,8 +1508,7 @@ class ObjectToolBar(AuiToolBar):
                 self.ToggleTool(item, False)
         evt.Skip()
  
-    def ToggleItem(self, evt):
-        _id, value = evt.data
+    def ToggleItem(self, _id, value):
         if _id in self.enable_items:
             self.ToggleTool(_id, value)
             self.Refresh()
@@ -1613,12 +1601,11 @@ class SliceToolBar(AuiToolBar):
         """
         self.Bind(wx.EVT_TOOL, self.OnToggle)
  
-    def _EnableState(self, pubsub_evt):
+    def _EnableState(self, state):
         """
         Based on given state, enable or disable menu items which
         depend if project is open or not.
         """
-        state = pubsub_evt.data
         if state:
             self.SetStateProjectOpen()
         else:
@@ -1626,7 +1613,7 @@ class SliceToolBar(AuiToolBar):
             self._UntoggleAllItems()
         self.Refresh()
  
-    def _UntoggleAllItems(self, pubsub_evt=None):
+    def _UntoggleAllItems(self):
         """
         Untoggle all items on toolbar.
         """
@@ -1636,16 +1623,15 @@ class SliceToolBar(AuiToolBar):
                 self.ToggleTool(id, False)
                 if id == const.SLICE_STATE_CROSS:
                     msg = 'Set cross visibility'
-                    Publisher.sendMessage(msg, 0)
+                    Publisher.sendMessage(msg, visibility=0)
         self.Refresh()
  
-    def OnToggle(self, evt):
+    def OnToggle(self, evt=None, id=None):
         """
         Update status of other items on toolbar (only one item
         should be toggle each time).
         """
-        if hasattr(evt, 'data'):
-            id = evt.data
+        if id is not None:
             if not self.GetToolToggled(id):
                 self.ToggleTool(id, True)
                 self.Refresh()
@@ -1656,10 +1642,10 @@ class SliceToolBar(AuiToolBar):
         state = self.GetToolToggled(id)
  
         if state:
-            Publisher.sendMessage('Enable style', id)
+            Publisher.sendMessage('Enable style', style=id)
             Publisher.sendMessage('Untoggle object toolbar items')
         else:
-            Publisher.sendMessage('Disable style', id)
+            Publisher.sendMessage('Disable style', style=id)
  
         for item in self.enable_items:
             state = self.GetToolToggled(item)
@@ -1671,8 +1657,7 @@ class SliceToolBar(AuiToolBar):
         ##print ">>>", self.sst.IsToggled()
         #print ">>>", self.sst.GetState()
  
-    def ToggleItem(self, evt):
-        _id, value = evt.data
+    def ToggleItem(self, _id, value):
         if _id in self.enable_items:
             self.ToggleTool(_id, value)
             self.Refresh()
@@ -1785,25 +1770,24 @@ class LayoutToolBar(AuiToolBar):
                           wx.ITEM_NORMAL,
                           short_help_string= _("Hide text"))
  
-    def _EnableState(self, pubsub_evt):
+    def _EnableState(self, state):
         """
         Based on given state, enable or disable menu items which
         depend if project is open or not.
         """
-        state = pubsub_evt.data
         if state:
             self.SetStateProjectOpen()
         else:
             self.SetStateProjectClose()
         self.Refresh()
  
-    def _SetLayoutWithoutTask(self, pubsub_evt):
+    def _SetLayoutWithoutTask(self):
         """
         Set item bitmap to task panel hiden.
         """
         self.SetToolNormalBitmap(ID_LAYOUT,self.BMP_WITHOUT_MENU)
  
-    def _SetLayoutWithTask(self, pubsub_evt):
+    def _SetLayoutWithTask(self):
         """
         Set item bitmap to task panel shown.
         """
@@ -1958,25 +1942,24 @@ class HistoryToolBar(AuiToolBar):
         self.EnableTool(wx.ID_UNDO, False)
         self.EnableTool(wx.ID_REDO, False)
  
-    def _EnableState(self, pubsub_evt):
+    def _EnableState(self, state):
         """
         Based on given state, enable or disable menu items which
         depend if project is open or not.
         """
-        state = pubsub_evt.data
         if state:
             self.SetStateProjectOpen()
         else:
             self.SetStateProjectClose()
         self.Refresh()
  
-    def _SetLayoutWithoutTask(self, pubsub_evt):
+    def _SetLayoutWithoutTask(self):
         """
         Set item bitmap to task panel hiden.
         """
         self.SetToolNormalBitmap(ID_LAYOUT,self.BMP_WITHOUT_MENU)
  
-    def _SetLayoutWithTask(self, pubsub_evt):
+    def _SetLayoutWithTask(self):
         """
         Set item bitmap to task panel shown.
         """
@@ -2054,16 +2037,14 @@ class HistoryToolBar(AuiToolBar):
             Publisher.sendMessage('Update AUI')
             self.ontool_text = True
  
-    def OnEnableUndo(self, pubsub_evt):
-        value = pubsub_evt.data
+    def OnEnableUndo(self, value):
         if value:
             self.EnableTool(wx.ID_UNDO, True)
         else:
             self.EnableTool(wx.ID_UNDO, False)
         self.Refresh()
  
-    def OnEnableRedo(self, pubsub_evt):
-        value = pubsub_evt.data
+    def OnEnableRedo(self, value):
         if value:
             self.EnableTool(wx.ID_REDO, True)
         else:
@@ -127,14 +127,13 @@ class InnerPanel(wx.Panel):
         Publisher.subscribe(self.ShowBitmapPreview, "Load import bitmap panel")
         Publisher.subscribe(self.GetSelectedImages ,"Selected Import Images")  
  
-    def ShowBitmapPreview(self, pubsub_evt):
-        data = pubsub_evt.data
+    def ShowBitmapPreview(self, data):
         #self.patients.extend(dicom_groups)
         self.text_panel.Populate(data)
  
-    def GetSelectedImages(self, pubsub_evt):
-        self.first_image_selection = pubsub_evt.data[0]
-        self.last_image_selection = pubsub_evt.data[1]
+    def GetSelectedImages(self, selection):
+        self.first_image_selection = selection[0]
+        self.last_image_selection = selection[1]
  
     def _bind_events(self):
         self.Bind(EVT_SELECT_SLICE, self.OnSelectSlice)
@@ -230,23 +229,23 @@ class TextPanel(wx.Panel):
                     data_size = len(bpr.BitmapData().GetData())
  
                     if index >= 0 and index < data_size:
-                        Publisher.sendMessage('Set bitmap in preview panel', index)
+                        Publisher.sendMessage('Set bitmap in preview panel', pos=index)
                     elif index == data_size and data_size > 0:
-                        Publisher.sendMessage('Set bitmap in preview panel', index - 1)
+                        Publisher.sendMessage('Set bitmap in preview panel', pos=index - 1)
                     elif data_size == 1:
-                        Publisher.sendMessage('Set bitmap in preview panel', 0)
+                        Publisher.sendMessage('Set bitmap in preview panel', pos=0)
                     else:
                         Publisher.sendMessage('Show black slice in single preview image')
  
                     self.tree.Delete(selected_item)
                     self.tree.Update()
                     self.tree.Refresh()
-                    Publisher.sendMessage('Remove preview panel', text_item)
+                    Publisher.sendMessage('Remove preview panel', data=text_item)
  
         evt.Skip()
  
-    def SelectSeries(self, pubsub_evt):
-        group_index = pubsub_evt.data
+    def SelectSeries(self, group_index):
+        pass
  
     def Populate(self, data):
         tree = self.tree
@@ -259,7 +258,7 @@ class TextPanel(wx.Panel):
         tree.Bind(wx.EVT_TREE_ITEM_ACTIVATED, self.OnActivate)
         tree.Bind(wx.EVT_TREE_SEL_CHANGED, self.OnSelChanged)
  
-        Publisher.sendMessage('Load bitmap into import panel', data)
+        Publisher.sendMessage('Load bitmap into import panel', data=data)
  
     def OnSelChanged(self, evt):
         self.selected_items = self.tree.GetSelections()
@@ -269,7 +268,7 @@ class TextPanel(wx.Panel):
  
             text_item = self.tree.GetItemText(item)
             index = bpr.BitmapData().GetIndexByPath(text_item)
-            Publisher.sendMessage('Set bitmap in preview panel', index)
+            Publisher.sendMessage('Set bitmap in preview panel', pos=index)
  
         evt.Skip()
  
@@ -369,14 +368,10 @@ class SeriesPanel(wx.Panel):
     def GetSelectedImagesRange(self):
         return [self.bitmap_preview.first_selected, self.dicom_preview_last_selection]
  
-    def SetBitmapFiles(self, pubsub_evt):
-
-
-        bitmap = pubsub_evt.data
+    def SetBitmapFiles(self, data):
+        bitmap = data
         self.thumbnail_preview.Show(1)
-
         self.thumbnail_preview.SetBitmapFiles(bitmap)
-
         self.Update()
  
     def OnSelectSerie(self, evt):
@@ -420,8 +415,7 @@ class SlicePanel(wx.Panel):
         self.SetAutoLayout(1)
         self.sizer = sizer
  
-    def SetBitmapFiles(self, pubsub_evt):
-        data = pubsub_evt.data
+    def SetBitmapFiles(self, data):
         self.bitmap_preview.SetBitmapFiles(data)
         self.sizer.Layout()
         self.Update()
@@ -266,8 +266,8 @@ class TextPanel(wx.Panel):
         self.root = tree.AddRoot(_("InVesalius Database"))
         self.tree = tree
  
-    def SelectSeries(self, pubsub_evt):
-        group_index = pubsub_evt.data
+    def SelectSeries(self, group_index):
+        pass
  
     def Populate(self, pubsub_evt):
         tree = self.tree
@@ -129,9 +129,9 @@ class InnerPanel(wx.Panel):
         Publisher.subscribe(self.ShowDicomPreview, "Load import panel")
         Publisher.subscribe(self.GetSelectedImages ,"Selected Import Images")  
  
-    def GetSelectedImages(self, pubsub_evt):
-        self.first_image_selection = pubsub_evt.data[0]
-        self.last_image_selection = pubsub_evt.data[1]
+    def GetSelectedImages(self, selection):
+        self.first_image_selection = selection[0]
+        self.last_image_selection = selection[1]
  
     def _bind_events(self):
         self.Bind(EVT_SELECT_SERIE, self.OnSelectSerie)
@@ -141,8 +141,7 @@ class InnerPanel(wx.Panel):
         self.btn_cancel.Bind(wx.EVT_BUTTON, self.OnClickCancel)
         self.text_panel.Bind(EVT_SELECT_SERIE_TEXT, self.OnDblClickTextPanel)
  
-    def ShowDicomPreview(self, pubsub_evt):
-        dicom_groups = pubsub_evt.data
+    def ShowDicomPreview(self, dicom_groups):
         self.patients.extend(dicom_groups)
         self.text_panel.Populate(dicom_groups)
  
@@ -187,8 +186,9 @@ class InnerPanel(wx.Panel):
  
         nslices_result = slice_amont / (interval + 1)
         if (nslices_result > 1):
-            Publisher.sendMessage('Open DICOM group', (group, interval, 
-                                    [self.first_image_selection, self.last_image_selection]))
+            Publisher.sendMessage('Open DICOM group', group=group,
+                                  interval=interval,
+                                  file_range=(self.first_image_selection, self.last_image_selection))
         else:
             dlg.MissingFilesForReconstruction()
  
@@ -251,8 +251,8 @@ class TextPanel(wx.Panel):
         self.root = tree.AddRoot(_("InVesalius Database"))
         self.tree = tree
  
-    def SelectSeries(self, pubsub_evt):
-        group_index = pubsub_evt.data
+    def SelectSeries(self, group_index):
+        pass
  
     def Populate(self, patient_list):
         tree = self.tree
@@ -313,7 +313,7 @@ class TextPanel(wx.Panel):
             group = self.tree.GetItemPyData(item)
             if isinstance(group, dcm.DicomGroup):
                 Publisher.sendMessage('Load group into import panel',
-                                            group)
+                                            group=group)
  
             elif isinstance(group, dcm.PatientGroup):
                 id = group.GetDicomSample().patient.id
@@ -322,7 +322,7 @@ class TextPanel(wx.Panel):
                 self.GetEventHandler().ProcessEvent(my_evt)
  
                 Publisher.sendMessage('Load patient into import panel',
-                                            group)
+                                            patient=group)
         else:
             parent_id = self.tree.GetItemParent(item)
             self.tree.Expand(parent_id)
@@ -430,8 +430,7 @@ class SeriesPanel(wx.Panel):
         self.serie_preview.Bind(dpp.EVT_CLICK_SERIE, self.OnSelectSerie)
         self.dicom_preview.Bind(dpp.EVT_CLICK_SLICE, self.OnSelectSlice)
  
-    def SetDicomSeries(self, pubsub_evt):
-        group = pubsub_evt.data
+    def SetDicomSeries(self, group):
         self.dicom_preview.SetDicomGroup(group)
         self.dicom_preview.Show(1)
         self.serie_preview.Show(0)
@@ -441,9 +440,7 @@ class SeriesPanel(wx.Panel):
     def GetSelectedImagesRange(self):
         return [self.dicom_preview.first_selected, self.dicom_preview_last_selection]
  
-    def SetPatientSeries(self, pubsub_evt):
-        patient = pubsub_evt.data
-
+    def SetPatientSeries(self, patient):
         self.dicom_preview.Show(0)
         self.serie_preview.Show(1)
  
@@ -474,8 +471,7 @@ class SeriesPanel(wx.Panel):
         my_evt.SetItemData(evt.GetItemData())
         self.GetEventHandler().ProcessEvent(my_evt)
  
-    def ShowDicomSeries(self, pubsub_evt):
-        patient = pubsub_evt.data
+    def ShowDicomSeries(self, patient):
         if isinstance(patient, dcm.PatientGroup):
             self.serie_preview.SetPatientGroups(patient)
             self.dicom_preview.SetPatientGroups(patient)
@@ -505,21 +501,18 @@ class SlicePanel(wx.Panel):
         self.SetAutoLayout(1)
         self.sizer = sizer
  
-    def SetPatientSeries(self, pubsub_evt):
-        patient = pubsub_evt.data
+    def SetPatientSeries(self, patient):
         group = patient.GetGroups()[0]
         self.dicom_preview.SetDicomGroup(group)
         self.sizer.Layout()
         self.Update()
  
-    def SetDicomSeries(self, evt):
-        group = evt.data
+    def SetDicomSeries(self, group):
         self.dicom_preview.SetDicomGroup(group)
         self.sizer.Layout()
         self.Update()
  
-    def ShowDicomSeries(self, pubsub_evt):
-        patient = pubsub_evt.data
+    def ShowDicomSeries(self, patient):
         group = patient.GetGroups()[0]
         self.dicom_preview.SetDicomGroup(group)
         self.sizer.Layout()
@@ -81,7 +81,7 @@ class Preferences(wx.Dialog):
  
         return values
  
-    def LoadPreferences(self, pub_evt):
+    def LoadPreferences(self):
         se = ses.Session()
  
         values = {const.RENDERING:se.rendering,
@@ -267,7 +267,7 @@ class InnerTaskPanel(wx.Panel):
         if value:
             filename, filetype = value
             Publisher.sendMessage('Export picture to file',
-                                       (id, filename, filetype))
+                                  orientation=id, filename=filename, filetype=filetype)
  
  
  
@@ -299,7 +299,8 @@ class InnerTaskPanel(wx.Panel):
                     filename = filename + "."+ extension
             filetype = const.FILETYPE_IMAGEDATA
             Publisher.sendMessage('Export mask to file',
-                                            (filename, filetype))
+                                  filename=filename,
+                                  filetype=filetype)
  
  
     def OnLinkExportSurface(self, evt=None):
@@ -335,7 +336,7 @@ class InnerTaskPanel(wx.Panel):
                     if filename.split(".")[-1] != extension:
                         filename = filename + "."+ extension
                 Publisher.sendMessage('Export surface to file',
-                                            (filename, filetype))
+                                      filename=filename, filetype=filetype)
                 if not os.path.exists(filename):
                     dlg = wx.MessageDialog(None,
                                        _("It was not possible to save the surface."),
@@ -235,15 +235,15 @@ class InnerTaskPanel(wx.Panel):
  
     def OpenProject(self, path=None):
         if path:
-            Publisher.sendMessage('Open recent project', path)
+            Publisher.sendMessage('Open recent project', filepath=path)
         else:
             Publisher.sendMessage('Show open project dialog')
  
     def SaveAsProject(self):
-        Publisher.sendMessage('Show save dialog', True)
+        Publisher.sendMessage('Show save dialog', save_as=True)
  
     def SaveProject(self):
-        Publisher.sendMessage('Show save dialog', False)
+        Publisher.sendMessage('Show save dialog', save_as=False)
  
     def CloseProject(self):
         Publisher.sendMessage('Close Project')
@@ -220,14 +220,13 @@ class InnerFoldPanel(wx.Panel):
         self.SetSizer(sizer)
         self.Update()
         self.SetAutoLayout(1)
-        
+
     def __bind_events(self):
         Publisher.subscribe(self.OnCheckStatus, 'Navigation status')
         Publisher.subscribe(self.OnShowObject, 'Update track object state')
         Publisher.subscribe(self.OnVolumeCamera, 'Target navigation mode')
  
-    def OnCheckStatus(self, pubsub_evt):
-        status = pubsub_evt.data
+    def OnCheckStatus(self, status):
         if status:
             self.checktrigger.Enable(False)
             self.checkobj.Enable(False)
@@ -237,27 +236,25 @@ class InnerFoldPanel(wx.Panel):
                 self.checkobj.Enable(True)
  
     def OnExternalTrigger(self, evt, ctrl):
-        Publisher.sendMessage('Update trigger state', ctrl.GetValue())
+        Publisher.sendMessage('Update trigger state', trigger_state=ctrl.GetValue())
  
-    def OnShowObject(self, evt):
-        if hasattr(evt, 'data'):
-            if evt.data[0]:
-                self.checkobj.Enable(True)
-                self.track_obj = True
-                Publisher.sendMessage('Status target button', True)
-            else:
-                self.checkobj.Enable(False)
-                self.checkobj.SetValue(False)
-                self.track_obj = False
-                Publisher.sendMessage('Status target button', False)
+    def OnShowObject(self, evt=None, flag=None, obj_name=None):
+        if flag:
+            self.checkobj.Enable(True)
+            self.track_obj = True
+            Publisher.sendMessage('Status target button', status=True)
+        else:
+            self.checkobj.Enable(False)
+            self.checkobj.SetValue(False)
+            self.track_obj = False
+            Publisher.sendMessage('Status target button', status=False)
  
-        Publisher.sendMessage('Update show object state', self.checkobj.GetValue())
+        Publisher.sendMessage('Update show object state', state=self.checkobj.GetValue())
  
-    def OnVolumeCamera(self, evt):
-        if hasattr(evt, 'data'):
-            if evt.data is True:
-                self.checkcamera.SetValue(0)
-        Publisher.sendMessage('Update volume camera state', self.checkcamera.GetValue())
+    def OnVolumeCamera(self, evt=None, target_mode=None):
+        if target_mode is True:
+            self.checkcamera.SetValue(0)
+        Publisher.sendMessage('Update volume camera state', camera_state=self.checkcamera.GetValue())
  
  
 class NeuronavigationPanel(wx.Panel):
@@ -402,9 +399,7 @@ class NeuronavigationPanel(wx.Panel):
         Publisher.subscribe(self.UpdateObjectRegistration, 'Update object registration')
         Publisher.subscribe(self.OnCloseProject, 'Close project data')
  
-    def LoadImageFiducials(self, pubsub_evt):
-        marker_id = pubsub_evt.data[0]
-        coord = pubsub_evt.data[1]
+    def LoadImageFiducials(self, marker_id, coord):
         for n in const.BTNS_IMG_MKS:
             btn_id = list(const.BTNS_IMG_MKS[n].keys())[0]
             fid_id = list(const.BTNS_IMG_MKS[n].values())[0]
@@ -414,9 +409,9 @@ class NeuronavigationPanel(wx.Panel):
                 for m in [0, 1, 2]:
                     self.numctrls_coord[btn_id][m].SetValue(coord[m])
  
-    def UpdateImageCoordinates(self, pubsub_evt):
+    def UpdateImageCoordinates(self, position):
         # TODO: Change from world coordinates to matrix coordinates. They are better for multi software communication.
-        self.current_coord = pubsub_evt.data
+        self.current_coord = position
         for m in [0, 1, 2, 6]:
             if m == 6 and self.btns_coord[m].IsEnabled():
                 for n in [0, 1, 2]:
@@ -427,29 +422,27 @@ class NeuronavigationPanel(wx.Panel):
                 for n in [0, 1, 2]:
                     self.numctrls_coord[m][n].SetValue(float(self.current_coord[n]))
  
-    def UpdateObjectRegistration(self, pubsub_evt):
-        if pubsub_evt.data:
-            self.obj_reg = pubsub_evt.data
+    def UpdateObjectRegistration(self, data=None):
+        if data:
+            self.obj_reg = data
             self.obj_reg_status = True
         else:
             self.obj_reg = None
             self.obj_reg_status = False
  
-    def UpdateTrackObjectState(self, pubsub_evt):
-        if pubsub_evt.data[0]:
-            self.track_obj = pubsub_evt.data[0]
-        else:
-            self.track_obj = False
+    def UpdateTrackObjectState(self, evt=None, flag=None, obj_name=None):
+        self.track_obj = flag
  
-    def UpdateTriggerState(self, pubsub_evt):
-        self.trigger_state = pubsub_evt.data
+    def UpdateTriggerState(self, trigger_state):
+        self.trigger_state = trigger_state
  
-    def OnDisconnectTracker(self, pubsub_evt):
+    def OnDisconnectTracker(self):
         if self.tracker_id:
             dt.TrackerConnection(self.tracker_id, self.trk_init[0], 'disconnect')
  
     def OnChoiceTracker(self, evt, ctrl):
-        Publisher.sendMessage('Update status text in GUI', _("Configuring tracker ..."))
+        Publisher.sendMessage('Update status text in GUI',
+                              label=_("Configuring tracker ..."))
         if hasattr(evt, 'GetSelection'):
             choice = evt.GetSelection()
         else:
@@ -464,24 +457,28 @@ class NeuronavigationPanel(wx.Panel):
         # has been initialized before
         if trck and choice != 6:
             self.ResetTrackerFiducials()
-            Publisher.sendMessage('Update status text in GUI', _("Disconnecting tracker..."))
+            Publisher.sendMessage('Update status text in GUI',
+                                  label=_("Disconnecting tracker..."))
             Publisher.sendMessage('Remove sensors ID')
             self.trk_init = dt.TrackerConnection(self.tracker_id, trck, 'disconnect')
             self.tracker_id = choice
             if not self.trk_init[0] and choice:
-                Publisher.sendMessage('Update status text in GUI', _("Tracker disconnected successfully"))
+                Publisher.sendMessage('Update status text in GUI',
+                                      label=_("Tracker disconnected successfully"))
                 self.trk_init = dt.TrackerConnection(self.tracker_id, None, 'connect')
                 if not self.trk_init[0]:
                     dlg.NavigationTrackerWarning(self.tracker_id, self.trk_init[1])
                     ctrl.SetSelection(0)
                     print("Tracker not connected!")
                 else:
-                    Publisher.sendMessage('Update status text in GUI', _("Ready"))
+                    Publisher.sendMessage('Update status text in GUI',
+                                          label=_("Ready"))
                     ctrl.SetSelection(self.tracker_id)
                     print("Tracker connected!")
         elif choice == 6:
             if trck:
-                Publisher.sendMessage('Update status text in GUI', _("Disconnecting tracker ..."))
+                Publisher.sendMessage('Update status text in GUI',
+                                      label=_("Disconnecting tracker ..."))
                 Publisher.sendMessage('Remove sensors ID')
                 self.trk_init = dt.TrackerConnection(self.tracker_id, trck, 'disconnect')
                 if not self.trk_init[0]:
@@ -489,10 +486,12 @@ class NeuronavigationPanel(wx.Panel):
                         dlg.NavigationTrackerWarning(self.tracker_id, 'disconnect')
                     self.tracker_id = 0
                     ctrl.SetSelection(self.tracker_id)
-                    Publisher.sendMessage('Update status text in GUI', _("Tracker disconnected"))
+                    Publisher.sendMessage('Update status text in GUI',
+                                          label=_("Tracker disconnected"))
                     print("Tracker disconnected!")
                 else:
-                    Publisher.sendMessage('Update status text in GUI', _("Tracker still connected"))
+                    Publisher.sendMessage('Update status text in GUI',
+                                          label=_("Tracker still connected"))
                     print("Tracker still connected!")
             else:
                 ctrl.SetSelection(self.tracker_id)
@@ -507,9 +506,11 @@ class NeuronavigationPanel(wx.Panel):
                     self.tracker_id = 0
                     ctrl.SetSelection(self.tracker_id)
                 else:
-                    Publisher.sendMessage('Update status text in GUI', _("Ready"))
+                    Publisher.sendMessage('Update status text in GUI',
+                                          label=_("Ready"))
  
-        Publisher.sendMessage('Update tracker initializer', (self.tracker_id, self.trk_init, self.ref_mode_id))
+        Publisher.sendMessage('Update tracker initializer',
+                              nav_prop=(self.tracker_id, self.trk_init, self.ref_mode_id))
  
     def OnChoiceRefMode(self, evt, ctrl):
         # When ref mode is changed the tracker coordinates are set to zero
@@ -518,7 +519,8 @@ class NeuronavigationPanel(wx.Panel):
         # Some trackers do not accept restarting within this time window
         # TODO: Improve the restarting of trackers after changing reference mode
         # self.OnChoiceTracker(None, ctrl)
-        Publisher.sendMessage('Update tracker initializer', (self.tracker_id, self.trk_init, self.ref_mode_id))
+        Publisher.sendMessage('Update tracker initializer',
+                              nav_prop=(self.tracker_id, self.trk_init, self.ref_mode_id))
         print("Reference mode changed!")
  
     def OnSetImageCoordinates(self, evt):
@@ -529,10 +531,10 @@ class NeuronavigationPanel(wx.Panel):
                      self.numctrls_coord[btn_id][1].GetValue(),\
                      self.numctrls_coord[btn_id][2].GetValue()
  
-        Publisher.sendMessage('Set ball reference position', (ux, uy, uz))
+        Publisher.sendMessage('Set ball reference position', position=(ux, uy, uz))
         # Publisher.sendMessage('Set camera in volume', (ux, uy, uz))
-        Publisher.sendMessage('Co-registered points', ((ux, uy, uz), (0., 0., 0.)))
-        Publisher.sendMessage('Update cross position', (ux, uy, uz))
+        Publisher.sendMessage('Co-registered points', arg=(ux, uy, uz), position=(0., 0., 0.))
+        Publisher.sendMessage('Update cross position', position=(ux, uy, uz))
  
     def OnImageFiducials(self, evt):
         btn_id = list(const.BTNS_IMG_MKS[evt.GetId()].keys())[0]
@@ -544,13 +546,13 @@ class NeuronavigationPanel(wx.Panel):
                     self.numctrls_coord[btn_id][2].GetValue(), 0, 0, 0
  
             self.fiducials[btn_id, :] = coord[0:3]
-            Publisher.sendMessage('Create marker', (coord, marker_id))
+            Publisher.sendMessage('Create marker', coord=coord, marker_id=marker_id)
         else:
             for n in [0, 1, 2]:
                 self.numctrls_coord[btn_id][n].SetValue(float(self.current_coord[n]))
  
             self.fiducials[btn_id, :] = np.nan
-            Publisher.sendMessage('Delete fiducial marker', marker_id)
+            Publisher.sendMessage('Delete fiducial marker', marker_id=marker_id)
  
     def OnTrackerFiducials(self, evt):
         btn_id = list(const.BTNS_TRK[evt.GetId()].keys())[0]
@@ -627,8 +629,8 @@ class NeuronavigationPanel(wx.Panel):
                 if self.trigger_state:
                     self.trigger = trig.Trigger(nav_id)
  
-                Publisher.sendMessage("Navigation status", True)
-                Publisher.sendMessage("Toggle Cross", const.SLICE_STATE_CROSS)
+                Publisher.sendMessage("Navigation status", status=True)
+                Publisher.sendMessage("Toggle Cross", id=const.SLICE_STATE_CROSS)
                 Publisher.sendMessage("Hide current mask")
  
                 if self.track_obj:
@@ -682,7 +684,7 @@ class NeuronavigationPanel(wx.Panel):
  
             self.correg.stop()
  
-            Publisher.sendMessage("Navigation status", False)
+            Publisher.sendMessage("Navigation status", status=False)
  
     def ResetImageFiducials(self):
         for m in range(0, 3):
@@ -703,13 +705,13 @@ class NeuronavigationPanel(wx.Panel):
         self.txtctrl_fre.SetValue('')
         self.txtctrl_fre.SetBackgroundColour('WHITE')
  
-    def OnCloseProject(self, pubsub_evt):
+    def OnCloseProject(self):
         self.ResetTrackerFiducials()
         self.ResetImageFiducials()
         self.OnChoiceTracker(False, self.choice_trck)
-        Publisher.sendMessage('Update object registration', False)
-        Publisher.sendMessage('Update track object state', (False, False))
-        Publisher.sendMessage('Delete all markers', 'close')
+        Publisher.sendMessage('Update object registration')
+        Publisher.sendMessage('Update track object state', flag=False, obj_name=False)
+        Publisher.sendMessage('Delete all markers')
         # TODO: Reset camera initial focus
         Publisher.sendMessage('Reset cam clipping range')
  
@@ -838,11 +840,11 @@ class ObjectRegistrationPanel(wx.Panel):
         Publisher.subscribe(self.UpdateNavigationStatus, 'Navigation status')
         Publisher.subscribe(self.OnCloseProject, 'Close project data')
  
-    def UpdateTrackerInit(self, pubsub_evt):
-        self.nav_prop = pubsub_evt.data
+    def UpdateTrackerInit(self, nav_prop):
+        self.nav_prop = nav_prop
  
-    def UpdateNavigationStatus(self, pubsub_evt):
-        nav_status = pubsub_evt.data
+    def UpdateNavigationStatus(self, status):
+        nav_status = status
         if nav_status:
             self.checkrecordcoords.Enable(1)
             self.checktrack.Enable(0)
@@ -861,10 +863,10 @@ class ObjectRegistrationPanel(wx.Panel):
                 Publisher.sendMessage('Enable target button', True)
  
     def OnSelectAngleThreshold(self, evt, ctrl):
-        Publisher.sendMessage('Update angle threshold', ctrl.GetValue())
+        Publisher.sendMessage('Update angle threshold', angle=ctrl.GetValue())
  
     def OnSelectDistThreshold(self, evt, ctrl):
-        Publisher.sendMessage('Update dist threshold', ctrl.GetValue())
+        Publisher.sendMessage('Update dist threshold', dist_threshold=ctrl.GetValue())
  
     def OnSelectTimestamp(self, evt, ctrl):
         self.timestamp = ctrl.GetValue()
@@ -880,7 +882,7 @@ class ObjectRegistrationPanel(wx.Panel):
             None
  
     def OnTrackObject(self, evt, ctrl):
-        Publisher.sendMessage('Update track object state', (evt.GetSelection(), self.obj_name))
+        Publisher.sendMessage('Update track object state', flag=evt.GetSelection(), obj_name=self.obj_name)
  
     def OnComboCoil(self, evt):
         # coil_name = evt.GetString()
@@ -897,8 +899,9 @@ class ObjectRegistrationPanel(wx.Panel):
                     if np.isfinite(self.obj_fiducials).all() and np.isfinite(self.obj_orients).all():
                         self.checktrack.Enable(1)
                         Publisher.sendMessage('Update object registration',
-                                              (self.obj_fiducials, self.obj_orients, self.obj_ref_mode, self.obj_name))
-                        Publisher.sendMessage('Update status text in GUI', _("Ready"))
+                                              data=(self.obj_fiducials, self.obj_orients, self.obj_ref_mode, self.obj_name))
+                        Publisher.sendMessage('Update status text in GUI',
+                                              label=_("Ready"))
  
             except wx._core.PyAssertionError:  # TODO FIX: win64
                 pass
@@ -923,8 +926,8 @@ class ObjectRegistrationPanel(wx.Panel):
  
             self.checktrack.Enable(1)
             Publisher.sendMessage('Update object registration',
-                                  (self.obj_fiducials, self.obj_orients, self.obj_ref_mode, self.obj_name))
-            Publisher.sendMessage('Update status text in GUI', _("Ready"))
+                                  data=(self.obj_fiducials, self.obj_orients, self.obj_ref_mode, self.obj_name))
+            Publisher.sendMessage('Update status text in GUI', label=_("Ready"))
             wx.MessageBox(_("Object file successfully loaded"), _("Load"))
  
     def ShowSaveObjectDialog(self, evt):
@@ -938,7 +941,7 @@ class ObjectRegistrationPanel(wx.Panel):
                 np.savetxt(filename, data, fmt='%.4f', delimiter='\t', newline='\n', header=hdr)
                 wx.MessageBox(_("Object file successfully saved"), _("Save"))
  
-    def OnCloseProject(self, pubsub_evt):
+    def OnCloseProject(self):
         self.checkrecordcoords.SetValue(False)
         self.checkrecordcoords.Enable(0)
         self.checktrack.SetValue(False)
@@ -1054,12 +1057,12 @@ class MarkersPanel(wx.Panel):
         Publisher.subscribe(self.OnCreateMarker, 'Create marker')
         Publisher.subscribe(self.UpdateNavigationStatus, 'Navigation status')
  
-    def UpdateCurrentCoord(self, pubsub_evt):
-        self.current_coord = pubsub_evt.data[1][:]
+    def UpdateCurrentCoord(self, arg, position):
+        self.current_coord = position[:]
         #self.current_angle = pubsub_evt.data[1][3:]
  
-    def UpdateNavigationStatus(self, pubsub_evt):
-        if pubsub_evt.data is False:
+    def UpdateNavigationStatus(self, status):
+        if not status:
             sleep(0.5)
             #self.current_coord[3:] = 0, 0, 0
             self.nav_status = False
@@ -1080,7 +1083,7 @@ class MarkersPanel(wx.Panel):
         menu_id.Destroy()
  
     def OnItemBlink(self, evt):
-        Publisher.sendMessage('Blink Marker', self.lc.GetFocusedItem())
+        Publisher.sendMessage('Blink Marker', index=self.lc.GetFocusedItem())
  
     def OnStopItemBlink(self, evt):
         Publisher.sendMessage('Stop Blink Marker')
@@ -1107,7 +1110,7 @@ class MarkersPanel(wx.Panel):
  
         if self.tgt_flag:
             self.lc.SetItemBackgroundColour(self.tgt_index, 'white')
-            Publisher.sendMessage('Set target transparency', [False, self.tgt_index])
+            Publisher.sendMessage('Set target transparency', status=False, index=self.tgt_index)
             self.lc.SetStringItem(self.tgt_index, 4, '')
             # Add the new ID to exported list
             if len(self.list_coord[self.tgt_index]) > 8:
@@ -1118,16 +1121,16 @@ class MarkersPanel(wx.Panel):
         self.tgt_index = self.lc.GetFocusedItem()
         self.lc.SetItemBackgroundColour(self.tgt_index, 'RED')
  
-        Publisher.sendMessage('Update target', self.list_coord[self.tgt_index])
-        Publisher.sendMessage('Set target transparency', [True, self.tgt_index])
-        Publisher.sendMessage('Disable or enable coil tracker', True)
+        Publisher.sendMessage('Update target', coord=self.list_coord[self.tgt_index])
+        Publisher.sendMessage('Set target transparency', status=True, index=self.tgt_index)
+        Publisher.sendMessage('Disable or enable coil tracker', status=True)
         self.OnMenuEditMarkerId('TARGET')
         self.tgt_flag = True
         dlg.NewTarget()
  
-    def OnDeleteAllMarkers(self, evt):
+    def OnDeleteAllMarkers(self, evt=None):
         if self.list_coord:
-            if hasattr(evt, 'data'):
+            if evt is None:
                 result = wx.ID_OK
             else:
                 result = dlg.DeleteAllMarkers()
@@ -1135,22 +1138,21 @@ class MarkersPanel(wx.Panel):
             if result == wx.ID_OK:
                 self.list_coord = []
                 self.marker_ind = 0
-                Publisher.sendMessage('Remove all markers', self.lc.GetItemCount())
+                Publisher.sendMessage('Remove all markers', indexes=self.lc.GetItemCount())
                 self.lc.DeleteAllItems()
-                Publisher.sendMessage('Stop Blink Marker', 'DeleteAll')
+                Publisher.sendMessage('Stop Blink Marker', index='DeleteAll')
  
                 if self.tgt_flag:
                     self.tgt_flag = self.tgt_index = None
-                    Publisher.sendMessage('Disable or enable coil tracker', False)
+                    Publisher.sendMessage('Disable or enable coil tracker', status=False)
                     if not hasattr(evt, 'data'):
                         dlg.DeleteTarget()
  
-    def OnDeleteSingleMarker(self, evt):
+    def OnDeleteSingleMarker(self, evt=None, marker_id=None):
         # OnDeleteSingleMarker is used for both pubsub and button click events
         # Pubsub is used for fiducial handle and button click for all others
  
-        if hasattr(evt, 'data'):
-            marker_id = evt.data
+        if marker_id is not None:
             if self.lc.GetItemCount():
                 for id_n in range(self.lc.GetItemCount()):
                     item = self.lc.GetItem(id_n, 4)
@@ -1168,7 +1170,7 @@ class MarkersPanel(wx.Panel):
         if index:
             if self.tgt_flag and self.tgt_index == index[0]:
                 self.tgt_flag = self.tgt_index = None
-                Publisher.sendMessage('Disable or enable coil tracker', False)
+                Publisher.sendMessage('Disable or enable coil tracker', status=False)
                 dlg.DeleteTarget()
             self.DeleteMarker(index)
         else:
@@ -1181,14 +1183,14 @@ class MarkersPanel(wx.Panel):
             for n in range(0, self.lc.GetItemCount()):
                 self.lc.SetStringItem(n, 0, str(n+1))
             self.marker_ind -= 1
-        Publisher.sendMessage('Remove marker', index)
+        Publisher.sendMessage('Remove marker', index=index)
  
-    def OnCreateMarker(self, evt):
+    def OnCreateMarker(self, evt=None, coord=None, marker_id=None):
         # OnCreateMarker is used for both pubsub and button click events
         # Pubsub is used for markers created with fiducial buttons, trigger and create marker button
-        if hasattr(evt, 'data'):
-            if evt.data is not None:
-                self.CreateMarker(evt.data[0], (0.0, 1.0, 0.0), self.marker_size, evt.data[1])
+        if evt is None:
+            if coord:
+                self.CreateMarker(coord, (0.0, 1.0, 0.0), self.marker_size, marker_id)
             else:
                 self.CreateMarker(self.current_coord, self.marker_colour, self.marker_size)
         else:
@@ -1212,7 +1214,7 @@ class MarkersPanel(wx.Panel):
                         if len(line) == 11:
                             for i in const.BTNS_IMG_MKS:
                                 if line[10] in list(const.BTNS_IMG_MKS[i].values())[0]:
-                                    Publisher.sendMessage('Load image fiducials', (line[10], coord))
+                                    Publisher.sendMessage('Load image fiducials', marker_id=line[10], coord=coord)
                                 elif line[10] == 'TARGET':
                                     target = count_line
                         else:
@@ -1230,7 +1232,7 @@ class MarkersPanel(wx.Panel):
                         if len(line) == 8:
                             for i in const.BTNS_IMG_MKS:
                                 if line[7] in list(const.BTNS_IMG_MKS[i].values())[0]:
-                                    Publisher.sendMessage('Load image fiducials', (line[7], coord))
+                                    Publisher.sendMessage('Load image fiducials', marker_id=line[7], coord=coord)
                         else:
                             line.append("")
                         self.CreateMarker(coord, colour, size, line[7])
@@ -1241,10 +1243,10 @@ class MarkersPanel(wx.Panel):
     def OnMarkersVisibility(self, evt, ctrl):
  
         if ctrl.GetValue():
-            Publisher.sendMessage('Hide all markers',  self.lc.GetItemCount())
+            Publisher.sendMessage('Hide all markers',  indexes=self.lc.GetItemCount())
             ctrl.SetLabel('Show')
         else:
-            Publisher.sendMessage('Show all markers',  self.lc.GetItemCount())
+            Publisher.sendMessage('Show all markers',  indexes=self.lc.GetItemCount())
             ctrl.SetLabel('Hide')
  
     def OnSaveMarkers(self, evt):
@@ -1278,7 +1280,7 @@ class MarkersPanel(wx.Panel):
         # TODO: Use matrix coordinates and not world coordinates as current method.
         # This makes easier for inter-software comprehension.
  
-        Publisher.sendMessage('Add marker', (self.marker_ind, size, colour,  coord[0:3]))
+        Publisher.sendMessage('Add marker', ball_id=self.marker_ind, size=size, colour=colour,  coord=coord[0:3])
  
         self.marker_ind += 1
  
@@ -190,7 +190,7 @@ class InnerTaskPanel(wx.Panel):
                                "overwrite": overwrite}
  
                 Publisher.sendMessage('Create surface from index',
-                                      {'method': method, 'options': srf_options})
+                                      surface_parameters={'method': method, 'options': srf_options})
                 Publisher.sendMessage('Fold surface task')
  
         else:
@@ -218,7 +218,9 @@ class InnerTaskPanel(wx.Panel):
             mask_name, thresh, colour = dialog.GetValue()
             if mask_name:
                 Publisher.sendMessage('Create new mask',
-                                            (mask_name, thresh, colour))
+                                      mask_name=mask_name,
+                                      thresh=thresh,
+                                      colour=colour)
         dialog.Destroy()
  
     def GetMaskSelected(self):
@@ -371,23 +373,21 @@ class InnerFoldPanel(wx.Panel):
  
         if self.__id_editor == id:
             if closed:
-                Publisher.sendMessage('Disable style', const.SLICE_STATE_EDITOR)
+                Publisher.sendMessage('Disable style', style=const.SLICE_STATE_EDITOR)
                 self.last_style = None
             else:
-                Publisher.sendMessage('Enable style',
-                                      const.SLICE_STATE_EDITOR)
+                Publisher.sendMessage('Enable style', style=const.SLICE_STATE_EDITOR)
                 self.last_style = const.SLICE_STATE_EDITOR
         elif self.__id_watershed == id:
             if closed:
-                Publisher.sendMessage('Disable style',
-                                      const.SLICE_STATE_WATERSHED)
+                Publisher.sendMessage('Disable style', style=const.SLICE_STATE_WATERSHED)
                 self.last_style = None
             else:
-                Publisher.sendMessage('Enable style', const.SLICE_STATE_WATERSHED)
-                Publisher.sendMessage('Show help message', 'Mark the object and the background')
+                Publisher.sendMessage('Enable style', style=const.SLICE_STATE_WATERSHED)
+                #  Publisher.sendMessage('Show help message', 'Mark the object and the background')
                 self.last_style = const.SLICE_STATE_WATERSHED
         else:
-            Publisher.sendMessage('Disable style', const.SLICE_STATE_EDITOR)
+            Publisher.sendMessage('Disable style', style=const.SLICE_STATE_EDITOR)
             self.last_style = None
  
         evt.Skip()
@@ -399,18 +399,18 @@ class InnerFoldPanel(wx.Panel):
         self.fold_panel.SetMinSize((self.fold_panel.GetSize()[0], sizeNeeded ))
         self.fold_panel.SetSize((self.fold_panel.GetSize()[0], sizeNeeded))
  
-    def OnRetrieveStyle(self, pubsub_evt):
+    def OnRetrieveStyle(self):
         if (self.last_style == const.SLICE_STATE_EDITOR):
-            Publisher.sendMessage('Enable style', const.SLICE_STATE_EDITOR)
+            Publisher.sendMessage('Enable style', style=const.SLICE_STATE_EDITOR)
  
-    def OnDisableStyle(self, pubsub_evt):
+    def OnDisableStyle(self):
         if (self.last_style == const.SLICE_STATE_EDITOR):
-            Publisher.sendMessage('Disable style', const.SLICE_STATE_EDITOR)
+            Publisher.sendMessage('Disable style', style=const.SLICE_STATE_EDITOR)
  
-    def OnCloseProject(self, pubsub_evt):
+    def OnCloseProject(self):
         self.fold_panel.Expand(self.fold_panel.GetFoldPanel(0))
  
-    def OnColapsePanel(self, pubsub_evt):
+    def OnColapsePanel(self, panel_id):
         panel_seg_id = {
             const.ID_THRESHOLD_SEGMENTATION: 0,
             const.ID_MANUAL_SEGMENTATION: 1,
@@ -418,7 +418,7 @@ class InnerFoldPanel(wx.Panel):
         }
  
         try:
-            _id = panel_seg_id[pubsub_evt.data]
+            _id = panel_seg_id[panel_id]
             self.fold_panel.Expand(self.fold_panel.GetFoldPanel(_id))
         except KeyError:
             pass
@@ -515,7 +515,7 @@ class MaskProperties(wx.Panel):
         Publisher.subscribe(self.OnCloseProject, 'Close project data')
         Publisher.subscribe(self.SetThresholdValues2, 'Set threshold values')
  
-    def OnCloseProject(self, pubsub_evt):
+    def OnCloseProject(self):
         self.CloseProject()
  
     def CloseProject(self):
@@ -526,9 +526,8 @@ class MaskProperties(wx.Panel):
         for i in range(n-1, -1, -1):
             self.combo_thresh.Delete(i)
  
-    def OnRemoveMasks(self, pubsub_evt):
-        list_index = pubsub_evt.data
-        for i in list_index:
+    def OnRemoveMasks(self, mask_indexes):
+        for i in mask_indexes:
             self.combo_mask_name.Delete(i)
  
         if self.combo_mask_name.IsEmpty():
@@ -543,20 +542,18 @@ class MaskProperties(wx.Panel):
         self.combo_mask_name.Bind(wx.EVT_COMBOBOX, self.OnComboName)
         self.button_colour.Bind(csel.EVT_COLOURSELECT, self.OnSelectColour)
  
-    def SelectMaskName(self, pubsub_evt):
-        index = pubsub_evt.data
+    def SelectMaskName(self, index):
         if index >= 0:
             self.combo_mask_name.SetSelection(index)
         else:
             self.combo_mask_name.SetValue('')
  
-    def ChangeMaskName(self, pubsub_evt):
-        index, name = pubsub_evt.data
+    def ChangeMaskName(self, index, name):
         self.combo_mask_name.SetString(index, name)
         self.combo_mask_name.Refresh()
  
-    def SetThresholdValues(self, pubsub_evt):
-        thresh_min, thresh_max = pubsub_evt.data
+    def SetThresholdValues(self, threshold_range):
+        thresh_min, thresh_max = threshold_range
         self.bind_evt_gradient = False
         self.gradient.SetMinValue(thresh_min)
         self.gradient.SetMaxValue(thresh_max)
@@ -572,8 +569,8 @@ class MaskProperties(wx.Panel):
             self.combo_thresh.SetSelection(index)
             Project().threshold_modes[_("Custom")] = (thresh_min, thresh_max)
  
-    def SetThresholdValues2(self, pubsub_evt):
-        thresh_min, thresh_max = pubsub_evt.data
+    def SetThresholdValues2(self, threshold_range):
+        thresh_min, thresh_max = threshold_range
         self.gradient.SetMinValue(thresh_min)
         self.gradient.SetMaxValue(thresh_max)
         thresh = (thresh_min, thresh_max)
@@ -586,17 +583,16 @@ class MaskProperties(wx.Panel):
             self.combo_thresh.SetSelection(index)
             Project().threshold_modes[_("Custom")] = (thresh_min, thresh_max)
  
-    def SetItemsColour(self, evt_pubsub):
-        colour = evt_pubsub.data
+    def SetItemsColour(self, colour):
         self.gradient.SetColour(colour)
         self.button_colour.SetColour(colour)
  
-    def AddMask(self, evt_pubsub):
+    def AddMask(self, mask):
         if self.combo_mask_name.IsEmpty():
             self.Enable()
-        mask_name = evt_pubsub.data[1]
-        mask_thresh = evt_pubsub.data[2]
-        mask_colour = [int(c*255) for c in evt_pubsub.data[3]]
+        mask_name = mask.name
+        mask_thresh = mask.threshold_range
+        mask_colour = [int(c*255) for c in mask.colour]
         index = self.combo_mask_name.Append(mask_name)
         #  self.combo_mask_name.SetSelection(index)
         #  self.button_colour.SetColour(mask_colour)
@@ -607,8 +603,7 @@ class MaskProperties(wx.Panel):
         x = self.combo_mask_name.GetSelection()
         return self.combo_mask_name.GetSelection()
  
-    def SetThresholdModes(self, pubsub_evt):
-        (thresh_modes_names, default_thresh) = pubsub_evt.data
+    def SetThresholdModes(self, thresh_modes_names, default_thresh):
         self.combo_thresh.SetItems(thresh_modes_names)
         self.threshold_modes_names = thresh_modes_names
         proj = Project()
@@ -635,17 +630,17 @@ class MaskProperties(wx.Panel):
         self.gradient.SetMinValue(thresh_min)
         self.gradient.SetMaxValue(thresh_max)
  
-    def SetThresholdBounds(self, pubsub_evt):
-        thresh_min = pubsub_evt.data[0]
-        thresh_max  = pubsub_evt.data[1]
+    def SetThresholdBounds(self, threshold_range):
+        thresh_min = threshold_range[0]
+        thresh_max = threshold_range[1]
         self.gradient.SetMinRange(thresh_min)
         self.gradient.SetMaxRange(thresh_max)
  
     def OnComboName(self, evt):
         mask_name = evt.GetString()
         mask_index = evt.GetSelection()
-        Publisher.sendMessage('Change mask selected', mask_index)
-        Publisher.sendMessage('Show mask', (mask_index, True))
+        Publisher.sendMessage('Change mask selected', index=mask_index)
+        Publisher.sendMessage('Show mask', index=mask_index, value=True)
  
     def OnComboThresh(self, evt):
         (thresh_min, thresh_max) = Project().threshold_modes[evt.GetString()]
@@ -658,7 +653,7 @@ class MaskProperties(wx.Panel):
         thresh_min = self.gradient.GetMinValue()
         thresh_max = self.gradient.GetMaxValue()
         Publisher.sendMessage('Set threshold values',
-                                    (thresh_min, thresh_max))
+                              threshold_range=(thresh_min, thresh_max))
         session = ses.Session()
         session.ChangeProject()
  
@@ -666,14 +661,14 @@ class MaskProperties(wx.Panel):
         thresh_min = self.gradient.GetMinValue()
         thresh_max = self.gradient.GetMaxValue()
         Publisher.sendMessage('Changing threshold values',
-                                    (thresh_min, thresh_max))
+                                    threshold_range=(thresh_min, thresh_max))
         session = ses.Session()
         session.ChangeProject()
  
     def OnSelectColour(self, evt):
         colour = evt.GetValue()[:3]
         self.gradient.SetColour(colour)
-        Publisher.sendMessage('Change mask colour', colour)
+        Publisher.sendMessage('Change mask colour', colour=colour)
  
 class EditionTools(wx.Panel):
     def __init__(self, parent):
@@ -778,25 +773,23 @@ class EditionTools(wx.Panel):
         Publisher.subscribe(self.SetGradientColour, 'Add mask')
         Publisher.subscribe(self._set_brush_size, 'Set edition brush size')
  
-    def ChangeMaskColour(self, pubsub_evt):
-        colour = pubsub_evt.data
+    def ChangeMaskColour(self, colour):
         self.gradient_thresh.SetColour(colour)
  
-    def SetGradientColour(self, pubsub_evt):
-        vtk_colour = pubsub_evt.data[3]
-        wx_colour = [c*255 for c in vtk_colour]
+    def SetGradientColour(self, mask):
+        wx_colour = [c*255 for c in mask.colour]
         self.gradient_thresh.SetColour(wx_colour)
  
-    def SetThresholdValues(self, pubsub_evt):
-        thresh_min, thresh_max = pubsub_evt.data
+    def SetThresholdValues(self, threshold_range):
+        thresh_min, thresh_max = threshold_range
         self.bind_evt_gradient = False
         self.gradient_thresh.SetMinValue(thresh_min)
         self.gradient_thresh.SetMaxValue(thresh_max)
         self.bind_evt_gradient = True
  
-    def SetThresholdBounds(self, pubsub_evt):
-        thresh_min = pubsub_evt.data[0]
-        thresh_max  = pubsub_evt.data[1]
+    def SetThresholdBounds(self, threshold_range):
+        thresh_min = threshold_range[0]
+        thresh_max = threshold_range[1]
         self.gradient_thresh.SetMinRange(thresh_min)
         self.gradient_thresh.SetMaxRange(thresh_max)
         self.gradient_thresh.SetMinValue(thresh_min)
@@ -807,7 +800,7 @@ class EditionTools(wx.Panel):
         thresh_max = self.gradient_thresh.GetMaxValue()
         if self.bind_evt_gradient:
             Publisher.sendMessage('Set edition threshold values',
-                                     (thresh_min, thresh_max))
+                                  threshold_range=(thresh_min, thresh_max))
  
     def OnMenu(self, evt):
         SQUARE_BMP = wx.Bitmap(os.path.join(const.ICON_DIR, "brush_square.jpg"), wx.BITMAP_TYPE_JPEG)
@@ -820,22 +813,21 @@ class EditionTools(wx.Panel):
  
         self.btn_brush_format.SetBitmap(bitmap[evt.GetId()])
  
-        Publisher.sendMessage('Set brush format', brush[evt.GetId()])
+        Publisher.sendMessage('Set brush format', cursor_format=brush[evt.GetId()])
  
     def OnBrushSize(self, evt):
         """ """
         # FIXME: Using wx.EVT_SPINCTRL in MacOS it doesnt capture changes only
         # in the text ctrl - so we are capturing only changes on text
         # Strangelly this is being called twice
-        Publisher.sendMessage('Set edition brush size',self.spin.GetValue())
+        Publisher.sendMessage('Set edition brush size', size=self.spin.GetValue())
  
-    def _set_brush_size(self, pubsub_evt):
-        size = pubsub_evt.data
+    def _set_brush_size(self, size):
         self.spin.SetValue(size)
  
     def OnComboBrushOp(self, evt):
         brush_op_id = evt.GetSelection()
-        Publisher.sendMessage('Set edition operation', brush_op_id)
+        Publisher.sendMessage('Set edition operation', operation=brush_op_id)
         if brush_op_id == const.BRUSH_THRESH:
             self.gradient_thresh.Enable()
         else:
@@ -959,25 +951,24 @@ class WatershedTool(EditionTools):
     def __bind_pubsub_evt(self):
         Publisher.subscribe(self._set_brush_size, 'Set watershed brush size')
  
-    def ChangeMaskColour(self, pubsub_evt):
-        colour = pubsub_evt.data
+    def ChangeMaskColour(self, colour):
         self.gradient_thresh.SetColour(colour)
  
-    def SetGradientColour(self, pubsub_evt):
-        vtk_colour = pubsub_evt.data[3]
+    def SetGradientColour(self, mask):
+        vtk_colour = mask.colour
         wx_colour = [c*255 for c in vtk_colour]
         self.gradient_thresh.SetColour(wx_colour)
  
-    def SetThresholdValues(self, pubsub_evt):
-        thresh_min, thresh_max = pubsub_evt.data
+    def SetThresholdValues(self, threshold_range):
+        thresh_min, thresh_max = threshold_range
         self.bind_evt_gradient = False
         self.gradient_thresh.SetMinValue(thresh_min)
         self.gradient_thresh.SetMaxValue(thresh_max)
         self.bind_evt_gradient = True
  
-    def SetThresholdBounds(self, pubsub_evt):
-        thresh_min = pubsub_evt.data[0]
-        thresh_max  = pubsub_evt.data[1]
+    def SetThresholdBounds(self, threshold_range):
+        thresh_min = threshold_range[0]
+        thresh_max  = threshold_range[1]
         self.gradient_thresh.SetMinRange(thresh_min)
         self.gradient_thresh.SetMaxRange(thresh_max)
         self.gradient_thresh.SetMinValue(thresh_min)
@@ -994,30 +985,29 @@ class WatershedTool(EditionTools):
  
         self.btn_brush_format.SetBitmap(bitmap[evt.GetId()])
  
-        Publisher.sendMessage('Set watershed brush format', brush[evt.GetId()])
+        Publisher.sendMessage('Set watershed brush format', brush_format=brush[evt.GetId()])
  
     def OnBrushSize(self, evt):
         """ """
         # FIXME: Using wx.EVT_SPINCTRL in MacOS it doesnt capture changes only
         # in the text ctrl - so we are capturing only changes on text
         # Strangelly this is being called twice
-        Publisher.sendMessage('Set watershed brush size',self.spin.GetValue())
+        Publisher.sendMessage('Set watershed brush size', size=self.spin.GetValue())
  
-    def _set_brush_size(self, pubsub_evt):
-        size = pubsub_evt.data
+    def _set_brush_size(self, size):
         self.spin.SetValue(size)
  
     def OnComboBrushOp(self, evt):
         brush_op = self.combo_brush_op.GetValue()
-        Publisher.sendMessage('Set watershed operation', brush_op)
+        Publisher.sendMessage('Set watershed operation', operation=brush_op)
  
     def OnCheckOverwriteMask(self, evt):
         value = self.check_box.GetValue()
-        Publisher.sendMessage('Set overwrite mask', value)
+        Publisher.sendMessage('Set overwrite mask', flag=value)
  
     def OnCheckWWWL(self, evt):
         value = self.ww_wl_cbox.GetValue()
-        Publisher.sendMessage('Set use ww wl', value)
+        Publisher.sendMessage('Set use ww wl', use_ww_wl=value)
  
     def OnConfig(self, evt):
         from invesalius.data.styles import WatershedConfig
@@ -193,9 +193,9 @@ class InnerTaskPanel(wx.Panel):
  
             surface_options = dialog.GetValue()
  
-            Publisher.sendMessage('Create surface from index', surface_options)
+            Publisher.sendMessage('Create surface from index',
+                                  surface_parameters=surface_options)
         dialog.Destroy()
-        
         if evt:
             evt.Skip()
  
@@ -424,12 +424,12 @@ class SurfaceTools(wx.Panel):
  
     def StartSeeding(self):
         print("Start Seeding")
-        Publisher.sendMessage('Enable style', const.VOLUME_STATE_SEED)
+        Publisher.sendMessage('Enable style', style=const.VOLUME_STATE_SEED)
         Publisher.sendMessage('Create surface by seeding - start')
  
     def EndSeeding(self):
         print("End Seeding")
-        Publisher.sendMessage('Disable style', const.VOLUME_STATE_SEED)
+        Publisher.sendMessage('Disable style', style=const.VOLUME_STATE_SEED)
         Publisher.sendMessage('Create surface by seeding - end')
  
  
@@ -515,8 +515,7 @@ class SurfaceProperties(wx.Panel):
         Publisher.subscribe(self.OnRemoveSurfaces, 'Remove surfaces')
  
  
-    def OnRemoveSurfaces(self, pubsub_evt):
-        list_index = pubsub_evt.data
+    def OnRemoveSurfaces(self, surface_indexes):
         s = self.combo_surface_name.GetSelection()
         ns = 0
  
@@ -524,7 +523,7 @@ class SurfaceProperties(wx.Panel):
         new_dict = []
         i = 0
         for n, (name, index) in enumerate(old_dict):
-            if n not in list_index:
+            if n not in surface_indexes:
                 new_dict.append([name, i])
                 if s == n:
                     ns = i
@@ -536,7 +535,7 @@ class SurfaceProperties(wx.Panel):
         if self.surface_list:
             self.combo_surface_name.SetSelection(ns)
  
-    def OnCloseProject(self, pubsub_evt):
+    def OnCloseProject(self):
         self.CloseProject()
  
     def CloseProject(self):
@@ -545,16 +544,14 @@ class SurfaceProperties(wx.Panel):
             self.combo_surface_name.Delete(i)
         self.surface_list = []
  
-    def ChangeSurfaceName(self, pubsub_evt):
-        index, name = pubsub_evt.data
+    def ChangeSurfaceName(self, index, name):
         self.surface_list[index][0] = name
         self.combo_surface_name.SetString(index, name)
  
-    def InsertNewSurface(self, pubsub_evt):
-        #not_update = len(pubsub_evt.data) == 5
-        index = pubsub_evt.data[0]
-        name = pubsub_evt.data[1]
-        colour = [value*255 for value in pubsub_evt.data[2]]
+    def InsertNewSurface(self, surface):
+        index = surface.index
+        name = surface.name
+        colour = [value*255 for value in surface.colour]
         i = 0
         try:
             i = self.surface_list.index([name, index])
@@ -570,21 +567,21 @@ class SurfaceProperties(wx.Panel):
  
         self.combo_surface_name.SetItems([n[0] for n in self.surface_list])
         self.combo_surface_name.SetSelection(i)
-        transparency = 100*pubsub_evt.data[5]
+        transparency = 100*surface.transparency
         self.button_colour.SetColour(colour)
         self.slider_transparency.SetValue(transparency)
-        Publisher.sendMessage('Update surface data', (index))
+        #  Publisher.sendMessage('Update surface data', (index))
  
     def OnComboName(self, evt):
         surface_name = evt.GetString()
         surface_index = evt.GetSelection()
-        Publisher.sendMessage('Change surface selected', self.surface_list[surface_index][1])
+        Publisher.sendMessage('Change surface selected', surface_index=self.surface_list[surface_index][1])
  
     def OnSelectColour(self, evt):
         colour = [value/255.0 for value in evt.GetValue()]
         Publisher.sendMessage('Set surface colour',
-                                    (self.combo_surface_name.GetSelection(),
-                                    colour))
+                              surface_index=self.combo_surface_name.GetSelection(),
+                              colour=colour)
  
     def OnTransparency(self, evt):
         transparency = evt.GetInt()/float(MAX_TRANSPARENCY)
@@ -594,8 +591,8 @@ class SurfaceProperties(wx.Panel):
         if (wx.Platform == "__WXMAC__"):
             transparency = evt.GetInt()/(0.96*float(MAX_TRANSPARENCY))
         Publisher.sendMessage('Set surface transparency',
-                                  (self.combo_surface_name.GetSelection(),
-                                  transparency))
+                              surface_index=self.combo_surface_name.GetSelection(),
+                              transparency=transparency)
  
  
 class QualityAdjustment(wx.Panel):
@@ -128,12 +128,10 @@ class InnerTaskPanel(wx.Panel):
         print("TODO: Send Signal - Add text annotation (both 2d and 3d)")
  
     def OnLinkLinearMeasure(self):
-        Publisher.sendMessage('Enable style',
-                constants.STATE_MEASURE_DISTANCE)
+        Publisher.sendMessage('Enable style', style=constants.STATE_MEASURE_DISTANCE)
  
     def OnLinkAngularMeasure(self):
-        Publisher.sendMessage('Enable style',
-                constants.STATE_MEASURE_ANGLE)
+        Publisher.sendMessage('Enable style', style=constants.STATE_MEASURE_ANGLE)
  
     def OnButton(self, evt):
         id = evt.GetId()
@@ -174,7 +174,7 @@ class CLUTRaycastingWidget(wx.Panel):
             print("Salvando")
             filename = dialog.ShowSavePresetDialog()
             if filename:
-                Publisher.sendMessage('Save raycasting preset', filename)
+                Publisher.sendMessage('Save raycasting preset', preset_name=filename)
         point = self._has_clicked_in_a_point((x, y))
         # A point has been selected. It can be dragged.
         if point:
@@ -181,7 +181,7 @@ class SliceMenu(wx.Menu):
  
         Publisher.subscribe(self._check_projection_menu, 'Check projection menu')
  
-    def FirstItemSelect(self, pusub_evt):
+    def FirstItemSelect(self):
         item = self.ID_TO_TOOL_ITEM[self.id_wl_first]
         item.Check(True)
  
@@ -195,13 +195,12 @@ class SliceMenu(wx.Menu):
         #  item = self.ID_TO_TOOL_ITEM[self.id_tiling_first]
         #  item.Check(True)    
  
-    def CheckWindowLevelOther(self, pubsub_evt):
+    def CheckWindowLevelOther(self):
         item = self.ID_TO_TOOL_ITEM[self.other_wl_id]
         item.Check()
  
-    def _check_projection_menu(self, pubsub_evt):
-        p_id = pubsub_evt.data
-        item = self.projection_items[p_id]
+    def _check_projection_menu(self, projection_id):
+        item = self.projection_items[projection_id]
         item.Check()
  
     def OnPopup(self, evt):
@@ -211,11 +210,12 @@ class SliceMenu(wx.Menu):
         if(key in const.WINDOW_LEVEL.keys()):
             window, level = const.WINDOW_LEVEL[key]
             Publisher.sendMessage('Bright and contrast adjustment image',
-                    (window, level))
-            Publisher.sendMessage('Update window level value',\
-               (window, level))
-            Publisher.sendMessage('Update window and level text',\
-                           "WL: %d  WW: %d"%(level, window))
+                    window=window, level=level)
+            Publisher.sendMessage('Update window level value',
+                                  window=window,
+                                  level=level)
+            #  Publisher.sendMessage('Update window and level text',
+                           #  "WL: %d  WW: %d"%(level, window))
             Publisher.sendMessage('Update slice viewer')
  
             #Necessary update the slice plane in the volume case exists
@@ -223,7 +223,7 @@ class SliceMenu(wx.Menu):
  
         elif(key in const.SLICE_COLOR_TABLE.keys()):
             values = const.SLICE_COLOR_TABLE[key]
-            Publisher.sendMessage('Change colour table from background image', values)
+            Publisher.sendMessage('Change colour table from background image', values=values)
             Publisher.sendMessage('Update slice viewer')
  
             if sys.platform.startswith('linux'):
@@ -238,7 +238,7 @@ class SliceMenu(wx.Menu):
  
         elif key in self.plist_presets:
             values = presets.get_wwwl_preset_colours(self.plist_presets[key])
-            Publisher.sendMessage('Change colour table from background image from plist', values)
+            Publisher.sendMessage('Change colour table from background image from plist', values=values)
             Publisher.sendMessage('Update slice viewer')
  
             if sys.platform.startswith('linux'):
@@ -253,12 +253,12 @@ class SliceMenu(wx.Menu):
  
         elif(key in const.IMAGE_TILING.keys()):
             values = const.IMAGE_TILING[key]
-            Publisher.sendMessage('Set slice viewer layout', values)
+            Publisher.sendMessage('Set slice viewer layout', layout=values)
             Publisher.sendMessage('Update slice viewer')
  
         elif key in PROJECTIONS_ID:
             pid = PROJECTIONS_ID[key]
-            Publisher.sendMessage('Set projection type', pid)
+            Publisher.sendMessage('Set projection type', projection_id=pid)
             Publisher.sendMessage('Reload actual slice')
  
         elif key == _('Custom'):
@@ -290,7 +290,7 @@ class SliceMenu(wx.Menu):
         if self.cdialog:
             self.cdialog.Hide()
  
-    def _close(self, pubsub_evt):
+    def _close(self):
         if self.cdialog:
             self.cdialog.Destroy()
             self.cdialog = None
@@ -64,14 +64,13 @@ class Presets():
             _("Custom"):(0, 0)
         })
         self.__bind_events()
-        
+
     def __bind_events(self):
         Publisher.subscribe(self.UpdateThresholdModes,
-                                'Update threshold limits list')
-        
-    def UpdateThresholdModes(self, evt):
-    
-        thresh_min, thresh_max = evt.data
+                            'Update threshold limits list')
+
+    def UpdateThresholdModes(self, threshold_range):
+        thresh_min, thresh_max = threshold_range
         presets_list = (self.thresh_ct, self.thresh_mri)
  
         for presets in presets_list:
@@ -87,7 +86,7 @@ class Presets():
                     t_min = thresh_min
                 if (t_max > thresh_max):
                     t_max = thresh_max
-                    
+
                 # This has happened in Analyze files
                 # TODO: find a good solution for presets in Analyze files
                 if (t_min > thresh_max):
@@ -96,9 +95,9 @@ class Presets():
                     t_max = thresh_max
  
                 presets[key] = (t_min, t_max)
-                    
-        Publisher.sendMessage('Update threshold limits', (thresh_min,     
-                                    thresh_max))
+
+        Publisher.sendMessage('Update threshold limits',
+                              threshold_range=(thresh_min, thresh_max))
  
     def SavePlist(self, filename):
         filename = "%s$%s" % (filename, 'presets.plist')
@@ -242,12 +242,12 @@ class ProgressBitmapReader:
     def __init__(self):
         Publisher.subscribe(self.CancelLoad, "Cancel bitmap load")
  
-    def CancelLoad(self, evt_pubsub):
+    def CancelLoad(self):
         self.running = False
         self.stoped = True
  
     def SetWindowEvent(self, frame):
-        self.frame = frame          
+        self.frame = frame
  
     def SetDirectoryPath(self, path,recursive=True):
         self.running = True
@@ -255,10 +255,10 @@ class ProgressBitmapReader:
         self.GetBitmaps(path,recursive)
  
     def UpdateLoadFileProgress(self,cont_progress):
-        Publisher.sendMessage("Update bitmap load", cont_progress)
+        Publisher.sendMessage("Update bitmap load", data=cont_progress)
  
     def EndLoadFile(self, bitmap_list):
-        Publisher.sendMessage("End bitmap load", bitmap_list)
+        Publisher.sendMessage("End bitmap load", data=bitmap_list)
  
     def GetBitmaps(self, path, recursive):
  
@@ -359,7 +359,7 @@ def ReadBitmap(filepath):
         except UnicodeDecodeError:
             measures_info = False
         if measures_info:
-            Publisher.sendMessage('Set bitmap spacing', measures_info)
+            Publisher.sendMessage('Set bitmap spacing', spacing=measures_info)
  
         return False
  
@@ -313,7 +313,7 @@ class ProgressDicomReader:
     def __init__(self):
         Publisher.subscribe(self.CancelLoad, "Cancel DICOM load")
  
-    def CancelLoad(self, evt_pubsub):
+    def CancelLoad(self):
         self.running = False
         self.stoped = True
  
@@ -326,10 +326,10 @@ class ProgressDicomReader:
         self.GetDicomGroups(path,recursive)
  
     def UpdateLoadFileProgress(self,cont_progress):
-        Publisher.sendMessage("Update dicom load", cont_progress)
+        Publisher.sendMessage("Update dicom load", data=cont_progress)
  
     def EndLoadFile(self, patient_list):
-        Publisher.sendMessage("End dicom load", patient_list)
+        Publisher.sendMessage("End dicom load", patient_series=patient_list)
  
     def GetDicomGroups(self, path, recursive):
...	...	@@ -47,7 +47,7 @@ try:
47	47	except ImportError:
48	48	from wx import SplashScreen
49	49	#from wx.lib.pubsub import setupv1 #new wx
50		-from wx.lib.pubsub import setuparg1# as psv1
	50	+# from wx.lib.pubsub import setuparg1# as psv1
51	51	#from wx.lib.pubsub import Publisher
52	52	#import wx.lib.pubsub as ps
53	53	from wx.lib.pubsub import pub as Publisher
...	...	@@ -117,7 +117,7 @@ class InVesalius(wx.App):
117	117	Open drag & drop files under darwin
118	118	"""
119	119	path = os.path.abspath(filename)
120		- Publisher.sendMessage('Open project', path)
	120	+ Publisher.sendMessage('Open project', filepath=path)
121	121
122	122	def Startup2(self):
123	123	self.control = self.splash.control
...	...	@@ -347,10 +347,10 @@ def use_cmd_optargs(options, args):
347	347	# If import DICOM argument...
348	348	if options.dicom_dir:
349	349	import_dir = options.dicom_dir
350		- Publisher.sendMessage('Import directory', {'directory': import_dir, 'gui': not options.no_gui})
	350	+ Publisher.sendMessage('Import directory', directory=import_dir, use_gui=not options.no_gui)
351	351
352	352	if options.save:
353		- Publisher.sendMessage('Save project', os.path.abspath(options.save))
	353	+ Publisher.sendMessage('Save project', filepath=os.path.abspath(options.save))
354	354	exit(0)
355	355
356	356	check_for_export(options)
...	...	@@ -360,9 +360,11 @@ def use_cmd_optargs(options, args):
360	360	import invesalius.reader.dicom_reader as dcm
361	361	for patient in dcm.GetDicomGroups(options.import_all):
362	362	for group in patient.GetGroups():
363		- Publisher.sendMessage('Import group', {'group': group, 'gui': not options.no_gui})
	363	+ Publisher.sendMessage('Import group',
	364	+ group=group,
	365	+ use_gui=not options.no_gui)
364	366	check_for_export(options, suffix=group.title, remove_surfaces=False)
365		- Publisher.sendMessage('Remove masks', [0])
	367	+ Publisher.sendMessage('Remove masks', mask_indexes=(0,))
366	368	return True
367	369
368	370	# Check if there is a file path somewhere in what the user wrote
...	...	@@ -373,14 +375,14 @@ def use_cmd_optargs(options, args):
373	375	file = utils.decode(arg, FS_ENCODE)
374	376	if os.path.isfile(file):
375	377	path = os.path.abspath(file)
376		- Publisher.sendMessage('Open project', path)
	378	+ Publisher.sendMessage('Open project', filepath=path)
377	379	check_for_export(options)
378	380	return True
379		-
	381	+
380	382	file = utils.decode(arg, sys.stdin.encoding)
381	383	if os.path.isfile(file):
382	384	path = os.path.abspath(file)
383		- Publisher.sendMessage('Open project', path)
	385	+ Publisher.sendMessage('Open project', filepath=path)
384	386	check_for_export(options)
385	387	return True
386	388
...	...	@@ -428,7 +430,8 @@ def check_for_export(options, suffix='', remove_surfaces=False):
428	430	def export(path_, threshold_range, remove_surface=False):
429	431	import invesalius.constants as const
430	432
431		- Publisher.sendMessage('Set threshold values', threshold_range)
	433	+ Publisher.sendMessage('Set threshold values',
	434	+ threshold_range=threshold_range)
432	435
433	436	surface_options = {
434	437	'method': {
...	...	@@ -443,17 +446,20 @@ def export(path_, threshold_range, remove_surface=False):
443	446	'overwrite': False,
444	447	}
445	448	}
446		- Publisher.sendMessage('Create surface from index', surface_options)
447		- Publisher.sendMessage('Export surface to file', (path_, const.FILETYPE_STL))
	449	+ Publisher.sendMessage('Create surface from index',
	450	+ surface_parameters=surface_options)
	451	+ Publisher.sendMessage('Export surface to file',
	452	+ filename=path_, filetype=const.FILETYPE_STL)
448	453	if remove_surface:
449		- Publisher.sendMessage('Remove surfaces', [0])
	454	+ Publisher.sendMessage('Remove surfaces',
	455	+ surface_indexes=(0,))
450	456
451	457
452		-def print_events(data):
	458	+def print_events(topic=Publisher.AUTO_TOPIC, **msg_data):
453	459	"""
454	460	Print pubsub messages
455	461	"""
456		- utils.debug(data.topic)
	462	+ utils.debug("%s\n\tParameters: %s" % (topic, msg_data))
457	463
458	464	def main():
459	465	"""
...	...
...	...	@@ -108,40 +108,38 @@ class Controller():
108	108
109	109	Publisher.subscribe(self.OnSaveProject, 'Save project')
110	110
111		- def SetBitmapSpacing(self, pubsub_evt):
	111	+ def SetBitmapSpacing(self, spacing):
112	112	proj = prj.Project()
113		- proj.spacing = pubsub_evt.data
	113	+ proj.spacing = spacing
114	114
115		- def OnCancelImport(self, pubsub_evt):
	115	+ def OnCancelImport(self):
116	116	#self.cancel_import = True
117	117	Publisher.sendMessage('Hide import panel')
118	118
119	119
120		- def OnCancelImportBitmap(self, pubsub_evt):
	120	+ def OnCancelImportBitmap(self):
121	121	#self.cancel_import = True
122	122	Publisher.sendMessage('Hide import bitmap panel')
123	123
124	124	###########################
125	125	###########################
126	126
127		- def OnShowDialogImportDirectory(self, pubsub_evt):
	127	+ def OnShowDialogImportDirectory(self):
128	128	self.ShowDialogImportDirectory()
129	129
130		- def OnShowDialogImportOtherFiles(self, pubsub_evt):
131		- id_type = pubsub_evt.data
	130	+ def OnShowDialogImportOtherFiles(self, id_type):
132	131	self.ShowDialogImportOtherFiles(id_type)
133	132
134		- def OnShowDialogOpenProject(self, pubsub_evt):
	133	+ def OnShowDialogOpenProject(self):
135	134	self.ShowDialogOpenProject()
136	135
137		- def OnShowDialogSaveProject(self, pubsub_evt):
138		- saveas = pubsub_evt.data
139		- self.ShowDialogSaveProject(saveas)
	136	+ def OnShowDialogSaveProject(self, save_as):
	137	+ self.ShowDialogSaveProject(save_as)
140	138
141		- def OnShowDialogCloseProject(self, pubsub_evt):
	139	+ def OnShowDialogCloseProject(self):
142	140	self.ShowDialogCloseProject()
143	141
144		- def OnShowBitmapFile(self, pubsub_evt):
	142	+ def OnShowBitmapFile(self):
145	143	self.ShowDialogImportBitmapFile()
146	144	###########################
147	145
...	...	@@ -155,10 +153,10 @@ class Controller():
155	153	if answer:
156	154	self.ShowDialogSaveProject()
157	155	self.CloseProject()
158		- #Publisher.sendMessage("Enable state project", False)
	156	+ #Publisher.sendMessage("Enable state project", state=False)
159	157	Publisher.sendMessage('Set project name')
160	158	Publisher.sendMessage("Stop Config Recording")
161		- Publisher.sendMessage("Set slice interaction style", const.STATE_DEFAULT)
	159	+ Publisher.sendMessage("Set slice interaction style", style=const.STATE_DEFAULT)
162	160
163	161	# Import TIFF, BMP, JPEG or PNG
164	162	dirpath = dialog.ShowImportBitmapDirDialog(self.frame)
...	...	@@ -179,10 +177,10 @@ class Controller():
179	177	if answer:
180	178	self.ShowDialogSaveProject()
181	179	self.CloseProject()
182		- #Publisher.sendMessage("Enable state project", False)
	180	+ #Publisher.sendMessage("Enable state project", state=False)
183	181	Publisher.sendMessage('Set project name')
184	182	Publisher.sendMessage("Stop Config Recording")
185		- Publisher.sendMessage("Set slice interaction style", const.STATE_DEFAULT)
	183	+ Publisher.sendMessage("Set slice interaction style", style=const.STATE_DEFAULT)
186	184	# Import project
187	185	dirpath = dialog.ShowImportDirDialog(self.frame)
188	186	if dirpath and not os.listdir(dirpath):
...	...	@@ -200,17 +198,17 @@ class Controller():
200	198	if answer:
201	199	self.ShowDialogSaveProject()
202	200	self.CloseProject()
203		- # Publisher.sendMessage("Enable state project", False)
	201	+ # Publisher.sendMessage("Enable state project", state=False)
204	202	Publisher.sendMessage('Set project name')
205	203	Publisher.sendMessage("Stop Config Recording")
206		- Publisher.sendMessage("Set slice interaction style", const.STATE_DEFAULT)
	204	+ Publisher.sendMessage("Set slice interaction style", style=const.STATE_DEFAULT)
207	205
208	206	# Warning for limited support to Analyze format
209	207	if id_type == const.ID_ANALYZE_IMPORT:
210	208	dialog.ImportAnalyzeWarning()
211	209
212	210	filepath = dialog.ShowImportOtherFilesDialog(id_type)
213		- Publisher.sendMessage("Open other files", filepath)
	211	+ Publisher.sendMessage("Open other files", filepath=filepath)
214	212
215	213	def ShowDialogOpenProject(self):
216	214	# Offer to save current project if necessary
...	...	@@ -265,21 +263,21 @@ class Controller():
265	263	if not answer:
266	264	utils.debug("Close without changes")
267	265	self.CloseProject()
268		- Publisher.sendMessage("Enable state project", False)
	266	+ Publisher.sendMessage("Enable state project", state=False)
269	267	Publisher.sendMessage('Set project name')
270	268	Publisher.sendMessage("Stop Config Recording")
271	269	elif answer == 1:
272	270	self.ShowDialogSaveProject()
273	271	utils.debug("Save changes and close")
274	272	self.CloseProject()
275		- Publisher.sendMessage("Enable state project", False)
	273	+ Publisher.sendMessage("Enable state project", state=False)
276	274	Publisher.sendMessage('Set project name')
277	275	Publisher.sendMessage("Stop Config Recording")
278	276	elif answer == -1:
279	277	utils.debug("Cancel")
280	278	else:
281	279	self.CloseProject()
282		- Publisher.sendMessage("Enable state project", False)
	280	+ Publisher.sendMessage("Enable state project", state=False)
283	281	Publisher.sendMessage('Set project name')
284	282	Publisher.sendMessage("Stop Config Recording")
285	283
...	...	@@ -288,13 +286,10 @@ class Controller():
288	286
289	287
290	288	###########################
291		- def OnOpenProject(self, pubsub_evt):
292		- path = pubsub_evt.data
293		- self.OpenProject(path)
294		-
295		- def OnOpenRecentProject(self, pubsub_evt):
296		- filepath = pubsub_evt.data
	289	+ def OnOpenProject(self, filepath):
	290	+ self.OpenProject(filepath)
297	291
	292	+ def OnOpenRecentProject(self, filepath):
298	293	if os.path.exists(filepath):
299	294	session = ses.Session()
300	295	st = session.project_status
...	...	@@ -325,17 +320,16 @@ class Controller():
325	320	self.Slice.window_width = proj.window
326	321
327	322	Publisher.sendMessage('Update threshold limits list',
328		- proj.threshold_range)
	323	+ threshold_range=proj.threshold_range)
329	324
330	325	self.LoadProject()
331	326
332	327	session = ses.Session()
333	328	session.OpenProject(filepath)
334		- Publisher.sendMessage("Enable state project", True)
	329	+ Publisher.sendMessage("Enable state project", state=True)
335	330
336		- def OnSaveProject(self, pubsub_evt):
337		- path = pubsub_evt.data
338		- self.SaveProject(path)
	331	+ def OnSaveProject(self, filepath):
	332	+ self.SaveProject(filepath)
339	333
340	334	def SaveProject(self, path=None, compress=False):
341	335	Publisher.sendMessage('Begin busy cursor')
...	...	@@ -356,7 +350,7 @@ class Controller():
356	350	Publisher.sendMessage('End busy cursor')
357	351
358	352	def CloseProject(self):
359		- Publisher.sendMessage('Set slice interaction style', const.STATE_DEFAULT)
	353	+ Publisher.sendMessage('Set slice interaction style', style=const.STATE_DEFAULT)
360	354	Publisher.sendMessage('Hide content panel')
361	355	Publisher.sendMessage('Close project data')
362	356
...	...	@@ -390,8 +384,7 @@ class Controller():
390	384	reader.SetDirectoryPath(path)
391	385	Publisher.sendMessage('End busy cursor')
392	386
393		- def Progress(self, evt):
394		- data = evt.data
	387	+ def Progress(self, data):
395	388	if (data):
396	389	message = _("Loading file %d of %d ...")%(data[0],data[1])
397	390	if not(self.progress_dialog):
...	...	@@ -408,19 +401,17 @@ class Controller():
408	401	self.progress_dialog.Close()
409	402	self.progress_dialog = None
410	403
411		- def OnLoadImportPanel(self, evt):
412		- patient_series = evt.data
	404	+ def OnLoadImportPanel(self, patient_series):
413	405	ok = self.LoadImportPanel(patient_series)
414	406	if ok:
415	407	Publisher.sendMessage('Show import panel')
416	408	Publisher.sendMessage("Show import panel in frame")
417	409	self.img_type = 1
418	410
419		- def OnLoadImportBitmapPanel(self, evt):
420		- data = evt.data
	411	+ def OnLoadImportBitmapPanel(self, data):
421	412	ok = self.LoadImportBitmapPanel(data)
422	413	if ok:
423		- Publisher.sendMessage('Show import bitmap panel in frame')
	414	+ Publisher.sendMessage('Show import bitmap panel in frame')
424	415	self.img_type = 2
425	416	#Publisher.sendMessage("Show import panel in invesalius.gui.frame") as frame
426	417
...	...	@@ -430,7 +421,7 @@ class Controller():
430	421	#first_patient = patient_series[0]
431	422	#Publisher.sendMessage("Load bitmap preview", first_patient)
432	423	if data:
433		- Publisher.sendMessage("Load import bitmap panel", data)
	424	+ Publisher.sendMessage("Load import bitmap panel", data=data)
434	425	return True
435	426	else:
436	427	dialog.ImportInvalidFiles("Bitmap")
...	...	@@ -439,9 +430,9 @@ class Controller():
439	430
440	431	def LoadImportPanel(self, patient_series):
441	432	if patient_series and isinstance(patient_series, list):
442		- Publisher.sendMessage("Load import panel", patient_series)
	433	+ Publisher.sendMessage("Load import panel", dicom_groups=patient_series)
443	434	first_patient = patient_series[0]
444		- Publisher.sendMessage("Load dicom preview", first_patient)
	435	+ Publisher.sendMessage("Load dicom preview", patient=first_patient)
445	436	return True
446	437	else:
447	438	dialog.ImportInvalidFiles("DICOM")
...	...	@@ -450,10 +441,8 @@ class Controller():
450	441
451	442	#----------- to import by command line ---------------------------------------------------
452	443
453		- def OnImportMedicalImages(self, pubsub_evt):
454		- directory = pubsub_evt.data['directory']
455		- gui = pubsub_evt.data['gui']
456		- self.ImportMedicalImages(directory, gui)
	444	+ def OnImportMedicalImages(self, directory, use_gui):
	445	+ self.ImportMedicalImages(directory, use_gui)
457	446
458	447	def ImportMedicalImages(self, directory, gui=True):
459	448	patients_groups = dcm.GetDicomGroups(directory)
...	...	@@ -484,19 +473,17 @@ class Controller():
484	473	# OPTION 4: Nothing...
485	474
486	475	self.LoadProject()
487		- Publisher.sendMessage("Enable state project", True)
	476	+ Publisher.sendMessage("Enable state project", state=True)
488	477
489		- def OnImportGroup(self, pubsub_evt):
490		- group = pubsub_evt.data['group']
491		- gui = pubsub_evt.data['gui']
492		- self.ImportGroup(group, gui)
	478	+ def OnImportGroup(self, group, use_gui):
	479	+ self.ImportGroup(group, use_gui)
493	480
494	481	def ImportGroup(self, group, gui=True):
495	482	matrix, matrix_filename, dicom = self.OpenDicomGroup(group, 0, [0, 0], gui=gui)
496	483	self.CreateDicomProject(dicom, matrix, matrix_filename)
497	484
498	485	self.LoadProject()
499		- Publisher.sendMessage("Enable state project", True)
	486	+ Publisher.sendMessage("Enable state project", state=True)
500	487
501	488	#-------------------------------------------------------------------------------------
502	489
...	...	@@ -514,21 +501,23 @@ class Controller():
514	501	self.Slice.spacing = proj.spacing
515	502
516	503	Publisher.sendMessage('Load slice to viewer',
517		- (proj.mask_dict))
	504	+ mask_dict=proj.mask_dict)
518	505
519	506
520	507	Publisher.sendMessage('Load slice plane')
521	508
522		- Publisher.sendMessage('Bright and contrast adjustment image',\
523		- (proj.window, proj.level))
524		- Publisher.sendMessage('Update window level value',\
525		- (proj.window, proj.level))
	509	+ Publisher.sendMessage('Bright and contrast adjustment image',
	510	+ window=proj.window,
	511	+ level=proj.level)
	512	+ Publisher.sendMessage('Update window level value',
	513	+ window=proj.window,
	514	+ level=proj.level)
526	515
527		- Publisher.sendMessage('Set project name', proj.name)
	516	+ Publisher.sendMessage('Set project name', proj_name=proj.name)
528	517	Publisher.sendMessage('Load surface dict',
529		- proj.surface_dict)
	518	+ surface_dict=proj.surface_dict)
530	519	Publisher.sendMessage('Hide surface items',
531		- proj.surface_dict)
	520	+ surface_dict=proj.surface_dict)
532	521	self.LoadImagedataInfo() # TODO: where do we insert this <<<?
533	522
534	523	Publisher.sendMessage('Show content panel')
...	...	@@ -537,13 +526,11 @@ class Controller():
537	526	if len(proj.mask_dict):
538	527	mask_index = len(proj.mask_dict) -1
539	528	for m in proj.mask_dict.values():
540		- Publisher.sendMessage('Add mask',
541		- (m.index, m.name,
542		- m.threshold_range, m.colour))
	529	+ Publisher.sendMessage('Add mask', mask=m)
543	530	if m.is_shown:
544	531	self.Slice.current_mask = proj.mask_dict[mask_index]
545		- Publisher.sendMessage('Show mask', (m.index, True))
546		- Publisher.sendMessage('Change mask selected', m.index)
	532	+ Publisher.sendMessage('Show mask', index=m.index, value=True)
	533	+ Publisher.sendMessage('Change mask selected', index=m.index)
547	534	else:
548	535	mask_name = const.MASK_NAME_PATTERN % (1,)
549	536
...	...	@@ -554,14 +541,17 @@ class Controller():
554	541
555	542	colour = const.MASK_COLOUR[0]
556	543	Publisher.sendMessage('Create new mask',
557		- (mask_name, thresh, colour))
	544	+ mask_name=mask_name,
	545	+ thresh=thresh,
	546	+ colour=colour)
558	547
559	548	Publisher.sendMessage('Load measurement dict',
560		- (proj.measurement_dict, self.Slice.spacing))
	549	+ measurement_dict=proj.measurement_dict,
	550	+ spacing=self.Slice.spacing)
561	551
562		- Publisher.sendMessage(('Set scroll position', 'AXIAL'),proj.matrix_shape[0]/2)
563		- Publisher.sendMessage(('Set scroll position', 'SAGITAL'),proj.matrix_shape[1]/2)
564		- Publisher.sendMessage(('Set scroll position', 'CORONAL'),proj.matrix_shape[2]/2)
	552	+ Publisher.sendMessage(('Set scroll position', 'AXIAL'), index=proj.matrix_shape[0]/2)
	553	+ Publisher.sendMessage(('Set scroll position', 'SAGITAL'),index=proj.matrix_shape[1]/2)
	554	+ Publisher.sendMessage(('Set scroll position', 'CORONAL'),index=proj.matrix_shape[2]/2)
565	555
566	556	Publisher.sendMessage('End busy cursor')
567	557
...	...	@@ -675,8 +665,7 @@ class Controller():
675	665
676	666	dirpath = session.CreateProject(filename)
677	667
678		- def OnOpenBitmapFiles(self, pubsub_evt):
679		- rec_data = pubsub_evt.data
	668	+ def OnOpenBitmapFiles(self, rec_data):
680	669	bmp_data = bmp.BitmapData()
681	670
682	671	if bmp_data.IsAllBitmapSameSize():
...	...	@@ -686,12 +675,11 @@ class Controller():
686	675	self.CreateBitmapProject(bmp_data, rec_data, matrix, matrix_filename)
687	676
688	677	self.LoadProject()
689		- Publisher.sendMessage("Enable state project", True)
	678	+ Publisher.sendMessage("Enable state project", state=True)
690	679	else:
691	680	dialogs.BitmapNotSameSize()
692	681
693	682	def OpenBitmapFiles(self, bmp_data, rec_data):
694		-
695	683	name = rec_data[0]
696	684	orientation = rec_data[1]
697	685	sp_x = float(rec_data[2])
...	...	@@ -747,20 +735,20 @@ class Controller():
747	735	self.Slice.window_width = float(self.matrix.max())
748	736
749	737	scalar_range = int(self.matrix.min()), int(self.matrix.max())
750		- Publisher.sendMessage('Update threshold limits list', scalar_range)
	738	+ Publisher.sendMessage('Update threshold limits list',
	739	+ threshold_range=scalar_range)
751	740
752	741	return self.matrix, self.filename#, dicom
753	742
754	743
755		- def OnOpenDicomGroup(self, pubsub_evt):
756		- group, interval, file_range = pubsub_evt.data
	744	+ def OnOpenDicomGroup(self, group, interval, file_range):
757	745	matrix, matrix_filename, dicom = self.OpenDicomGroup(group, interval, file_range, gui=True)
758	746	self.CreateDicomProject(dicom, matrix, matrix_filename)
759	747	self.LoadProject()
760		- Publisher.sendMessage("Enable state project", True)
	748	+ Publisher.sendMessage("Enable state project", state=True)
761	749
762		- def OnOpenOtherFiles(self, pubsub_evt):
763		- filepath = utils.decode(pubsub_evt.data, const.FS_ENCODE)
	750	+ def OnOpenOtherFiles(self, filepath):
	751	+ filepath = utils.decode(filepath, const.FS_ENCODE)
764	752	if not(filepath) == None:
765	753	name = filepath.rpartition('\\')[-1].split('.')
766	754
...	...	@@ -770,7 +758,7 @@ class Controller():
770	758	matrix, matrix_filename = self.OpenOtherFiles(group)
771	759	self.CreateOtherProject(str(name[0]), matrix, matrix_filename)
772	760	self.LoadProject()
773		- Publisher.sendMessage("Enable state project", True)
	761	+ Publisher.sendMessage("Enable state project", state=True)
774	762	else:
775	763	dialog.ImportInvalidFiles(ftype="Others")
776	764
...	...	@@ -861,7 +849,8 @@ class Controller():
861	849
862	850	scalar_range = int(self.matrix.min()), int(self.matrix.max())
863	851
864		- Publisher.sendMessage('Update threshold limits list', scalar_range)
	852	+ Publisher.sendMessage('Update threshold limits list',
	853	+ threshold_range=scalar_range)
865	854
866	855	return self.matrix, self.filename, dicom
867	856
...	...	@@ -886,7 +875,8 @@ class Controller():
886	875	self.Slice.window_width = ww
887	876
888	877	scalar_range = int(scalar_range[0]), int(scalar_range[1])
889		- Publisher.sendMessage('Update threshold limits list', scalar_range)
	878	+ Publisher.sendMessage('Update threshold limits list',
	879	+ threshold_range=scalar_range)
890	880	return self.matrix, self.filename
891	881
892	882	def LoadImagedataInfo(self):
...	...	@@ -909,24 +899,20 @@ class Controller():
909	899	[a,b] = default_threshold
910	900	default_threshold = (a,b)
911	901	Publisher.sendMessage('Set threshold modes',
912		- (thresh_modes,default_threshold))
	902	+ thresh_modes_names=thresh_modes,
	903	+ default_thresh=default_threshold)
913	904
914		- def LoadRaycastingPreset(self, pubsub_evt=None):
915		- if pubsub_evt:
916		- label = pubsub_evt.data
917		- else:
918		- return
919		-
920		- if label != const.RAYCASTING_OFF_LABEL:
921		- if label in const.RAYCASTING_FILES.keys():
	905	+ def LoadRaycastingPreset(self, preset_name):
	906	+ if preset_name != const.RAYCASTING_OFF_LABEL:
	907	+ if preset_name in const.RAYCASTING_FILES.keys():
922	908	path = os.path.join(const.RAYCASTING_PRESETS_DIRECTORY,
923		- const.RAYCASTING_FILES[label])
	909	+ const.RAYCASTING_FILES[preset_name])
924	910	else:
925	911	path = os.path.join(const.RAYCASTING_PRESETS_DIRECTORY,
926		- label+".plist")
	912	+ preset_name+".plist")
927	913	if not os.path.isfile(path):
928	914	path = os.path.join(const.USER_RAYCASTING_PRESETS_DIRECTORY,
929		- label+".plist")
	915	+ preset_name+".plist")
930	916	preset = plistlib.readPlist(path)
931	917	prj.Project().raycasting_preset = preset
932	918	# Notify volume
...	...	@@ -936,17 +922,16 @@ class Controller():
936	922	prj.Project().raycasting_preset = 0
937	923	Publisher.sendMessage('Update raycasting preset')
938	924
939		- def SaveRaycastingPreset(self, pubsub_evt):
940		- preset_name = pubsub_evt.data
	925	+ def SaveRaycastingPreset(self, preset_name):
941	926	preset = prj.Project().raycasting_preset
942	927	preset['name'] = preset_name
943	928	preset_dir = os.path.join(const.USER_RAYCASTING_PRESETS_DIRECTORY,
944	929	preset_name + '.plist')
945	930	plistlib.writePlist(preset, preset_dir)
946	931
947		- def ShowBooleanOpDialog(self, pubsub_evt):
	932	+ def ShowBooleanOpDialog(self):
948	933	dlg = dialogs.MaskBooleanDialog(prj.Project().mask_dict)
949	934	dlg.Show()
950	935
951		- def ApplyReorientation(self, pubsub_evt):
	936	+ def ApplyReorientation(self):
952	937	self.Slice.apply_reorientation()
...	...
...	...	@@ -86,7 +86,7 @@ def ClaronCoord(trck_init, trck_id, ref_mode):
86	86	k += 1
87	87	print("wait, collecting coordinates ...")
88	88
89		- Publisher.sendMessage('Sensors ID', [trck.probeID, trck.refID])
	89	+ Publisher.sendMessage('Sensors ID', probe_id=trck.probeID, ref_id=trck.refID)
90	90
91	91	return coord
92	92
...	...	@@ -225,7 +225,7 @@ def DebugCoord(trk_init, trck_id, ref_mode):
225	225	coord3 = np.array([uniform(1, 200), uniform(1, 200), uniform(1, 200),
226	226	uniform(-180.0, 180.0), uniform(-180.0, 180.0), uniform(-180.0, 180.0)])
227	227
228		- Publisher.sendMessage('Sensors ID', [int(uniform(0, 5)), int(uniform(0, 5))])
	228	+ Publisher.sendMessage('Sensors ID', probe_id=int(uniform(0, 5)), ref_id=int(uniform(0, 5)))
229	229
230	230	return np.vstack([coord1, coord2, coord3])
231	231
...	...
...	...	@@ -72,7 +72,7 @@ class CoregistrationStatic(threading.Thread):
72	72
73	73	coord = m_img[0, -1], m_img[1, -1], m_img[2, -1], psi, theta, phi
74	74
75		- wx.CallAfter(Publisher.sendMessage, 'Co-registered points', (m_img, coord))
	75	+ wx.CallAfter(Publisher.sendMessage, 'Co-registered points', arg=m_img, position=coord)
76	76
77	77	# TODO: Optimize the value of sleep for each tracking device.
78	78	sleep(0.175)
...	...	@@ -127,7 +127,7 @@ class CoregistrationDynamic(threading.Thread):
127	127	coord = m_img[0, -1], m_img[1, -1], m_img[2, -1], \
128	128	degrees(angles[0]), degrees(angles[1]), degrees(angles[2])
129	129
130		- wx.CallAfter(Publisher.sendMessage, 'Co-registered points', (m_img, coord))
	130	+ wx.CallAfter(Publisher.sendMessage, 'Co-registered points', arg=m_img, position=coord)
131	131
132	132	# TODO: Optimize the value of sleep for each tracking device.
133	133	sleep(0.175)
...	...	@@ -179,7 +179,7 @@ class CoregistrationDynamic_old(threading.Thread):
179	179
180	180	# Tried several combinations and different locations to send the messages,
181	181	# however only this one does not block the GUI during navigation.
182		- wx.CallAfter(Publisher.sendMessage, 'Co-registered points', coord)
	182	+ wx.CallAfter(Publisher.sendMessage, 'Co-registered points', arg=None, position=coord)
183	183	wx.CallAfter(Publisher.sendMessage, 'Set camera in volume', coord)
184	184	wx.CallAfter(Publisher.sendMessage, 'Update tracker angles', angles)
185	185
...	...	@@ -253,8 +253,8 @@ class CoregistrationObjectStatic(threading.Thread):
253	253	coord = m_img[0, -1], m_img[1, -1], m_img[2, -1], \
254	254	degrees(angles[0]), degrees(angles[1]), degrees(angles[2])
255	255
256		- wx.CallAfter(Publisher.sendMessage, 'Co-registered points', (m_img, coord))
257		- wx.CallAfter(Publisher.sendMessage, 'Update object matrix', (m_img, coord))
	256	+ wx.CallAfter(Publisher.sendMessage, 'Co-registered points', arg=m_img, position=coord)
	257	+ wx.CallAfter(Publisher.sendMessage, 'Update object matrix', m_img=m_img, coord=coord)
258	258
259	259	# TODO: Optimize the value of sleep for each tracking device.
260	260	sleep(0.175)
...	...	@@ -335,8 +335,8 @@ class CoregistrationObjectDynamic(threading.Thread):
335	335	coord = m_img[0, -1], m_img[1, -1], m_img[2, -1],\
336	336	degrees(angles[0]), degrees(angles[1]), degrees(angles[2])
337	337
338		- wx.CallAfter(Publisher.sendMessage, 'Co-registered points', (m_img, coord))
339		- wx.CallAfter(Publisher.sendMessage, 'Update object matrix', (m_img, coord))
	338	+ wx.CallAfter(Publisher.sendMessage, 'Co-registered points', arg=m_img, position=coord)
	339	+ wx.CallAfter(Publisher.sendMessage, 'Update object matrix', m_img=m_img, coord=coord)
340	340
341	341	# TODO: Optimize the value of sleep for each tracking device.
342	342	sleep(0.175)
...	...	@@ -360,4 +360,4 @@ class CoregistrationObjectDynamic(threading.Thread):
360	360	# R_dyn = M_vtk * M_obj_rot_raw.I * S0_rot_dyn.I * R_reference.I * R_stylus * M_obj_rot_raw
361	361
362	362	if self._pause_:
363		- return
364	363	\ No newline at end of file
	364	+ return
...	...
...	...	@@ -136,7 +136,7 @@ class Box(with_metaclass(utils.Singleton, object)):
136	136	self.axial[const.AXIAL_RIGHT] = [[self.xf + (self.xs/2), self.yi, self.zi],\
137	137	[self.xf + (self.xs/2), self.yf, self.zf]]
138	138
139		- Publisher.sendMessage('Update crop limits into gui', self.GetLimits())
	139	+ Publisher.sendMessage('Update crop limits into gui', limits=self.GetLimits())
140	140
141	141
142	142	def GetLimits(self):
...	...
...	...	@@ -78,8 +78,8 @@ class EditionHistory(object):
78	78	self.index = -1
79	79	self.size = size * 2
80	80
81		- Publisher.sendMessage("Enable undo", False)
82		- Publisher.sendMessage("Enable redo", False)
	81	+ Publisher.sendMessage("Enable undo", value=False)
	82	+ Publisher.sendMessage("Enable redo", value=False)
83	83
84	84	def new_node(self, index, orientation, array, p_array, clean):
85	85	# Saving the previous state, used to undo/redo correctly.
...	...	@@ -100,8 +100,8 @@ class EditionHistory(object):
100	100	self.index += 1
101	101
102	102	print("INDEX", self.index, len(self.history), self.history)
103		- Publisher.sendMessage("Enable undo", True)
104		- Publisher.sendMessage("Enable redo", False)
	103	+ Publisher.sendMessage("Enable undo", value=True)
	104	+ Publisher.sendMessage("Enable redo", value=False)
105	105
106	106	def undo(self, mvolume, actual_slices=None):
107	107	h = self.history
...	...	@@ -114,7 +114,7 @@ class EditionHistory(object):
114	114	self.index -= 1
115	115	h[self.index].commit_history(mvolume)
116	116	self._reload_slice(self.index)
117		- Publisher.sendMessage("Enable redo", True)
	117	+ Publisher.sendMessage("Enable redo", value=True)
118	118	elif actual_slices and actual_slices[h[self.index - 1].orientation] != h[self.index - 1].index:
119	119	self._reload_slice(self.index - 1)
120	120	else:
...	...	@@ -124,10 +124,10 @@ class EditionHistory(object):
124	124	self.index -= 1
125	125	h[self.index].commit_history(mvolume)
126	126	self._reload_slice(self.index)
127		- Publisher.sendMessage("Enable redo", True)
	127	+ Publisher.sendMessage("Enable redo", value=True)
128	128
129	129	if self.index == 0:
130		- Publisher.sendMessage("Enable undo", False)
	130	+ Publisher.sendMessage("Enable undo", value=False)
131	131	print("AT", self.index, len(self.history), self.history[self.index].filename)
132	132
133	133	def redo(self, mvolume, actual_slices=None):
...	...	@@ -142,7 +142,7 @@ class EditionHistory(object):
142	142	self.index += 1
143	143	h[self.index].commit_history(mvolume)
144	144	self._reload_slice(self.index)
145		- Publisher.sendMessage("Enable undo", True)
	145	+ Publisher.sendMessage("Enable undo", value=True)
146	146	elif actual_slices and actual_slices[h[self.index + 1].orientation] != h[self.index + 1].index:
147	147	self._reload_slice(self.index + 1)
148	148	else:
...	...	@@ -152,15 +152,15 @@ class EditionHistory(object):
152	152	self.index += 1
153	153	h[self.index].commit_history(mvolume)
154	154	self._reload_slice(self.index)
155		- Publisher.sendMessage("Enable undo", True)
	155	+ Publisher.sendMessage("Enable undo", value=True)
156	156
157	157	if self.index == len(h) - 1:
158		- Publisher.sendMessage("Enable redo", False)
	158	+ Publisher.sendMessage("Enable redo", value=False)
159	159	print("AT", self.index, len(h), h[self.index].filename)
160	160
161	161	def _reload_slice(self, index):
162	162	Publisher.sendMessage(('Set scroll position', self.history[index].orientation),
163		- self.history[index].index)
	163	+ index=self.history[index].index)
164	164
165	165	def _config_undo_redo(self, visible):
166	166	v_undo = False
...	...	@@ -174,14 +174,14 @@ class EditionHistory(object):
174	174	elif self.index == len(self.history) - 1:
175	175	v_redo = False
176	176
177		- Publisher.sendMessage("Enable undo", v_undo)
178		- Publisher.sendMessage("Enable redo", v_redo)
	177	+ Publisher.sendMessage("Enable undo", value=v_undo)
	178	+ Publisher.sendMessage("Enable redo", value=v_redo)
179	179
180	180	def clear_history(self):
181	181	self.history = []
182	182	self.index = -1
183		- Publisher.sendMessage("Enable undo", False)
184		- Publisher.sendMessage("Enable redo", False)
	183	+ Publisher.sendMessage("Enable undo", value=False)
	184	+ Publisher.sendMessage("Enable redo", value=False)
185	185
186	186
187	187	class Mask():
...	...	@@ -273,8 +273,7 @@ class Mask():
273	273	path = os.path.join(dirpath, mask_file)
274	274	self._open_mask(path, tuple(shape))
275	275
276		- def OnFlipVolume(self, pubsub_evt):
277		- axis = pubsub_evt.data
	276	+ def OnFlipVolume(self, axis):
278	277	submatrix = self.matrix[1:, 1:, 1:]
279	278	if axis == 0:
280	279	submatrix[:] = submatrix[::-1]
...	...	@@ -286,8 +285,8 @@ class Mask():
286	285	submatrix[:] = submatrix[:, :, ::-1]
287	286	self.matrix[0, 0, 1::] = self.matrix[0, 0, :0:-1]
288	287
289		- def OnSwapVolumeAxes(self, pubsub_evt):
290		- axis0, axis1 = pubsub_evt.data
	288	+ def OnSwapVolumeAxes(self, axes):
	289	+ axis0, axis1 = axes
291	290	self.matrix = self.matrix.swapaxes(axis0, axis1)
292	291
293	292	def _save_mask(self, filename):
...	...
...	...	@@ -120,14 +120,9 @@ class MeasurementManager(object):
120	120	Publisher.subscribe(self._change_measure_point_pos, 'Change measurement point position')
121	121	Publisher.subscribe(self.OnCloseProject, 'Close project data')
122	122
123		- def _load_measurements(self, pubsub_evt):
124		- try:
125		- dict, spacing = pubsub_evt.data
126		- except ValueError:
127		- dict = pubsub_evt.data
128		- spacing = 1.0, 1.0, 1.0
129		- for i in dict:
130		- m = dict[i]
	123	+ def _load_measurements(self, measurement_dict, spacing=(1.0, 1.0, 1.0)):
	124	+ for i in measurement_dict:
	125	+ m = measurement_dict[i]
131	126
132	127	if m.location == const.AXIAL:
133	128	radius = min(spacing[1], spacing[2]) * const.PROP_MEASURE
...	...	@@ -154,7 +149,7 @@ class MeasurementManager(object):
154	149
155	150	if m.location == const.SURFACE:
156	151	Publisher.sendMessage(("Add actors " + str(m.location)),
157		- (actors, m.slice_number))
	152	+ actors=actors)
158	153	self.current = None
159	154
160	155	if not m.visible:
...	...	@@ -164,28 +159,7 @@ class MeasurementManager(object):
164	159	else:
165	160	Publisher.sendMessage('Redraw canvas')
166	161
167		- def _add_point(self, pubsub_evt):
168		- position = pubsub_evt.data[0]
169		- type = pubsub_evt.data[1] # Linear or Angular
170		- location = pubsub_evt.data[2] # 3D, AXIAL, SAGITAL, CORONAL
171		-
172		- if location == const.SURFACE:
173		- slice_number = 0
174		- try:
175		- radius = pubsub_evt.data[3]
176		- except IndexError:
177		- radius = const.PROP_MEASURE
178		- else:
179		- try:
180		- slice_number = pubsub_evt.data[3]
181		- except IndexError:
182		- slice_number = 0
183		-
184		- try:
185		- radius = pubsub_evt.data[4]
186		- except IndexError:
187		- radius = const.PROP_MEASURE
188		-
	162	+ def _add_point(self, position, type, location, slice_number=0, radius=const.PROP_MEASURE):
189	163	to_remove = False
190	164	if self.current is None:
191	165	to_create = True
...	...	@@ -233,8 +207,7 @@ class MeasurementManager(object):
233	207	m.points.append(position)
234	208
235	209	if m.location == const.SURFACE:
236		- Publisher.sendMessage("Add actors " + str(location),
237		- (actors, m.slice_number))
	210	+ Publisher.sendMessage("Add actors " + str(location), actors=actors)
238	211
239	212	if self.current not in self.measures:
240	213	self.measures.append(self.current)
...	...	@@ -254,14 +227,12 @@ class MeasurementManager(object):
254	227
255	228	msg = 'Update measurement info in GUI',
256	229	Publisher.sendMessage(msg,
257		- (index, name, colour,
258		- location,
259		- type_,
260		- value))
	230	+ index=index, name=name,
	231	+ colour=colour, location=location,
	232	+ type_=type_, value=value)
261	233	self.current = None
262	234
263		- def _change_measure_point_pos(self, pubsub_evt):
264		- index, npoint, pos = pubsub_evt.data
	235	+ def _change_measure_point_pos(self, index, npoint, pos):
265	236	m, mr = self.measures[index]
266	237	x, y, z = pos
267	238	if npoint == 0:
...	...	@@ -288,17 +259,14 @@ class MeasurementManager(object):
288	259	value = u"%.3f°"% m.value
289	260
290	261	Publisher.sendMessage('Update measurement info in GUI',
291		- (index, name, colour,
292		- location,
293		- type_,
294		- value))
	262	+ index=index, name=name, colour=colour,
	263	+ location=location, type_=type_,
	264	+ value=value)
295	265
296		- def _change_name(self, pubsub_evt):
297		- index, new_name = pubsub_evt.data
298		- self.measures[index].name = new_name
	266	+ def _change_name(self, index, name):
	267	+ self.measures[index][0].name = name
299	268
300		- def _remove_measurements(self, pubsub_evt):
301		- indexes = pubsub_evt.data
	269	+ def _remove_measurements(self, indexes):
302	270	for index in indexes:
303	271	m, mr = self.measures.pop(index)
304	272	try:
...	...	@@ -308,16 +276,15 @@ class MeasurementManager(object):
308	276	pass
309	277	prj.Project().RemoveMeasurement(index)
310	278	if m.location == const.SURFACE:
311		- Publisher.sendMessage(('Remove actors ' + str(m.location)),
312		- (mr.GetActors(), m.slice_number))
	279	+ Publisher.sendMessage('Remove actors ' + str(m.location),
	280	+ actors=mr.GetActors())
313	281	Publisher.sendMessage('Redraw canvas')
314	282	Publisher.sendMessage('Render volume viewer')
315	283
316	284	session = ses.Session()
317	285	session.ChangeProject()
318	286
319		- def _set_visibility(self, pubsub_evt):
320		- index, visibility = pubsub_evt.data
	287	+ def _set_visibility(self, index, visibility):
321	288	m, mr = self.measures[index]
322	289	m.visible = visibility
323	290	mr.SetVisibility(visibility)
...	...	@@ -326,7 +293,7 @@ class MeasurementManager(object):
326	293	else:
327	294	Publisher.sendMessage('Redraw canvas')
328	295
329		- def _rm_incomplete_measurements(self, pubsub_evt):
	296	+ def _rm_incomplete_measurements(self):
330	297	if self.current is None:
331	298	return
332	299
...	...	@@ -334,12 +301,12 @@ class MeasurementManager(object):
334	301	if not mr.IsComplete():
335	302	idx = self.measures._list_measures.index((m, mr))
336	303	self.measures.remove((m, mr))
337		- Publisher.sendMessage("Remove GUI measurement", idx)
	304	+ Publisher.sendMessage("Remove GUI measurement", measure_index=idx)
338	305	actors = mr.GetActors()
339	306	slice_number = self.current[0].slice_number
340	307	if m.location == const.SURFACE:
341	308	Publisher.sendMessage(('Remove actors ' + str(self.current[0].location)),
342		- (actors, slice_number))
	309	+ actors=actors)
343	310	if self.current[0].location == const.SURFACE:
344	311	Publisher.sendMessage('Render volume viewer')
345	312	else:
...	...	@@ -349,7 +316,7 @@ class MeasurementManager(object):
349	316	# self.measures.pop()
350	317	self.current = None
351	318
352		- def OnCloseProject(self, pubsub_evt):
	319	+ def OnCloseProject(self):
353	320	self.measures.clean()
354	321
355	322
...	...	@@ -650,7 +617,7 @@ class LinearMeasure(object):
650	617
651	618	def Remove(self):
652	619	actors = self.GetActors()
653		- Publisher.sendMessage("Remove actors " + str(const.SURFACE), (actors,))
	620	+ Publisher.sendMessage("Remove actors " + str(const.SURFACE), actors=actors)
654	621
655	622	def __del__(self):
656	623	self.Remove()
...	...	@@ -901,7 +868,7 @@ class AngularMeasure(object):
901	868
902	869	def Remove(self):
903	870	actors = self.GetActors()
904		- Publisher.sendMessage("Remove actors " + str(const.SURFACE), (actors,))
	871	+ Publisher.sendMessage("Remove actors " + str(const.SURFACE), actors=actors)
905	872
906	873	def SetRenderer(self, renderer):
907	874	if self.point_actor1:
...	...
...	...	@@ -44,8 +44,8 @@ class Record(threading.Thread):
44	44	def __bind_events(self):
45	45	Publisher.subscribe(self.UpdateCurrentCoords, 'Co-registered points')
46	46
47		- def UpdateCurrentCoords(self, pubsub_evt):
48		- self.coord = asarray(pubsub_evt.data[1])
	47	+ def UpdateCurrentCoords(self, arg, position):
	48	+ self.coord = asarray(position)
49	49
50	50	def stop(self):
51	51	self._pause_ = True
...	...	@@ -64,4 +64,4 @@ class Record(threading.Thread):
64	64	else:
65	65	self.coord_list = vstack((self.coord_list, hstack((relative_time, self.coord))))
66	66	if self._pause_:
67		- return
68	67	\ No newline at end of file
	68	+ return
...	...
...	...	@@ -219,10 +219,9 @@ class Slice(with_metaclass(utils.Singleton, object)):
219	219	buffer_.discard_vtk_mask()
220	220	buffer_.discard_mask()
221	221
222		- def OnRemoveMasks(self, pubsub_evt):
223		- selected_items = pubsub_evt.data
	222	+ def OnRemoveMasks(self, mask_indexes):
224	223	proj = Project()
225		- for item in selected_items:
	224	+ for item in mask_indexes:
226	225	proj.RemoveMask(item)
227	226
228	227	# if the deleted mask is the current mask, cleans the current mask
...	...	@@ -234,14 +233,13 @@ class Slice(with_metaclass(utils.Singleton, object)):
234	233	buffer_.discard_vtk_mask()
235	234	buffer_.discard_mask()
236	235
237		- Publisher.sendMessage('Show mask', (item, 0))
	236	+ Publisher.sendMessage('Show mask', index=item, value=False)
238	237	Publisher.sendMessage('Reload actual slice')
239	238
240		- def OnDuplicateMasks(self, pubsub_evt):
241		- selected_items = pubsub_evt.data
	239	+ def OnDuplicateMasks(self, mask_indexes):
242	240	proj = Project()
243	241	mask_dict = proj.mask_dict
244		- for index in selected_items:
	242	+ for index in mask_indexes:
245	243	original_mask = mask_dict[index]
246	244	# compute copy name
247	245	name = original_mask.name
...	...	@@ -251,34 +249,32 @@ class Slice(with_metaclass(utils.Singleton, object)):
251	249	copy_mask = original_mask.copy(new_name)
252	250	self._add_mask_into_proj(copy_mask)
253	251
254		- def OnEnableStyle(self, pubsub_evt):
255		- state = pubsub_evt.data
256		- if (state in const.SLICE_STYLES):
257		- new_state = self.interaction_style.AddState(state)
258		- Publisher.sendMessage('Set slice interaction style', new_state)
259		- self.state = state
	252	+ def OnEnableStyle(self, style):
	253	+ if (style in const.SLICE_STYLES):
	254	+ new_state = self.interaction_style.AddState(style)
	255	+ Publisher.sendMessage('Set slice interaction style', style=new_state)
	256	+ self.state = style
260	257
261		- def OnDisableStyle(self, pubsub_evt):
262		- state = pubsub_evt.data
263		- if (state in const.SLICE_STYLES):
264		- new_state = self.interaction_style.RemoveState(state)
265		- Publisher.sendMessage('Set slice interaction style', new_state)
	258	+ def OnDisableStyle(self, style):
	259	+ if (style in const.SLICE_STYLES):
	260	+ new_state = self.interaction_style.RemoveState(style)
	261	+ Publisher.sendMessage('Set slice interaction style', style=new_state)
266	262
267		- if (state == const.SLICE_STATE_EDITOR):
	263	+ if (style == const.SLICE_STATE_EDITOR):
268	264	Publisher.sendMessage('Set interactor default cursor')
269	265	self.state = new_state
270	266
271		- def OnDisableActualStyle(self, pubsub_evt):
	267	+ def OnDisableActualStyle(self):
272	268	actual_state = self.interaction_style.GetActualState()
273	269	if actual_state != const.STATE_DEFAULT:
274	270	new_state = self.interaction_style.RemoveState(actual_state)
275		- Publisher.sendMessage('Set slice interaction style', new_state)
	271	+ Publisher.sendMessage('Set slice interaction style', style=new_state)
276	272
277	273	# if (actual_state == const.SLICE_STATE_EDITOR):
278	274	# Publisher.sendMessage('Set interactor default cursor')
279	275	self.state = new_state
280	276
281		- def OnCloseProject(self, pubsub_evt):
	277	+ def OnCloseProject(self):
282	278	self.CloseProject()
283	279
284	280	def CloseProject(self):
...	...	@@ -310,39 +306,32 @@ class Slice(with_metaclass(utils.Singleton, object)):
310	306
311	307	Publisher.sendMessage('Select first item from slice menu')
312	308
313		- def __set_current_mask_threshold_limits(self, pubsub_evt):
314		- thresh_min = pubsub_evt.data[0]
315		- thresh_max = pubsub_evt.data[1]
	309	+ def __set_current_mask_threshold_limits(self, threshold_range):
	310	+ thresh_min = threshold_range[0]
	311	+ thresh_max = threshold_range[1]
316	312	if self.current_mask:
317	313	index = self.current_mask.index
318	314	self.SetMaskEditionThreshold(index, (thresh_min, thresh_max))
319	315
320		- def __add_mask(self, pubsub_evt):
321		- mask_name = pubsub_evt.data
	316	+ def __add_mask(self, mask_name):
322	317	self.create_new_mask(name=mask_name)
323	318	self.SetMaskColour(self.current_mask.index, self.current_mask.colour)
324	319
325		- def __add_mask_thresh(self, pubsub_evt):
326		- mask_name = pubsub_evt.data[0]
327		- thresh = pubsub_evt.data[1]
328		- colour = pubsub_evt.data[2]
	320	+ def __add_mask_thresh(self, mask_name, thresh, colour):
329	321	self.create_new_mask(name=mask_name, threshold_range=thresh, colour=colour)
330	322	self.SetMaskColour(self.current_mask.index, self.current_mask.colour)
331	323	self.SelectCurrentMask(self.current_mask.index)
332	324	Publisher.sendMessage('Reload actual slice')
333	325
334		- def __select_current_mask(self, pubsub_evt):
335		- mask_index = pubsub_evt.data
336		- self.SelectCurrentMask(mask_index)
	326	+ def __select_current_mask(self, index):
	327	+ self.SelectCurrentMask(index)
337	328
338		- def __set_current_mask_edition_threshold(self, evt_pubsub):
	329	+ def __set_current_mask_edition_threshold(self, threshold_range):
339	330	if self.current_mask:
340		- threshold_range = evt_pubsub.data
341	331	index = self.current_mask.index
342	332	self.SetMaskEditionThreshold(index, threshold_range)
343	333
344		- def __set_current_mask_threshold(self, evt_pubsub):
345		- threshold_range = evt_pubsub.data
	334	+ def __set_current_mask_threshold(self, threshold_range):
346	335	index = self.current_mask.index
347	336	self.num_gradient += 1
348	337	self.current_mask.matrix[:] = 0
...	...	@@ -379,8 +368,7 @@ class Slice(with_metaclass(utils.Singleton, object)):
379	368	if to_reload:
380	369	Publisher.sendMessage('Reload actual slice')
381	370
382		- def __set_current_mask_threshold_actual_slice(self, evt_pubsub):
383		- threshold_range = evt_pubsub.data
	371	+ def __set_current_mask_threshold_actual_slice(self, threshold_range):
384	372	index = self.current_mask.index
385	373	for orientation in self.buffer_slices:
386	374	self.buffer_slices[orientation].discard_vtk_mask()
...	...	@@ -391,44 +379,41 @@ class Slice(with_metaclass(utils.Singleton, object)):
391	379
392	380	Publisher.sendMessage('Reload actual slice')
393	381
394		- def __set_current_mask_colour(self, pubsub_evt):
	382	+ def __set_current_mask_colour(self, colour):
395	383	# "if" is necessary because wx events are calling this before any mask
396	384	# has been created
397	385	if self.current_mask:
398		- colour_wx = pubsub_evt.data
399		- colour_vtk = [c/255.0 for c in colour_wx]
	386	+ colour_vtk = [c/255.0 for c in colour]
400	387	self.SetMaskColour(self.current_mask.index, colour_vtk)
401	388
402		- def __set_mask_name(self, pubsub_evt):
403		- index, name = pubsub_evt.data
	389	+ def __set_mask_name(self, index, name):
404	390	self.SetMaskName(index, name)
405	391
406		- def __show_mask(self, pubsub_evt):
	392	+ def __show_mask(self, index, value):
407	393	# "if" is necessary because wx events are calling this before any mask
408	394	# has been created
409	395	if self.current_mask:
410		- index, value = pubsub_evt.data
411	396	self.ShowMask(index, value)
412	397	if not value:
413		- Publisher.sendMessage('Select mask name in combo', -1)
	398	+ Publisher.sendMessage('Select mask name in combo', index=-1)
414	399
415	400	if self._type_projection != const.PROJECTION_NORMAL:
416	401	self.SetTypeProjection(const.PROJECTION_NORMAL)
417	402	Publisher.sendMessage('Reload actual slice')
418	403
419		- def __hide_current_mask(self, pubsub_evt):
	404	+ def __hide_current_mask(self):
420	405	if self.current_mask:
421	406	index = self.current_mask.index
422	407	value = False
423		- Publisher.sendMessage('Show mask', (index, value))
	408	+ Publisher.sendMessage('Show mask', index=index, value=value)
424	409
425		- def __show_current_mask(self, pubsub_evt):
	410	+ def __show_current_mask(self):
426	411	if self.current_mask:
427	412	index = self.current_mask.index
428	413	value = True
429		- Publisher.sendMessage('Show mask', (index, value))
	414	+ Publisher.sendMessage('Show mask', index=index, value=value)
430	415
431		- def __clean_current_mask(self, pubsub_evt):
	416	+ def __clean_current_mask(self):
432	417	if self.current_mask:
433	418	self.current_mask.clean()
434	419	for buffer_ in self.buffer_slices.values():
...	...	@@ -844,8 +829,8 @@ class Slice(with_metaclass(utils.Singleton, object)):
844	829	(r,g,b) = colour[:3]
845	830	colour_wx = [r255, g255, b*255]
846	831	Publisher.sendMessage('Change mask colour in notebook',
847		- (index, (r,g,b)))
848		- Publisher.sendMessage('Set GUI items colour', colour_wx)
	832	+ index=index, colour=(r,g,b))
	833	+ Publisher.sendMessage('Set GUI items colour', colour=colour_wx)
849	834	if update:
850	835	# Updating mask colour on vtkimagedata.
851	836	for buffer_ in self.buffer_slices.values():
...	...	@@ -899,8 +884,8 @@ class Slice(with_metaclass(utils.Singleton, object)):
899	884
900	885	# Update data notebook (GUI)
901	886	Publisher.sendMessage('Set mask threshold in notebook',
902		- (self.current_mask.index,
903		- self.current_mask.threshold_range))
	887	+ index=self.current_mask.index,
	888	+ threshold_range=self.current_mask.threshold_range)
904	889	else:
905	890	proj = Project()
906	891	proj.mask_dict[index].threshold_range = threshold_range
...	...	@@ -936,32 +921,30 @@ class Slice(with_metaclass(utils.Singleton, object)):
936	921	"SAGITAL": SliceBuffer()}
937	922
938	923	Publisher.sendMessage('Set mask threshold in notebook',
939		- (index,
940		- self.current_mask.threshold_range))
	924	+ index=index,
	925	+ threshold_range=self.current_mask.threshold_range)
941	926	Publisher.sendMessage('Set threshold values in gradient',
942		- self.current_mask.threshold_range)
943		- Publisher.sendMessage('Select mask name in combo', index)
	927	+ threshold_range=self.current_mask.threshold_range)
	928	+ Publisher.sendMessage('Select mask name in combo', index=index)
944	929	Publisher.sendMessage('Update slice viewer')
945	930	#---------------------------------------------------------------------------
946	931
947		- def CreateSurfaceFromIndex(self, pubsub_evt):
948		- surface_parameters = pubsub_evt.data
949		-
	932	+ def CreateSurfaceFromIndex(self, surface_parameters):
950	933	proj = Project()
951	934	mask = proj.mask_dict[surface_parameters['options']['index']]
952	935
953	936	self.do_threshold_to_all_slices(mask)
954		- Publisher.sendMessage('Create surface', (self, mask, surface_parameters))
	937	+ Publisher.sendMessage('Create surface',
	938	+ slice_=self, mask=mask,
	939	+ surface_parameters=surface_parameters)
955	940
956	941	def GetOutput(self):
957	942	return self.blend_filter.GetOutput()
958	943
959		- def _set_projection_type(self, pubsub_evt):
960		- tprojection = pubsub_evt.data
961		- self.SetTypeProjection(tprojection)
	944	+ def _set_projection_type(self, projection_id):
	945	+ self.SetTypeProjection(projection_id)
962	946
963		- def _set_interpolation_method(self, pubsub_evt):
964		- interp_method = pubsub_evt.data
	947	+ def _set_interpolation_method(self, interp_method):
965	948	self.SetInterpolationMethod(interp_method)
966	949
967	950	def SetTypeProjection(self, tprojection):
...	...	@@ -970,15 +953,15 @@ class Slice(with_metaclass(utils.Singleton, object)):
970	953	Publisher.sendMessage('Hide current mask')
971	954
972	955	if tprojection == const.PROJECTION_NORMAL:
973		- Publisher.sendMessage('Show MIP interface', False)
	956	+ Publisher.sendMessage('Show MIP interface', flag=False)
974	957	else:
975		- Publisher.sendMessage('Show MIP interface', True)
	958	+ Publisher.sendMessage('Show MIP interface', flag=True)
976	959
977	960	self._type_projection = tprojection
978	961	for buffer_ in self.buffer_slices.values():
979	962	buffer_.discard_buffer()
980	963
981		- Publisher.sendMessage('Check projection menu', tprojection)
	964	+ Publisher.sendMessage('Check projection menu', projection_id=tprojection)
982	965
983	966	def SetInterpolationMethod(self, interp_method):
984	967	if self.interp_method != interp_method:
...	...	@@ -987,8 +970,7 @@ class Slice(with_metaclass(utils.Singleton, object)):
987	970	buffer_.discard_buffer()
988	971	Publisher.sendMessage('Reload actual slice')
989	972
990		- def UpdateWindowLevelBackground(self, pubsub_evt):
991		- window, level = pubsub_evt.data
	973	+ def UpdateWindowLevelBackground(self, window, level):
992	974	self.window_width = window
993	975	self.window_level = level
994	976
...	...	@@ -1004,8 +986,7 @@ class Slice(with_metaclass(utils.Singleton, object)):
1004	986
1005	987	Publisher.sendMessage('Reload actual slice')
1006	988
1007		- def UpdateColourTableBackground(self, pubsub_evt):
1008		- values = pubsub_evt.data
	989	+ def UpdateColourTableBackground(self, values):
1009	990	self.from_= OTHER
1010	991	self.number_of_colours= values[0]
1011	992	self.saturation_range = values[1]
...	...	@@ -1015,16 +996,16 @@ class Slice(with_metaclass(utils.Singleton, object)):
1015	996	buffer_.discard_vtk_image()
1016	997	Publisher.sendMessage('Reload actual slice')
1017	998
1018		- def UpdateColourTableBackgroundPlist(self, pubsub_evt):
1019		- self.values = pubsub_evt.data
	999	+ def UpdateColourTableBackgroundPlist(self, values):
	1000	+ self.values = values
1020	1001	self.from_= PLIST
1021	1002	for buffer_ in self.buffer_slices.values():
1022	1003	buffer_.discard_vtk_image()
1023	1004
1024	1005	Publisher.sendMessage('Reload actual slice')
1025	1006
1026		- def UpdateColourTableBackgroundWidget(self, pubsub_evt):
1027		- self.nodes = pubsub_evt.data
	1007	+ def UpdateColourTableBackgroundWidget(self, nodes):
	1008	+ self.nodes = nodes
1028	1009	self.from_= WIDGET
1029	1010	for buffer_ in self.buffer_slices.values():
1030	1011	if self._type_projection in (const.PROJECTION_NORMAL,
...	...	@@ -1045,8 +1026,7 @@ class Slice(with_metaclass(utils.Singleton, object)):
1045	1026
1046	1027	Publisher.sendMessage('Reload actual slice')
1047	1028
1048		- def UpdateSlice3D(self, pubsub_evt):
1049		- widget, orientation = pubsub_evt.data
	1029	+ def UpdateSlice3D(self, widget, orientation):
1050	1030	img = self.buffer_slices[orientation].vtk_image
1051	1031	original_orientation = Project().original_orientation
1052	1032	cast = vtk.vtkImageCast()
...	...	@@ -1125,15 +1105,12 @@ class Slice(with_metaclass(utils.Singleton, object)):
1125	1105
1126	1106	## update gui related to mask
1127	1107	Publisher.sendMessage('Add mask',
1128		- (mask.index,
1129		- mask.name,
1130		- mask.threshold_range,
1131		- mask.colour))
	1108	+ mask=mask)
1132	1109
1133	1110	if show:
1134	1111	self.current_mask = mask
1135		- Publisher.sendMessage('Show mask', (mask.index, 1))
1136		- Publisher.sendMessage('Change mask selected', mask.index)
	1112	+ Publisher.sendMessage('Show mask', index=mask.index, value=True)
	1113	+ Publisher.sendMessage('Change mask selected', index=mask.index)
1137	1114	Publisher.sendMessage('Update slice viewer')
1138	1115
1139	1116	def do_ww_wl(self, image):
...	...	@@ -1336,9 +1313,8 @@ class Slice(with_metaclass(utils.Singleton, object)):
1336	1313
1337	1314	return blend_imagedata.GetOutput()
1338	1315
1339		- def _do_boolean_op(self, pubsub_evt):
1340		- op, m1, m2 = pubsub_evt.data
1341		- self.do_boolean_op(op, m1, m2)
	1316	+ def _do_boolean_op(self, operation, mask1, mask2):
	1317	+ self.do_boolean_op(operation, mask1, mask2)
1342	1318
1343	1319
1344	1320	def do_boolean_op(self, op, m1, m2):
...	...	@@ -1449,7 +1425,7 @@ class Slice(with_metaclass(utils.Singleton, object)):
1449	1425	self.q_orientation = np.array((1, 0, 0, 0))
1450	1426	self.center = [(s * d/2.0) for (d, s) in zip(self.matrix.shape[::-1], self.spacing)]
1451	1427
1452		- self.__clean_current_mask(None)
	1428	+ self.__clean_current_mask()
1453	1429	if self.current_mask:
1454	1430	self.current_mask.matrix[:] = 0
1455	1431	self.current_mask.was_edited = False
...	...	@@ -1459,7 +1435,7 @@ class Slice(with_metaclass(utils.Singleton, object)):
1459	1435
1460	1436	Publisher.sendMessage('Reload actual slice')
1461	1437
1462		- def __undo_edition(self, pub_evt):
	1438	+ def __undo_edition(self):
1463	1439	buffer_slices = self.buffer_slices
1464	1440	actual_slices = {"AXIAL": buffer_slices["AXIAL"].index,
1465	1441	"CORONAL": buffer_slices["CORONAL"].index,
...	...	@@ -1471,7 +1447,7 @@ class Slice(with_metaclass(utils.Singleton, object)):
1471	1447	self.buffer_slices[o].discard_vtk_mask()
1472	1448	Publisher.sendMessage('Reload actual slice')
1473	1449
1474		- def __redo_edition(self, pub_evt):
	1450	+ def __redo_edition(self):
1475	1451	buffer_slices = self.buffer_slices
1476	1452	actual_slices = {"AXIAL": buffer_slices["AXIAL"].index,
1477	1453	"CORONAL": buffer_slices["CORONAL"].index,
...	...	@@ -1487,8 +1463,7 @@ class Slice(with_metaclass(utils.Singleton, object)):
1487	1463	self.matrix_filename = filename
1488	1464	self.matrix = np.memmap(filename, shape=shape, dtype=dtype, mode='r+')
1489	1465
1490		- def OnFlipVolume(self, pubsub_evt):
1491		- axis = pubsub_evt.data
	1466	+ def OnFlipVolume(self, axis):
1492	1467	if axis == 0:
1493	1468	self.matrix[:] = self.matrix[::-1]
1494	1469	elif axis == 1:
...	...	@@ -1499,8 +1474,8 @@ class Slice(with_metaclass(utils.Singleton, object)):
1499	1474	for buffer_ in self.buffer_slices.values():
1500	1475	buffer_.discard_buffer()
1501	1476
1502		- def OnSwapVolumeAxes(self, pubsub_evt):
1503		- axis0, axis1 = pubsub_evt.data
	1477	+ def OnSwapVolumeAxes(self, axes):
	1478	+ axis0, axis1 = axes
1504	1479	self.matrix = self.matrix.swapaxes(axis0, axis1)
1505	1480	if (axis0, axis1) == (2, 1):
1506	1481	self.spacing = self.spacing[1], self.spacing[0], self.spacing[2]
...	...	@@ -1512,20 +1487,17 @@ class Slice(with_metaclass(utils.Singleton, object)):
1512	1487	for buffer_ in self.buffer_slices.values():
1513	1488	buffer_.discard_buffer()
1514	1489
1515		- def OnExportMask(self, pubsub_evt):
1516		- pass
1517		- ##imagedata = self.current_mask.imagedata
1518		- #imagedata = self.imagedata
1519		- #filename, filetype = pubsub_evt.data
1520		- #if (filetype == const.FILETYPE_IMAGEDATA):
1521		- #iu.Export(imagedata, filename)
1522		-
1523		- def _fill_holes_auto(self, pubsub_evt):
1524		- data = pubsub_evt.data
1525		- target = data['target']
1526		- conn = data['conn']
1527		- orientation = data['orientation']
1528		- size = data['size']
	1490	+ def OnExportMask(self, filename, filetype):
	1491	+ imagedata = self.current_mask.imagedata
	1492	+ # imagedata = self.imagedata
	1493	+ if (filetype == const.FILETYPE_IMAGEDATA):
	1494	+ iu.Export(imagedata, filename)
	1495	+
	1496	+ def _fill_holes_auto(self, parameters):
	1497	+ target = parameters['target']
	1498	+ conn = parameters['conn']
	1499	+ orientation = parameters['orientation']
	1500	+ size = parameters['size']
1529	1501
1530	1502	if target == '2D':
1531	1503	index = self.buffer_slices[orientation].index
...	...
...	...	@@ -214,12 +214,12 @@ class CrossInteractorStyle(DefaultInteractorStyle):
214	214	def SetUp(self):
215	215	self.viewer._set_cross_visibility(1)
216	216	Publisher.sendMessage('Toggle toolbar item',
217		- (self.state_code, True))
	217	+ _id=self.state_code, value=True)
218	218
219	219	def CleanUp(self):
220	220	self.viewer._set_cross_visibility(0)
221	221	Publisher.sendMessage('Toggle toolbar item',
222		- (self.state_code, False))
	222	+ _id=self.state_code, value=False)
223	223
224	224	def OnCrossMouseClick(self, obj, evt):
225	225	iren = obj.GetInteractor()
...	...	@@ -237,29 +237,29 @@ class CrossInteractorStyle(DefaultInteractorStyle):
237	237	wx, wy, wz = self.viewer.get_coordinate_cursor(mouse_x, mouse_y, self.picker)
238	238	px, py = self.viewer.get_slice_pixel_coord_by_world_pos(wx, wy, wz)
239	239	coord = self.viewer.calcultate_scroll_position(px, py)
240		- Publisher.sendMessage('Update cross position', (wx, wy, wz))
	240	+ Publisher.sendMessage('Update cross position', position=(wx, wy, wz))
241	241	self.ScrollSlice(coord)
242		- Publisher.sendMessage('Set ball reference position', (wx, wy, wz))
243		- Publisher.sendMessage('Co-registered points', (None, (wx, wy, wz, 0., 0., 0.)))
	242	+ Publisher.sendMessage('Set ball reference position', position=(wx, wy, wz))
	243	+ Publisher.sendMessage('Co-registered points', arg=None, position=(wx, wy, wz, 0., 0., 0.))
244	244
245	245	iren.Render()
246	246
247	247	def ScrollSlice(self, coord):
248	248	if self.orientation == "AXIAL":
249	249	Publisher.sendMessage(('Set scroll position', 'SAGITAL'),
250		- coord[0])
	250	+ index=coord[0])
251	251	Publisher.sendMessage(('Set scroll position', 'CORONAL'),
252		- coord[1])
	252	+ index=coord[1])
253	253	elif self.orientation == "SAGITAL":
254	254	Publisher.sendMessage(('Set scroll position', 'AXIAL'),
255		- coord[2])
	255	+ index=coord[2])
256	256	Publisher.sendMessage(('Set scroll position', 'CORONAL'),
257		- coord[1])
	257	+ index=coord[1])
258	258	elif self.orientation == "CORONAL":
259	259	Publisher.sendMessage(('Set scroll position', 'AXIAL'),
260		- coord[2])
	260	+ index=coord[2])
261	261	Publisher.sendMessage(('Set scroll position', 'SAGITAL'),
262		- coord[0])
	262	+ index=coord[0])
263	263
264	264
265	265	class WWWLInteractorStyle(DefaultInteractorStyle):
...	...	@@ -285,14 +285,14 @@ class WWWLInteractorStyle(DefaultInteractorStyle):
285	285	def SetUp(self):
286	286	self.viewer.on_wl = True
287	287	Publisher.sendMessage('Toggle toolbar item',
288		- (self.state_code, True))
	288	+ _id=self.state_code, value=True)
289	289	self.viewer.canvas.draw_list.append(self.viewer.wl_text)
290	290	self.viewer.UpdateCanvas()
291	291
292	292	def CleanUp(self):
293	293	self.viewer.on_wl = False
294	294	Publisher.sendMessage('Toggle toolbar item',
295		- (self.state_code, False))
	295	+ _id=self.state_code, value=False)
296	296	if self.viewer.wl_text is not None:
297	297	self.viewer.canvas.draw_list.remove(self.viewer.wl_text)
298	298	self.viewer.UpdateCanvas()
...	...	@@ -306,7 +306,8 @@ class WWWLInteractorStyle(DefaultInteractorStyle):
306	306	self.last_x, self.last_y = mouse_x, mouse_y
307	307
308	308	Publisher.sendMessage('Bright and contrast adjustment image',
309		- (self.acum_achange_window, self.acum_achange_level))
	309	+ window=self.acum_achange_window,
	310	+ level=self.acum_achange_level)
310	311
311	312	#self.SetWLText(self.acum_achange_level,
312	313	# self.acum_achange_window)
...	...	@@ -314,8 +315,9 @@ class WWWLInteractorStyle(DefaultInteractorStyle):
314	315	const.WINDOW_LEVEL['Manual'] = (self.acum_achange_window,\
315	316	self.acum_achange_level)
316	317	Publisher.sendMessage('Check window and level other')
317		- Publisher.sendMessage('Update window level value',(self.acum_achange_window,
318		- self.acum_achange_level))
	318	+ Publisher.sendMessage('Update window level value',
	319	+ window=self.acum_achange_window,
	320	+ level= self.acum_achange_level)
319	321	#Necessary update the slice plane in the volume case exists
320	322	Publisher.sendMessage('Update slice viewer')
321	323	Publisher.sendMessage('Render volume viewer')
...	...	@@ -374,11 +376,11 @@ class LinearMeasureInteractorStyle(DefaultInteractorStyle):
374	376
375	377	def SetUp(self):
376	378	Publisher.sendMessage('Toggle toolbar item',
377		- (self.state_code, True))
	379	+ _id=self.state_code, value=True)
378	380
379	381	def CleanUp(self):
380	382	Publisher.sendMessage('Toggle toolbar item',
381		- (self.state_code, False))
	383	+ _id=self.state_code, value=False)
382	384	self.picker.PickFromListOff()
383	385	Publisher.sendMessage("Remove incomplete measurements")
384	386
...	...	@@ -399,9 +401,9 @@ class LinearMeasureInteractorStyle(DefaultInteractorStyle):
399	401	self.viewer.scroll_enabled = True
400	402	else:
401	403	Publisher.sendMessage("Add measurement point",
402		- ((x, y, z), self._type,
403		- ORIENTATIONS[self.orientation],
404		- slice_number, self.radius))
	404	+ position=(x, y, z), type=self._type,
	405	+ location=ORIENTATIONS[self.orientation],
	406	+ slice_number=slice_number, radius=self.radius)
405	407	n = len(m.points)-1
406	408	self.creating = n, m, mr
407	409	self.viewer.UpdateCanvas()
...	...	@@ -416,13 +418,15 @@ class LinearMeasureInteractorStyle(DefaultInteractorStyle):
416	418	if self.picker.GetViewProp():
417	419	renderer = self.viewer.slice_data.renderer
418	420	Publisher.sendMessage("Add measurement point",
419		- ((x, y, z), self._type,
420		- ORIENTATIONS[self.orientation],
421		- slice_number, self.radius))
	421	+ position=(x, y, z), type=self._type,
	422	+ location=ORIENTATIONS[self.orientation],
	423	+ slice_number=slice_number,
	424	+ radius=self.radius)
422	425	Publisher.sendMessage("Add measurement point",
423		- ((x, y, z), self._type,
424		- ORIENTATIONS[self.orientation],
425		- slice_number, self.radius))
	426	+ position=(x, y, z), type=self._type,
	427	+ location=ORIENTATIONS[self.orientation],
	428	+ slice_number=slice_number,
	429	+ radius=self.radius)
426	430
427	431	n, (m, mr) = 1, self.measures.measures[self._ori][slice_number][-1]
428	432	self.creating = n, m, mr
...	...	@@ -434,7 +438,7 @@ class LinearMeasureInteractorStyle(DefaultInteractorStyle):
434	438	n, m, mr = self.selected
435	439	x, y, z = self._get_pos_clicked()
436	440	idx = self.measures._list_measures.index((m, mr))
437		- Publisher.sendMessage('Change measurement point position', (idx, n, (x, y, z)))
	441	+ Publisher.sendMessage('Change measurement point position', index=idx, npoint=n, pos=(x, y, z))
438	442	self.viewer.UpdateCanvas()
439	443	self.selected = None
440	444	self.viewer.scroll_enabled = True
...	...	@@ -444,13 +448,13 @@ class LinearMeasureInteractorStyle(DefaultInteractorStyle):
444	448	if self.selected:
445	449	n, m, mr = self.selected
446	450	idx = self.measures._list_measures.index((m, mr))
447		- Publisher.sendMessage('Change measurement point position', (idx, n, (x, y, z)))
	451	+ Publisher.sendMessage('Change measurement point position', index=idx, npoint=n, pos=(x, y, z))
448	452	self.viewer.UpdateCanvas()
449	453
450	454	elif self.creating:
451	455	n, m, mr = self.creating
452	456	idx = self.measures._list_measures.index((m, mr))
453		- Publisher.sendMessage('Change measurement point position', (idx, n, (x, y, z)))
	457	+ Publisher.sendMessage('Change measurement point position', index=idx, npoint=n, pos=(x, y, z))
454	458	self.viewer.UpdateCanvas()
455	459
456	460	else:
...	...	@@ -539,12 +543,12 @@ class PanMoveInteractorStyle(DefaultInteractorStyle):
539	543
540	544	def SetUp(self):
541	545	Publisher.sendMessage('Toggle toolbar item',
542		- (self.state_code, True))
	546	+ _id=self.state_code, value=True)
543	547
544	548	def CleanUp(self):
545	549	self.viewer.interactor.Unbind(wx.EVT_LEFT_DCLICK)
546	550	Publisher.sendMessage('Toggle toolbar item',
547		- (self.state_code, False))
	551	+ _id=self.state_code, value=False)
548	552
549	553	def OnPanMove(self, obj, evt):
550	554	if self.left_pressed:
...	...	@@ -575,12 +579,12 @@ class SpinInteractorStyle(DefaultInteractorStyle):
575	579
576	580	def SetUp(self):
577	581	Publisher.sendMessage('Toggle toolbar item',
578		- (self.state_code, True))
	582	+ _id=self.state_code, value=True)
579	583
580	584	def CleanUp(self):
581	585	self.viewer.interactor.Unbind(wx.EVT_LEFT_DCLICK)
582	586	Publisher.sendMessage('Toggle toolbar item',
583		- (self.state_code, False))
	587	+ _id=self.state_code, value=False)
584	588
585	589	def OnSpinMove(self, obj, evt):
586	590	iren = obj.GetInteractor()
...	...	@@ -620,12 +624,12 @@ class ZoomInteractorStyle(DefaultInteractorStyle):
620	624
621	625	def SetUp(self):
622	626	Publisher.sendMessage('Toggle toolbar item',
623		- (self.state_code, True))
	627	+ _id=self.state_code, value=True)
624	628
625	629	def CleanUp(self):
626	630	self.viewer.interactor.Unbind(wx.EVT_LEFT_DCLICK)
627	631	Publisher.sendMessage('Toggle toolbar item',
628		- (self.state_code, False))
	632	+ _id=self.state_code, value=False)
629	633
630	634	def OnZoomMoveLeft(self, obj, evt):
631	635	if self.left_pressed:
...	...	@@ -654,12 +658,12 @@ class ZoomSLInteractorStyle(vtk.vtkInteractorStyleRubberBandZoom):
654	658
655	659	def SetUp(self):
656	660	Publisher.sendMessage('Toggle toolbar item',
657		- (self.state_code, True))
	661	+ _id=self.state_code, value=True)
658	662
659	663	def CleanUp(self):
660	664	self.viewer.interactor.Unbind(wx.EVT_LEFT_DCLICK)
661	665	Publisher.sendMessage('Toggle toolbar item',
662		- (self.state_code, False))
	666	+ _id=self.state_code, value=False)
663	667
664	668	def OnUnZoom(self, evt):
665	669	mouse_x, mouse_y = self.viewer.interactor.GetLastEventPosition()
...	...	@@ -687,11 +691,11 @@ class ChangeSliceInteractorStyle(DefaultInteractorStyle):
687	691
688	692	def SetUp(self):
689	693	Publisher.sendMessage('Toggle toolbar item',
690		- (self.state_code, True))
	694	+ _id=self.state_code, value=True)
691	695
692	696	def CleanUp(self):
693	697	Publisher.sendMessage('Toggle toolbar item',
694		- (self.state_code, False))
	698	+ _id=self.state_code, value=False)
695	699
696	700	def OnChangeSliceMove(self, evt, obj):
697	701	if self.left_pressed:
...	...	@@ -779,17 +783,16 @@ class EditorInteractorStyle(DefaultInteractorStyle):
779	783	self.viewer.interactor.SetCursor(wx.StockCursor(wx.CURSOR_DEFAULT))
780	784	self.viewer.interactor.Render()
781	785
782		- def set_bsize(self, pubsub_evt):
783		- size = pubsub_evt.data
	786	+ def set_bsize(self, size):
784	787	self.config.cursor_size = size
785	788	self.viewer.slice_data.cursor.SetSize(size)
786	789
787		- def set_bformat(self, pubsub_evt):
788		- self.config.cursor_type = pubsub_evt.data
	790	+ def set_bformat(self, cursor_format):
	791	+ self.config.cursor_type = cursor_format
789	792	self._set_cursor()
790	793
791		- def set_boperation(self, pubsub_evt):
792		- self.config.operation = pubsub_evt.data
	794	+ def set_boperation(self, operation):
	795	+ self.config.operation = operation
793	796
794	797	def _set_cursor(self):
795	798	if self.config.cursor_type == const.BRUSH_SQUARE:
...	...	@@ -936,7 +939,7 @@ class EditorInteractorStyle(DefaultInteractorStyle):
936	939	size += 1
937	940
938	941	if size <= 100:
939		- Publisher.sendMessage('Set edition brush size', size)
	942	+ Publisher.sendMessage('Set edition brush size', size=size)
940	943	cursor.SetPosition(cursor.position)
941	944	self.viewer.interactor.Render()
942	945	else:
...	...	@@ -954,7 +957,7 @@ class EditorInteractorStyle(DefaultInteractorStyle):
954	957	size -= 1
955	958
956	959	if size > 0:
957		- Publisher.sendMessage('Set edition brush size', size)
	960	+ Publisher.sendMessage('Set edition brush size', size=size)
958	961	cursor.SetPosition(cursor.position)
959	962	self.viewer.interactor.Render()
960	963	else:
...	...	@@ -1005,23 +1008,23 @@ class WatershedConfig(with_metaclass(utils.Singleton, object)):
1005	1008	Publisher.subscribe(self.set_3dcon, "Set watershed 3d con")
1006	1009	Publisher.subscribe(self.set_gaussian_size, "Set watershed gaussian size")
1007	1010
1008		- def set_operation(self, pubsub_evt):
1009		- self.operation = WATERSHED_OPERATIONS[pubsub_evt.data]
	1011	+ def set_operation(self, operation):
	1012	+ self.operation = WATERSHED_OPERATIONS[operation]
1010	1013
1011		- def set_use_ww_wl(self, pubsub_evt):
1012		- self.use_ww_wl = pubsub_evt.data
	1014	+ def set_use_ww_wl(self, use_ww_wl):
	1015	+ self.use_ww_wl = use_ww_wl
1013	1016
1014		- def set_algorithm(self, pubsub_evt):
1015		- self.algorithm = pubsub_evt.data
	1017	+ def set_algorithm(self, algorithm):
	1018	+ self.algorithm = algorithm
1016	1019
1017		- def set_2dcon(self, pubsub_evt):
1018		- self.con_2d = pubsub_evt.data
	1020	+ def set_2dcon(self, con_2d):
	1021	+ self.con_2d = con_2d
1019	1022
1020		- def set_3dcon(self, pubsub_evt):
1021		- self.con_3d = pubsub_evt.data
	1023	+ def set_3dcon(self, con_3d):
	1024	+ self.con_3d = con_3d
1022	1025
1023		- def set_gaussian_size(self, pubsub_evt):
1024		- self.mg_size = pubsub_evt.data
	1026	+ def set_gaussian_size(self, size):
	1027	+ self.mg_size = size
1025	1028
1026	1029	WALGORITHM = {"Watershed": watershed,
1027	1030	"Watershed IFT": watershed_ift}
...	...	@@ -1124,13 +1127,12 @@ class WaterShedInteractorStyle(DefaultInteractorStyle):
1124	1127	cursor.SetSize(self.config.cursor_size)
1125	1128	self.viewer.slice_data.SetCursor(cursor)
1126	1129
1127		- def set_bsize(self, pubsub_evt):
1128		- size = pubsub_evt.data
	1130	+ def set_bsize(self, size):
1129	1131	self.config.cursor_size = size
1130	1132	self.viewer.slice_data.cursor.SetSize(size)
1131	1133
1132		- def set_bformat(self, pubsub_evt):
1133		- self.config.cursor_type = pubsub_evt.data
	1134	+ def set_bformat(self, brush_format):
	1135	+ self.config.cursor_type = brush_format
1134	1136	self._set_cursor()
1135	1137
1136	1138	def OnEnterInteractor(self, obj, evt):
...	...	@@ -1157,7 +1159,7 @@ class WaterShedInteractorStyle(DefaultInteractorStyle):
1157	1159	size -= 1
1158	1160
1159	1161	if size > 0:
1160		- Publisher.sendMessage('Set watershed brush size', size)
	1162	+ Publisher.sendMessage('Set watershed brush size', size=size)
1161	1163	cursor.SetPosition(cursor.position)
1162	1164	self.viewer.interactor.Render()
1163	1165	else:
...	...	@@ -1175,7 +1177,7 @@ class WaterShedInteractorStyle(DefaultInteractorStyle):
1175	1177	size += 1
1176	1178
1177	1179	if size <= 100:
1178		- Publisher.sendMessage('Set watershed brush size', size)
	1180	+ Publisher.sendMessage('Set watershed brush size', size=size)
1179	1181	cursor.SetPosition(cursor.position)
1180	1182	self.viewer.interactor.Render()
1181	1183	else:
...	...	@@ -1423,7 +1425,7 @@ class WaterShedInteractorStyle(DefaultInteractorStyle):
1423	1425	if roi_m.size:
1424	1426	roi_m[index] = operation
1425	1427
1426		- def expand_watershed(self, pubsub_evt):
	1428	+ def expand_watershed(self):
1427	1429	markers = self.matrix
1428	1430	image = self.viewer.slice_.matrix
1429	1431	self.viewer.slice_.do_threshold_to_all_slices()
...	...	@@ -1631,7 +1633,7 @@ class ReorientImageInteractorStyle(DefaultInteractorStyle):
1631	1633	self.viewer.slice_.rotations = [0, 0, 0]
1632	1634	self.viewer.slice_.q_orientation = np.array((1, 0, 0, 0))
1633	1635
1634		- Publisher.sendMessage('Update reorient angles', (0, 0, 0))
	1636	+ Publisher.sendMessage('Update reorient angles', angles=(0, 0, 0))
1635	1637
1636	1638	self._discard_buffers()
1637	1639	self.viewer.slice_.current_mask.clear_history()
...	...	@@ -1687,7 +1689,7 @@ class ReorientImageInteractorStyle(DefaultInteractorStyle):
1687	1689	self.viewer.slice_.q_orientation = transformations.quaternion_multiply(self.viewer.slice_.q_orientation, transformations.quaternion_about_axis(angle, axis))
1688	1690
1689	1691	az, ay, ax = transformations.euler_from_quaternion(self.viewer.slice_.q_orientation)
1690		- Publisher.sendMessage('Update reorient angles', (ax, ay, az))
	1692	+ Publisher.sendMessage('Update reorient angles', angles=(ax, ay, az))
1691	1693
1692	1694	self._discard_buffers()
1693	1695	if self.viewer.slice_.current_mask:
...	...	@@ -1713,8 +1715,8 @@ class ReorientImageInteractorStyle(DefaultInteractorStyle):
1713	1715	# print (z, y, x), tcoord
1714	1716	return tcoord
1715	1717
1716		- def _set_reorientation_angles(self, pubsub_evt):
1717		- ax, ay, az = pubsub_evt.data
	1718	+ def _set_reorientation_angles(self, angles):
	1719	+ ax, ay, az = angles
1718	1720	q = transformations.quaternion_from_euler(az, ay, ax)
1719	1721	self.viewer.slice_.q_orientation = q
1720	1722
...	...	@@ -1968,9 +1970,8 @@ class CropMaskInteractorStyle(DefaultInteractorStyle):
1968	1970	self.viewer.canvas.draw_list.remove(self.draw_retangle)
1969	1971	Publisher.sendMessage('Redraw canvas')
1970	1972
1971		- def CropMask(self, pubsub_evt):
	1973	+ def CropMask(self):
1972	1974	if self.viewer.orientation == "AXIAL":
1973		-
1974	1975	xi, xf, yi, yf, zi, zf = self.draw_retangle.box.GetLimits()
1975	1976
1976	1977	xi += 1
...	...	@@ -1978,7 +1979,7 @@ class CropMaskInteractorStyle(DefaultInteractorStyle):
1978	1979
1979	1980	yi += 1
1980	1981	yf += 1
1981		-
	1982	+
1982	1983	zi += 1
1983	1984	zf += 1
1984	1985
...	...	@@ -1986,13 +1987,13 @@ class CropMaskInteractorStyle(DefaultInteractorStyle):
1986	1987	cp_mask = self.viewer.slice_.current_mask.matrix.copy()
1987	1988
1988	1989	tmp_mask = self.viewer.slice_.current_mask.matrix[zi-1:zf+1, yi-1:yf+1, xi-1:xf+1].copy()
1989		-
	1990	+
1990	1991	self.viewer.slice_.current_mask.matrix[:] = 1
1991	1992
1992	1993	self.viewer.slice_.current_mask.matrix[zi-1:zf+1, yi-1:yf+1, xi-1:xf+1] = tmp_mask
1993	1994
1994	1995	self.viewer.slice_.current_mask.save_history(0, 'VOLUME', self.viewer.slice_.current_mask.matrix.copy(), cp_mask)
1995		-
	1996	+
1996	1997	self.viewer.slice_.buffer_slices['AXIAL'].discard_mask()
1997	1998	self.viewer.slice_.buffer_slices['CORONAL'].discard_mask()
1998	1999	self.viewer.slice_.buffer_slices['SAGITAL'].discard_mask()
...	...	@@ -2002,9 +2003,9 @@ class CropMaskInteractorStyle(DefaultInteractorStyle):
2002	2003	self.viewer.slice_.buffer_slices['SAGITAL'].discard_vtk_mask()
2003	2004
2004	2005	self.viewer.slice_.current_mask.was_edited = True
2005		- Publisher.sendMessage('Reload actual slice')
	2006	+ Publisher.sendMessage('Reload actual slice')
	2007	+
2006	2008
2007		-
2008	2009	class SelectPartConfig(with_metaclass(utils.Singleton, object)):
2009	2010	def __init__(self):
2010	2011	self.mask = None
...	...	@@ -2066,7 +2067,7 @@ class SelectMaskPartsInteractorStyle(DefaultInteractorStyle):
2066	2067	self.config.mask.name = self.config.mask_name
2067	2068	self.viewer.slice_._add_mask_into_proj(self.config.mask)
2068	2069	self.viewer.slice_.SelectCurrentMask(self.config.mask.index)
2069		- Publisher.sendMessage('Change mask selected', self.config.mask.index)
	2070	+ Publisher.sendMessage('Change mask selected', index=self.config.mask.index)
2070	2071
2071	2072	del self.viewer.slice_.aux_matrices['SELECT']
2072	2073	self.viewer.slice_.to_show_aux = ''
...	...