From 1fd6f082bb0820fdcadee109e7e81226f51a8a2b Mon Sep 17 00:00:00 2001 From: Aditya Panchal Date: Wed, 17 Oct 2018 14:47:56 -0500 Subject: [PATCH 1/5] 2dview: Fix issues with keyboard and mousewheel navigation on Windows. --- dicompyler/baseplugins/2dview.py | 15 --------------- dicompyler/main.py | 4 ++-- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/dicompyler/baseplugins/2dview.py b/dicompyler/baseplugins/2dview.py index c6a6953..6e8746c 100644 --- a/dicompyler/baseplugins/2dview.py +++ b/dicompyler/baseplugins/2dview.py @@ -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() diff --git a/dicompyler/main.py b/dicompyler/main.py index baa59da..5e188fb 100644 --- a/dicompyler/main.py +++ b/dicompyler/main.py @@ -833,7 +833,7 @@ 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. @@ -841,7 +841,7 @@ def OnMouseWheel(self, evt): 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.""" From 5a3e280f8dcc7054fab0877beea00a3d5ed43065 Mon Sep 17 00:00:00 2001 From: Aditya Panchal Date: Thu, 25 Jul 2019 21:55:01 -0500 Subject: [PATCH 2/5] Create FUNDING.yml --- .github/FUNDING.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 .github/FUNDING.yml diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 0000000..625dace --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +patreon: bastula From 3cc52907ffbdc87050e2f586eeee0214a516a5be Mon Sep 17 00:00:00 2001 From: Aditya Panchal Date: Sun, 5 Jan 2020 22:15:13 -0600 Subject: [PATCH 3/5] Pin upper bound of matplotlib to <2.2. Fixes #122. This is due to contour generation module being deprecated in later versions of matplotlib. --- requirements.txt | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 75ea30c..987eefd 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ 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 diff --git a/setup.py b/setup.py index eedd472..6458d51 100755 --- a/setup.py +++ b/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', From d8c6d585fe4057c14122abe10ebe352717b392d0 Mon Sep 17 00:00:00 2001 From: Jonathan Martens Date: Thu, 6 May 2021 09:55:09 +0200 Subject: [PATCH 4/5] Use PySubSub instead of deprecated wx.lib.pubsub fixes #131 --- dicompyler/baseplugins/2dview.py | 2 +- dicompyler/baseplugins/anonymize.py | 2 +- dicompyler/baseplugins/dvh.py | 2 +- dicompyler/baseplugins/quickopen.py | 2 +- dicompyler/baseplugins/treeview.py | 2 +- dicompyler/dicomgui.py | 2 +- dicompyler/guiutil.py | 2 +- dicompyler/main.py | 2 +- dicompyler/plugin.py | 2 +- dicompyler/preferences.py | 4 ++-- requirements.txt | 3 +++ 11 files changed, 14 insertions(+), 11 deletions(-) diff --git a/dicompyler/baseplugins/2dview.py b/dicompyler/baseplugins/2dview.py index 6e8746c..accec68 100644 --- a/dicompyler/baseplugins/2dview.py +++ b/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 diff --git a/dicompyler/baseplugins/anonymize.py b/dicompyler/baseplugins/anonymize.py index ad837c3..306e8b7 100755 --- a/dicompyler/baseplugins/anonymize.py +++ b/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 diff --git a/dicompyler/baseplugins/dvh.py b/dicompyler/baseplugins/dvh.py index 2a0863c..a869d26 100755 --- a/dicompyler/baseplugins/dvh.py +++ b/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 diff --git a/dicompyler/baseplugins/quickopen.py b/dicompyler/baseplugins/quickopen.py index a84537f..7bd00c5 100644 --- a/dicompyler/baseplugins/quickopen.py +++ b/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 diff --git a/dicompyler/baseplugins/treeview.py b/dicompyler/baseplugins/treeview.py index 8135cf3..df8983c 100755 --- a/dicompyler/baseplugins/treeview.py +++ b/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: diff --git a/dicompyler/dicomgui.py b/dicompyler/dicomgui.py index 642e266..462a0b1 100755 --- a/dicompyler/dicomgui.py +++ b/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 diff --git a/dicompyler/guiutil.py b/dicompyler/guiutil.py index c5ec10d..076802e 100755 --- a/dicompyler/guiutil.py +++ b/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? diff --git a/dicompyler/main.py b/dicompyler/main.py index 5e188fb..b602505 100644 --- a/dicompyler/main.py +++ b/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 diff --git a/dicompyler/plugin.py b/dicompyler/plugin.py index ff417b0..feab73b 100755 --- a/dicompyler/plugin.py +++ b/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): diff --git a/dicompyler/preferences.py b/dicompyler/preferences.py index 8d73980..c0b47a7 100755 --- a/dicompyler/preferences.py +++ b/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 Publisher as pub app = wx.App(False) diff --git a/requirements.txt b/requirements.txt index 987eefd..8719332 100644 --- a/requirements.txt +++ b/requirements.txt @@ -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 From 368fb51d9e00d5a833979e896dc228541cfbc6fb Mon Sep 17 00:00:00 2001 From: Jonathan Martens Date: Mon, 1 Nov 2021 16:50:57 +0100 Subject: [PATCH 5/5] Fix import statement missed in search and replace in previous commit --- dicompyler/preferences.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dicompyler/preferences.py b/dicompyler/preferences.py index c0b47a7..7842dba 100755 --- a/dicompyler/preferences.py +++ b/dicompyler/preferences.py @@ -377,7 +377,7 @@ def main(): import tempfile, os import wx - from pubsub import Publisher as pub + from pubsub import pub app = wx.App(False)