Use PySubSub instead of deprecated wx.lib.pubsub

.github/FUNDING.yml

@@ -0,0 +1 @@
+patreon: bastula

dicompyler/baseplugins/2dview.py

@@ -10,7 +10,7 @@
 
 import wx
 from wx.xrc import XmlResource, XRCCTRL, XRCID
-from wx.lib.pubsub import pub
+from pubsub import pub
 from matplotlib import _cntr as cntr
 from matplotlib import __version__ as mplversion
 import numpy as np
@@ -589,13 +589,6 @@ def OnZoomOut(self, evt):
     def OnKeyDown(self, evt):
         """Change the image when the user presses the appropriate keys."""
 
-        # Needed to work around a bug in Windows. See main.py for more details.
-        if guiutil.IsMSWindows():
-            try:
-                evt = evt.data
-            except AttributeError:
-                keyname = evt.GetKeyCode()
-
         if len(self.images):
             keyname = evt.GetKeyCode()
             prevkey = [wx.WXK_UP, wx.WXK_PAGEUP]
@@ -624,14 +617,6 @@ def OnKeyDown(self, evt):
     def OnMouseWheel(self, evt):
         """Change the image when the user scrolls the mouse wheel."""
 
-        # Needed to work around a bug in Windows. See main.py for more details.
-        if guiutil.IsMSWindows():
-            try:
-                evt = evt.data
-            except AttributeError:
-                delta = evt.GetWheelDelta()
-                rot = evt.GetWheelRotation()
-
         if len(self.images):
             delta = evt.GetWheelDelta()
             rot = evt.GetWheelRotation()

dicompyler/baseplugins/anonymize.py

@@ -10,7 +10,7 @@
 
 import wx
 from wx.xrc import XmlResource, XRCCTRL, XRCID
-from wx.lib.pubsub import pub
+from pubsub import pub
 import os, threading
 from dicompyler import guiutil, util
 

dicompyler/baseplugins/dvh.py

@@ -12,7 +12,7 @@
 
 import wx
 from wx.xrc import XmlResource, XRCCTRL, XRCID
-from wx.lib.pubsub import pub
+from pubsub import pub
 from dicompyler import guiutil, util
 from dicompyler import guidvh
 import numpy as np

dicompyler/baseplugins/quickopen.py

@@ -11,7 +11,7 @@
 import logging
 logger = logging.getLogger('dicompyler.quickimport')
 import wx
-from wx.lib.pubsub import pub
+from pubsub import pub
 from dicompylercore import dicomparser
 from dicompyler import util
 

dicompyler/baseplugins/treeview.py

@@ -14,7 +14,7 @@
 from six.moves import queue
 import wx
 from wx.xrc import XmlResource, XRCCTRL, XRCID
-from wx.lib.pubsub import pub
+from pubsub import pub
 from wx.dataview import TreeListCtrl as tlc
 from dicompyler import guiutil, util
 try:

dicompyler/dicomgui.py

@@ -15,7 +15,7 @@
 import hashlib, os, threading
 import wx
 from wx.xrc import *
-from wx.lib.pubsub import pub
+from pubsub import pub
 import numpy as np
 from dicompylercore import dicomparser
 from dicompyler import guiutil, util

dicompyler/guiutil.py

@@ -10,7 +10,7 @@
 from dicompyler import util
 import wx
 from wx.xrc import XmlResource, XRCCTRL, XRCID
-from wx.lib.pubsub import pub
+from pubsub import pub
 
 def IsMSWindows():
     """Are we running on Windows?

dicompyler/main.py

@@ -20,7 +20,7 @@
 import wx.adv
 import wx.lib.dialogs, webbrowser
 import pydicom
-from wx.lib.pubsub import pub
+from pubsub import pub
 from dicompylercore import dvhcalc
 from dicompyler import __version__
 from dicompyler import guiutil, util
@@ -833,15 +833,15 @@ def OnKeyDown(self, evt):
             notebook tab instead of the panel receives focus."""
 
         if guiutil.IsMSWindows():
-            pub.sendMessage('main.key_down', msg=evt)
+            pub.sendMessage('main.key_down', evt=evt)
 
     def OnMouseWheel(self, evt):
         """Capture the mousewheel event when the notebook tab is focused.
             Currently this is used to workaround a bug in Windows since the
             notebook tab instead of the panel receives focus."""
 
         if guiutil.IsMSWindows():
-            pub.sendMessage('main.mousewheel', msg=evt)
+            pub.sendMessage('main.mousewheel', evt=evt)
 
     def OnPreferences(self, evt):
         """Load and show the Preferences dialog box."""

dicompyler/plugin.py

@@ -12,7 +12,7 @@
 import imp, os
 import wx
 from wx.xrc import *
-from wx.lib.pubsub import pub
+from pubsub import pub
 from dicompyler import guiutil, util
 
 def import_plugins(userpath=None):

dicompyler/preferences.py

@@ -10,7 +10,7 @@
 import os
 import wx
 from wx.xrc import *
-from wx.lib.pubsub import pub
+from pubsub import pub
 from dicompyler import guiutil, util
 
 try:
@@ -377,7 +377,7 @@ def main():
 
     import tempfile, os
     import wx
-    from wx.lib.pubsub import Publisher as pub
+    from pubsub import pub
 
     app = wx.App(False)
 

requirements.txt

@@ -1,5 +1,8 @@
 dicompyler-core[image]>=0.5.2
 wxPython>=4.0.0b2
-matplotlib>=1.3
+matplotlib>=1.3,<2.2
 numpy>=1.13.1
 https://github.com/darcymason/pydicom/archive/master.zip
+
+# Fix #131
+PyPubSub

setup.py

@@ -10,7 +10,7 @@
 from setuptools import setup, find_packages
 
 requires = [
-    'matplotlib>=1.3.0',
+    'matplotlib>=1.3.0,<2.2',
     'numpy>=1.2.1',
     'pillow>=1.0',
     'dicompyler-core>=0.5.2',