Skip to content

Commit

Permalink
Use PySubSub instead of deprecated wx.lib.pubsub
Browse files Browse the repository at this point in the history
  • Loading branch information
jmartens committed May 6, 2021
1 parent 3cc5290 commit d8c6d58
Show file tree
Hide file tree
Showing 11 changed files with 14 additions and 11 deletions.
2 changes: 1 addition & 1 deletion dicompyler/baseplugins/2dview.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dicompyler/baseplugins/anonymize.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion dicompyler/baseplugins/dvh.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dicompyler/baseplugins/quickopen.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion dicompyler/baseplugins/treeview.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion dicompyler/dicomgui.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dicompyler/guiutil.py
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
2 changes: 1 addition & 1 deletion dicompyler/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion dicompyler/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
4 changes: 2 additions & 2 deletions dicompyler/preferences.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -377,7 +377,7 @@ def main():

import tempfile, os
import wx
from wx.lib.pubsub import Publisher as pub
from pubsub import Publisher as pub

app = wx.App(False)

Expand Down
3 changes: 3 additions & 0 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ wxPython>=4.0.0b2
matplotlib>=1.3,<2.2
numpy>=1.13.1
https://github.com/darcymason/pydicom/archive/master.zip

# Fix #131
PyPubSub

0 comments on commit d8c6d58

Please sign in to comment.