diff --git a/app.py b/app.py index 5bc6160..d35dfa6 100644 --- a/app.py +++ b/app.py @@ -46,11 +46,8 @@ try: from wx.adv import SplashScreen 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 Publisher -#import wx.lib.pubsub as ps -from wx.lib.pubsub import pub as Publisher + +from pubsub import pub as Publisher #import wx.lib.agw.advancedsplash as agw #if sys.platform.startswith('linux'): diff --git a/docs/devel/example_pubsub.py b/docs/devel/example_pubsub.py index 08a5613..44b5fe0 100644 --- a/docs/devel/example_pubsub.py +++ b/docs/devel/example_pubsub.py @@ -3,60 +3,58 @@ # More information about this design pattern can be found at: # http://wiki.wxpython.org/ModelViewController # http://wiki.wxpython.org/PubSub -import wx.lib.pubsub as ps +from pubsub import pub as Publisher + # The maintainer of Pubsub module is Oliver Schoenborn. # Since the end of 2006 Pubsub is now maintained separately on SourceForge at: # http://pubsub.sourceforge.net/ -class Student(): + +class Student: def __init__(self, name): self.name = name self.mood = ":|" self.__bind_events() - + def __bind_events(self): - ps.Publisher().subscribe(self.ReceiveProject, - 'Set Student Project') - ps.Publisher().subscribe(self.ReceiveGrade, - 'Set Student Grade') + Publisher.subscribe(self.ReceiveProject, "Set Student Project") + Publisher.subscribe(self.ReceiveGrade, "Set Student Grade") def ReceiveProject(self, pubsub_evt): projects_dict = pubsub_evt.data self.project = projects_dict[self.name] - print "%s: I've received the project %s" %(self.name, - self.project) - + print "%s: I've received the project %s" % (self.name, self.project) + def ReceiveGrade(self, pubsub_evt): grades_dict = pubsub_evt.data self.grade = grades_dict[self.name] - if (self.grade > 6): + if self.grade > 6: self.mood = ":)" else: self.mood = ":(" - print "%s: I've received the grade %d %s" %(self.name, - self.grade, - self.mood) - -class Teacher(): + print "%s: I've received the grade %d %s" % (self.name, self.grade, self.mood) + + +class Teacher: def __init__(self, name, course): self.name = name self.course = course def SendMessage(self): - print "%s: Telling students the projects" %(self.name) - ps.Publisher().sendMessage('Set Student Project', - self.course.projects_dict) - - print "\n%s: Telling students the grades" %(self.name) - ps.Publisher().sendMessage('Set Student Grade', - self.course.grades_dict) - -class Course(): + print "%s: Telling students the projects" % (self.name) + Publisher.sendMessage("Set Student Project", self.course.projects_dict) + + print "\n%s: Telling students the grades" % (self.name) + Publisher.sendMessage("Set Student Grade", self.course.grades_dict) + + +class Course: def __init__(self, subject): self.subject = subject self.grades_dict = {} self.projects_dict = {} + # Create students: s1 = Student("Coelho") s2 = Student("Victor") @@ -64,17 +62,11 @@ s3 = Student("Thomaz") # Create subject: cs102 = Course("InVesalius") -cs102.projects_dict = {"Coelho":"wxPython", - "Victor":"VTK", - "Thomaz":"PIL"} -cs102.grades_dict = {"Coelho":7, - "Victor":6.5, - "Thomaz":4} +cs102.projects_dict = {"Coelho": "wxPython", "Victor": "VTK", "Thomaz": "PIL"} +cs102.grades_dict = {"Coelho": 7, "Victor": 6.5, "Thomaz": 4} # Create teacher: andre = Teacher("Andre", cs102) - - andre.SendMessage() diff --git a/docs/devel/example_singleton_pubsub.py b/docs/devel/example_singleton_pubsub.py index c85da55..df2f29e 100644 --- a/docs/devel/example_singleton_pubsub.py +++ b/docs/devel/example_singleton_pubsub.py @@ -1,6 +1,6 @@ # Singleton and Publisher-Subscriber design patterns example. -import wx.lib.pubsub as ps +from pubsub import pub as Publisher class Singleton(type): # This is a Gary Robinson implementation: diff --git a/invesalius/control.py b/invesalius/control.py index 2c9211f..d142e1d 100644 --- a/invesalius/control.py +++ b/invesalius/control.py @@ -24,7 +24,7 @@ import textwrap import wx import numpy as np -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import invesalius.constants as const import invesalius.data.imagedata_utils as image_utils diff --git a/invesalius/data/coordinates.py b/invesalius/data/coordinates.py index c1b759d..201ed2d 100644 --- a/invesalius/data/coordinates.py +++ b/invesalius/data/coordinates.py @@ -25,7 +25,7 @@ import invesalius.constants as const from time import sleep from random import uniform -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher def GetCoordinates(trck_init, trck_id, ref_mode): diff --git a/invesalius/data/coregistration.py b/invesalius/data/coregistration.py index de365a3..4f9e18a 100644 --- a/invesalius/data/coregistration.py +++ b/invesalius/data/coregistration.py @@ -22,7 +22,7 @@ from time import sleep from numpy import asmatrix, mat, degrees, radians, identity import wx -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import invesalius.data.coordinates as dco import invesalius.data.transformations as tr diff --git a/invesalius/data/editor.py b/invesalius/data/editor.py index d147976..2174a01 100644 --- a/invesalius/data/editor.py +++ b/invesalius/data/editor.py @@ -18,7 +18,7 @@ #-------------------------------------------------------------------------- import math -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import vtk AXIAL = 2 diff --git a/invesalius/data/geometry.py b/invesalius/data/geometry.py index d9ed320..27cc93b 100644 --- a/invesalius/data/geometry.py +++ b/invesalius/data/geometry.py @@ -23,7 +23,7 @@ import math import numpy as np import vtk from six import with_metaclass -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import invesalius.constants as const import invesalius.utils as utils diff --git a/invesalius/data/imagedata_utils.py b/invesalius/data/imagedata_utils.py index cba4644..8b9e362 100644 --- a/invesalius/data/imagedata_utils.py +++ b/invesalius/data/imagedata_utils.py @@ -27,7 +27,7 @@ import imageio import numpy import numpy as np import vtk -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher from scipy.ndimage import shift, zoom from vtk.util import numpy_support diff --git a/invesalius/data/mask.py b/invesalius/data/mask.py index b36a6e9..6ee6f38 100644 --- a/invesalius/data/mask.py +++ b/invesalius/data/mask.py @@ -32,7 +32,7 @@ import invesalius.session as ses from invesalius_cy import floodfill -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher from scipy import ndimage class EditionHistoryNode(object): diff --git a/invesalius/data/measures.py b/invesalius/data/measures.py index 85393de..48397aa 100644 --- a/invesalius/data/measures.py +++ b/invesalius/data/measures.py @@ -6,7 +6,7 @@ import math import random import sys -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import numpy as np import vtk diff --git a/invesalius/data/polydata_utils.py b/invesalius/data/polydata_utils.py index 36830b9..b9c3cf1 100644 --- a/invesalius/data/polydata_utils.py +++ b/invesalius/data/polydata_utils.py @@ -21,7 +21,7 @@ import sys import vtk import wx -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import invesalius.constants as const import invesalius.data.vtk_utils as vu diff --git a/invesalius/data/record_coords.py b/invesalius/data/record_coords.py index 233e49c..e364cfa 100644 --- a/invesalius/data/record_coords.py +++ b/invesalius/data/record_coords.py @@ -23,7 +23,7 @@ import time import wx from numpy import array, savetxt, hstack,vstack, asarray import invesalius.gui.dialogs as dlg -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher class Record(threading.Thread): diff --git a/invesalius/data/slice_.py b/invesalius/data/slice_.py index e53235f..bb2bfbf 100644 --- a/invesalius/data/slice_.py +++ b/invesalius/data/slice_.py @@ -23,7 +23,7 @@ import numpy as np import vtk from scipy import ndimage from six import with_metaclass -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import invesalius.constants as const import invesalius.data.converters as converters diff --git a/invesalius/data/styles.py b/invesalius/data/styles.py index 1fbd6c0..7f7a72d 100644 --- a/invesalius/data/styles.py +++ b/invesalius/data/styles.py @@ -32,7 +32,7 @@ from imageio import imsave from scipy.ndimage import generate_binary_structure, watershed_ift from six import with_metaclass from skimage.morphology import watershed -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import invesalius.constants as const import invesalius.data.converters as converters diff --git a/invesalius/data/surface.py b/invesalius/data/surface.py index d30fe90..718cfeb 100644 --- a/invesalius/data/surface.py +++ b/invesalius/data/surface.py @@ -38,7 +38,7 @@ import vtk import wx import wx.lib.agw.genericmessagedialog as GMD -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher if sys.platform == 'win32': try: diff --git a/invesalius/data/trigger.py b/invesalius/data/trigger.py index fefb34f..081f672 100644 --- a/invesalius/data/trigger.py +++ b/invesalius/data/trigger.py @@ -21,7 +21,7 @@ import threading from time import sleep import wx -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher class Trigger(threading.Thread): diff --git a/invesalius/data/viewer_slice.py b/invesalius/data/viewer_slice.py index 2964444..53bec39 100644 --- a/invesalius/data/viewer_slice.py +++ b/invesalius/data/viewer_slice.py @@ -31,7 +31,7 @@ from vtk.wx.wxVTKRenderWindowInteractor import wxVTKRenderWindowInteractor import invesalius.data.styles as styles import wx import sys -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher try: from agw import floatspin as FS diff --git a/invesalius/data/viewer_volume.py b/invesalius/data/viewer_volume.py index fa50150..27c3bc8 100644 --- a/invesalius/data/viewer_volume.py +++ b/invesalius/data/viewer_volume.py @@ -28,7 +28,7 @@ from numpy.core.umath_tests import inner1d import wx import vtk from vtk.wx.wxVTKRenderWindowInteractor import wxVTKRenderWindowInteractor -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import random from scipy.spatial import distance diff --git a/invesalius/data/volume.py b/invesalius/data/volume.py index f3a894d..36cf178 100644 --- a/invesalius/data/volume.py +++ b/invesalius/data/volume.py @@ -23,7 +23,7 @@ import weakref import numpy import vtk import wx -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import invesalius.constants as const import invesalius.project as prj diff --git a/invesalius/data/vtk_utils.py b/invesalius/data/vtk_utils.py index 21201d7..87f19d5 100644 --- a/invesalius/data/vtk_utils.py +++ b/invesalius/data/vtk_utils.py @@ -20,7 +20,7 @@ import sys import vtk import wx -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import invesalius.constants as const from invesalius.gui.dialogs import ProgressDialog diff --git a/invesalius/gui/bitmap_preview_panel.py b/invesalius/gui/bitmap_preview_panel.py index 6564bb0..7c5101a 100644 --- a/invesalius/gui/bitmap_preview_panel.py +++ b/invesalius/gui/bitmap_preview_panel.py @@ -5,7 +5,7 @@ import numpy from vtk.util import numpy_support from vtk.wx.wxVTKRenderWindowInteractor import wxVTKRenderWindowInteractor -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import invesalius.constants as const import invesalius.data.vtk_utils as vtku diff --git a/invesalius/gui/brain_seg_dialog.py b/invesalius/gui/brain_seg_dialog.py index b6f97d0..4536884 100644 --- a/invesalius/gui/brain_seg_dialog.py +++ b/invesalius/gui/brain_seg_dialog.py @@ -8,7 +8,7 @@ import sys import time import wx -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher # Linux if installed plaidml with pip3 install --user if sys.platform.startswith("linux"): diff --git a/invesalius/gui/data_notebook.py b/invesalius/gui/data_notebook.py index 8396805..4052ba9 100644 --- a/invesalius/gui/data_notebook.py +++ b/invesalius/gui/data_notebook.py @@ -34,7 +34,7 @@ except ImportError: import wx.lib.flatnotebook as fnb import wx.lib.platebtn as pbtn -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import invesalius.constants as const import invesalius.data.slice_ as slice_ diff --git a/invesalius/gui/default_tasks.py b/invesalius/gui/default_tasks.py index 83bb35e..442af0b 100644 --- a/invesalius/gui/default_tasks.py +++ b/invesalius/gui/default_tasks.py @@ -22,7 +22,7 @@ try: import wx.lib.agw.foldpanelbar as fpb except ModuleNotFoundError: import wx.lib.foldpanelbar as fpb -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import invesalius.constants as const import invesalius.gui.data_notebook as nb diff --git a/invesalius/gui/default_viewers.py b/invesalius/gui/default_viewers.py index 2c076fc..660876e 100644 --- a/invesalius/gui/default_viewers.py +++ b/invesalius/gui/default_viewers.py @@ -21,7 +21,7 @@ import os import wx import wx.lib.agw.fourwaysplitter as fws -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import invesalius.data.viewer_slice as slice_viewer import invesalius.data.viewer_volume as volume_viewer @@ -316,7 +316,7 @@ class VolumeInteraction(wx.Panel): import wx.lib.platebtn as pbtn import wx.lib.buttons as btn -import wx.lib.pubsub as ps +from pubsub import pub as Publisher import wx.lib.colourselect as csel [BUTTON_RAYCASTING, BUTTON_VIEW, BUTTON_SLICE_PLANE, BUTTON_3D_STEREO, BUTTON_TARGET] = [wx.NewId() for num in range(5)] diff --git a/invesalius/gui/dialogs.py b/invesalius/gui/dialogs.py index 9510d7d..309d264 100644 --- a/invesalius/gui/dialogs.py +++ b/invesalius/gui/dialogs.py @@ -46,7 +46,7 @@ from vtk.wx.wxVTKRenderWindowInteractor import wxVTKRenderWindowInteractor from wx.lib import masked from wx.lib.agw import floatspin from wx.lib.wordwrap import wordwrap -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher try: from wx.adv import AboutDialogInfo, AboutBox diff --git a/invesalius/gui/dicom_preview_panel.py b/invesalius/gui/dicom_preview_panel.py index ffb8806..18daae4 100644 --- a/invesalius/gui/dicom_preview_panel.py +++ b/invesalius/gui/dicom_preview_panel.py @@ -29,7 +29,7 @@ import vtk from vtk.util import numpy_support from vtk.wx.wxVTKRenderWindowInteractor import wxVTKRenderWindowInteractor -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import invesalius.constants as const import invesalius.reader.dicom_reader as dicom_reader diff --git a/invesalius/gui/frame.py b/invesalius/gui/frame.py index 3aa23c6..4744e45 100644 --- a/invesalius/gui/frame.py +++ b/invesalius/gui/frame.py @@ -41,7 +41,7 @@ import wx.lib.agw.toasterbox as TB import wx.lib.popupctl as pc from invesalius import inv_paths from wx.lib.agw.aui.auibar import AUI_TB_PLAIN_BACKGROUND, AuiToolBar -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher try: from wx.adv import TaskBarIcon as wx_TaskBarIcon diff --git a/invesalius/gui/import_bitmap_panel.py b/invesalius/gui/import_bitmap_panel.py index b744434..0cb0d71 100644 --- a/invesalius/gui/import_bitmap_panel.py +++ b/invesalius/gui/import_bitmap_panel.py @@ -18,7 +18,7 @@ #-------------------------------------------------------------------------- import wx import wx.gizmos as gizmos -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import wx.lib.splitter as spl import invesalius.constants as const diff --git a/invesalius/gui/import_network_panel.py b/invesalius/gui/import_network_panel.py index f460bb5..e79c7b0 100644 --- a/invesalius/gui/import_network_panel.py +++ b/invesalius/gui/import_network_panel.py @@ -19,7 +19,7 @@ import wx import sys import wx.gizmos as gizmos -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import wx.lib.splitter as spl import invesalius.constants as const diff --git a/invesalius/gui/import_panel.py b/invesalius/gui/import_panel.py index 446b88a..62ff4e6 100644 --- a/invesalius/gui/import_panel.py +++ b/invesalius/gui/import_panel.py @@ -18,7 +18,7 @@ #-------------------------------------------------------------------------- import wx import wx.gizmos as gizmos -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import wx.lib.splitter as spl import invesalius.constants as const diff --git a/invesalius/gui/preferences.py b/invesalius/gui/preferences.py index 5defd0c..f41da69 100644 --- a/invesalius/gui/preferences.py +++ b/invesalius/gui/preferences.py @@ -2,7 +2,7 @@ import invesalius.constants as const import invesalius.session as ses import wx from invesalius.gui.language_dialog import ComboBoxLanguage -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher try: from agw import flatnotebook as fnb diff --git a/invesalius/gui/task_exporter.py b/invesalius/gui/task_exporter.py index d1c204f..5ccfb18 100644 --- a/invesalius/gui/task_exporter.py +++ b/invesalius/gui/task_exporter.py @@ -29,7 +29,7 @@ except ImportError: import wx.lib.hyperlink as hl import wx.lib.platebtn as pbtn -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import invesalius.constants as const import invesalius.gui.dialogs as dlg diff --git a/invesalius/gui/task_importer.py b/invesalius/gui/task_importer.py index f1648d6..6d60523 100644 --- a/invesalius/gui/task_importer.py +++ b/invesalius/gui/task_importer.py @@ -26,7 +26,7 @@ except ImportError: import wx.lib.hyperlink as hl import wx.lib.platebtn as pbtn -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import invesalius.constants as const import invesalius.gui.dialogs as dlg diff --git a/invesalius/gui/task_navigator.py b/invesalius/gui/task_navigator.py index b7b57ef..f0d4a3e 100644 --- a/invesalius/gui/task_navigator.py +++ b/invesalius/gui/task_navigator.py @@ -32,7 +32,7 @@ except ImportError: import wx.lib.foldpanelbar as fpb import wx.lib.masked.numctrl -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import wx.lib.colourselect as csel import wx.lib.platebtn as pbtn diff --git a/invesalius/gui/task_slice.py b/invesalius/gui/task_slice.py index ed84dec..64e16f6 100644 --- a/invesalius/gui/task_slice.py +++ b/invesalius/gui/task_slice.py @@ -31,7 +31,7 @@ except ImportError: import wx.lib.platebtn as pbtn import wx.lib.colourselect as csel -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import invesalius.data.mask as mask import invesalius.data.slice_ as slice_ diff --git a/invesalius/gui/task_surface.py b/invesalius/gui/task_surface.py index e3bb409..1e7b7b9 100644 --- a/invesalius/gui/task_surface.py +++ b/invesalius/gui/task_surface.py @@ -28,7 +28,7 @@ except ImportError: import wx.lib.hyperlink as hl import wx.lib.foldpanelbar as fpb -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import wx.lib.colourselect as csel import invesalius.constants as const diff --git a/invesalius/gui/task_tools.py b/invesalius/gui/task_tools.py index 30dc9d1..68a6bb9 100644 --- a/invesalius/gui/task_tools.py +++ b/invesalius/gui/task_tools.py @@ -27,7 +27,7 @@ except ImportError: import wx.lib.hyperlink as hl import wx.lib.platebtn as pbtn -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import invesalius.constants as constants import invesalius.constants as const diff --git a/invesalius/gui/widgets/canvas_renderer.py b/invesalius/gui/widgets/canvas_renderer.py index 7688082..0186f76 100644 --- a/invesalius/gui/widgets/canvas_renderer.py +++ b/invesalius/gui/widgets/canvas_renderer.py @@ -30,7 +30,7 @@ except ImportError: from weakrefmethod import WeakMethod from invesalius.data import converters -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher class CanvasEvent: diff --git a/invesalius/gui/widgets/clut_raycasting.py b/invesalius/gui/widgets/clut_raycasting.py index 142be55..40d620e 100644 --- a/invesalius/gui/widgets/clut_raycasting.py +++ b/invesalius/gui/widgets/clut_raycasting.py @@ -24,7 +24,7 @@ import sys import numpy import wx -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import invesalius.gui.dialogs as dialog import invesalius.constants as const diff --git a/invesalius/gui/widgets/slice_menu.py b/invesalius/gui/widgets/slice_menu.py index 78c88ff..ccc2d09 100644 --- a/invesalius/gui/widgets/slice_menu.py +++ b/invesalius/gui/widgets/slice_menu.py @@ -26,7 +26,7 @@ except(ImportError): from ordereddict import OrderedDict import wx -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import invesalius.constants as const import invesalius.data.slice_ as sl diff --git a/invesalius/plugins.py b/invesalius/plugins.py index 18ace3f..d04664a 100644 --- a/invesalius/plugins.py +++ b/invesalius/plugins.py @@ -21,7 +21,7 @@ import importlib.util import json import sys -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import invesalius.constants as consts from invesalius import inv_paths diff --git a/invesalius/presets.py b/invesalius/presets.py index 408e543..3087a2c 100644 --- a/invesalius/presets.py +++ b/invesalius/presets.py @@ -22,7 +22,7 @@ import plistlib import invesalius.constants as const -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher from invesalius import inv_paths from invesalius.utils import TwoWaysDictionary diff --git a/invesalius/project.py b/invesalius/project.py index 209a079..60fd275 100644 --- a/invesalius/project.py +++ b/invesalius/project.py @@ -30,7 +30,8 @@ import numpy as np import vtk import wx from six import with_metaclass -from wx.lib.pubsub import pub as Publisher + +from pubsub import pub as Publisher import invesalius.constants as const import invesalius.data.polydata_utils as pu diff --git a/invesalius/reader/bitmap_reader.py b/invesalius/reader/bitmap_reader.py index c7490b0..8cc16ce 100644 --- a/invesalius/reader/bitmap_reader.py +++ b/invesalius/reader/bitmap_reader.py @@ -25,7 +25,7 @@ import re import invesalius.constants as const import wx -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher from multiprocessing import cpu_count from vtk.util import numpy_support diff --git a/invesalius/reader/dicom_reader.py b/invesalius/reader/dicom_reader.py index ecdfaeb..52f8e3d 100644 --- a/invesalius/reader/dicom_reader.py +++ b/invesalius/reader/dicom_reader.py @@ -28,7 +28,7 @@ import gdcm # Not showing GDCM warning and debug messages gdcm.Trace_DebugOff() gdcm.Trace_WarningOff() -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import invesalius.constants as const import invesalius.reader.dicom as dicom diff --git a/invesalius/session.py b/invesalius/session.py index 1861758..e5465ad 100644 --- a/invesalius/session.py +++ b/invesalius/session.py @@ -33,8 +33,7 @@ import codecs import collections import json -#import wx.lib.pubsub as ps -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher import wx from invesalius.utils import Singleton, debug, decode diff --git a/invesalius/style.py b/invesalius/style.py index 2d24d93..e97d45b 100644 --- a/invesalius/style.py +++ b/invesalius/style.py @@ -17,7 +17,7 @@ # detalhes. #-------------------------------------------------------------------------- -from wx.lib.pubsub import pub as Publisher +from pubsub import pub as Publisher # mode.py -- libgit2 0.21.2