Fix a variety of wx related errors

.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()
@@ -689,7 +674,7 @@ def OnMouseMotion(self, evt):
             # Custom cursors with > 2 colors only works on Windows currently
             if guiutil.IsMSWindows():
                 image = wx.Image(util.GetResourcePath('contrast_high.png'))
-                self.SetCursor(wx.CursorFromImage(image))
+                self.SetCursor(wx.Cursor(image))
         # Update the positon and values of the mouse cursor
         self.mousepos = evt.GetPosition()
         self.OnUpdatePositionValues(evt)

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/anonymize.xrc

@@ -23,12 +23,12 @@
                 </object>
               </object>
             </object>
-            <flag>wxALL|wxEXPAND|wxALIGN_CENTRE</flag>
+            <flag>wxALL|wxEXPAND</flag>
           </object>
           <label>Folder for Anonymized DICOM Files</label>
           <orient>wxVERTICAL</orient>
         </object>
-        <flag>wxALL|wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxEXPAND</flag>
         <border>3</border>
       </object>
       <object class="sizeritem">
@@ -63,7 +63,7 @@
               <object class="sizeritem">
                 <object class="wxTextCtrl" name="txtFirstName"/>
                 <option>2</option>
-                <flag>wxALL|wxEXPAND|wxALIGN_CENTRE</flag>
+                <flag>wxALL|wxEXPAND</flag>
               </object>
               <object class="spacer">
                 <size>7,0</size>
@@ -83,12 +83,12 @@
                   <value>anonymous</value>
                 </object>
                 <option>2</option>
-                <flag>wxALL|wxEXPAND|wxALIGN_CENTRE</flag>
+                <flag>wxALL|wxEXPAND</flag>
               </object>
               <orient>wxHORIZONTAL</orient>
             </object>
             <option>1</option>
-            <flag>wxALL|wxEXPAND|wxALIGN_CENTRE</flag>
+            <flag>wxALL|wxEXPAND</flag>
           </object>
           <object class="spacer">
             <size>0,5</size>
@@ -124,7 +124,7 @@
                 <flag>wxALIGN_CENTRE</flag>
               </object>
             </object>
-            <flag>wxALL|wxEXPAND|wxALIGN_CENTRE</flag>
+            <flag>wxALL|wxEXPAND</flag>
           </object>
           <object class="spacer">
             <size>0,5</size>
@@ -169,7 +169,7 @@
           <label>Options</label>
           <orient>wxVERTICAL</orient>
         </object>
-        <flag>wxALL|wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxEXPAND</flag>
         <border>3</border>
       </object>
       <object class="spacer">
@@ -191,7 +191,7 @@
             </object>
           </object>
         </object>
-        <flag>wxALL|wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxEXPAND</flag>
         <border>3</border>
       </object>
       <object class="spacer">

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/dvh.xrc

@@ -10,12 +10,12 @@
           <object class="sizeritem">
             <object class="unknown" name="panelDVH"/>
             <option>1</option>
-            <flag>wxALL|wxEXPAND|wxALIGN_CENTRE|wxADJUST_MINSIZE</flag>
+            <flag>wxALL|wxEXPAND|wxADJUST_MINSIZE</flag>
             <border>4</border>
           </object>
         </object>
         <option>5</option>
-        <flag>wxALL|wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxEXPAND</flag>
       </object>
       <object class="sizeritem">
         <object class="wxBoxSizer">
@@ -27,7 +27,7 @@
                 <object class="wxStaticText" name="lblType">
                   <label>Type:</label>
                 </object>
-                <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                <flag>wxALIGN_CENTRE_VERTICAL</flag>
               </object>
               <object class="spacer">
                 <size>3,0</size>
@@ -42,7 +42,7 @@
                   </content>
                   <selection>0</selection>
                 </object>
-                <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                <flag>wxALIGN_CENTRE_VERTICAL</flag>
               </object>
               <object class="spacer">
                 <size>5,0</size>
@@ -52,7 +52,7 @@
                 <object class="wxStaticText" name="lblConstraintType">
                   <label>   Dose:</label>
                 </object>
-                <flag>wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
+                <flag>wxALIGN_CENTRE_VERTICAL</flag>
               </object>
               <object class="spacer">
                 <size>3,0</size>
@@ -74,7 +74,7 @@
                   <min>0</min>
                 </object>
                 <option>4</option>
-                <flag>wxALL|wxEXPAND|wxALIGN_CENTRE_VERTICAL</flag>
+                <flag>wxALL|wxEXPAND</flag>
               </object>
               <object class="spacer">
                 <size>3,0</size>
@@ -83,7 +83,7 @@
                 <object class="wxStaticText" name="lblConstraintTypeUnits">
                   <label>%  </label>
                 </object>
-                <flag>wxALIGN_LEFT|wxALIGN_CENTRE_VERTICAL</flag>
+                <flag>wxALIGN_CENTRE_VERTICAL</flag>
               </object>
               <object class="spacer">
                 <size>5,0</size>
@@ -126,12 +126,12 @@
               </object>
             </object>
             <option>2</option>
-            <flag>wxALL|wxEXPAND|wxALIGN_CENTRE</flag>
+            <flag>wxALL|wxEXPAND</flag>
           </object>
           <orient>wxHORIZONTAL</orient>
         </object>
         <option>0</option>
-        <flag>wxALL|wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxEXPAND</flag>
       </object>
       <orient>wxVERTICAL</orient>
     </object>

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/baseplugins/treeview.xrc

@@ -25,7 +25,7 @@
           <orient>wxVERTICAL</orient>
         </object>
         <option>0</option>
-        <flag>wxALL|wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxEXPAND</flag>
         <border>1</border>
       </object>
       <object class="spacer">
@@ -39,16 +39,16 @@
               <object class="sizeritem">
                 <object class="unknown" name="tlcTreeView"/>
                 <option>1</option>
-                <flag>wxALL|wxEXPAND|wxALIGN_CENTRE|wxADJUST_MINSIZE</flag>
+                <flag>wxALL|wxEXPAND|wxADJUST_MINSIZE</flag>
               </object>
             </object>
             <option>3</option>
-            <flag>wxALL|wxEXPAND|wxALIGN_CENTRE</flag>
+            <flag>wxALL|wxEXPAND</flag>
           </object>
           <orient>wxVERTICAL</orient>
         </object>
         <option>5</option>
-        <flag>wxALL|wxEXPAND|wxALIGN_CENTRE</flag>
+        <flag>wxALL|wxEXPAND</flag>
       </object>
       <orient>wxVERTICAL</orient>
     </object>

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?
@@ -200,7 +200,7 @@ def __init__(self, parent, item, data=None, color=None, pubsubname=''):
         grid.Add((3,0), 0)
         grid.Add(self.colorbox, 0, flag=wx.ALIGN_CENTRE)
         grid.Add((5,0), 0)
-        grid.Add(self.checkbox, 1, flag=wx.EXPAND|wx.ALL|wx.ALIGN_CENTRE)
+        grid.Add(self.checkbox, 1, flag=wx.EXPAND|wx.ALL)
 
         # Decrease the font size on Mac
         if IsMac():

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
@@ -129,11 +129,11 @@ def LogExcepthook(*exc_info):
         mainGrid = wx.BoxSizer(wx.VERTICAL)
         hGrid = wx.BoxSizer(wx.HORIZONTAL)
         if guiutil.IsMac():
-            hGrid.Add(self.panelGeneral, 1, flag=wx.EXPAND|wx.ALL|wx.ALIGN_CENTRE, border=4)
+            hGrid.Add(self.panelGeneral, 1, flag=wx.EXPAND|wx.ALL, border=4)
         else:
-            hGrid.Add(self.panelGeneral, 1, flag=wx.EXPAND|wx.ALL|wx.ALIGN_CENTRE)
+            hGrid.Add(self.panelGeneral, 1, flag=wx.EXPAND|wx.ALL)
 
-        mainGrid.Add(hGrid, 1, flag=wx.EXPAND|wx.ALL|wx.ALIGN_CENTRE)
+        mainGrid.Add(hGrid, 1, flag=wx.EXPAND|wx.ALL)
 
         # Load the menu for the frame
         menuMain = self.res.LoadMenuBar('menuMain')
@@ -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)