[med-svn] [dicompyler] 12/15: Before merge with master
Vojtech Kulvait
kulvait-guest at moszumanska.debian.org
Tue Sep 19 22:19:11 UTC 2017
This is an automated email from the git hooks/post-receive script.
kulvait-guest pushed a commit to branch master
in repository dicompyler.
commit b18c19c60a6ee849a9aaeaa783b256eb6dd7cdec
Author: Vojtěch Kulvait <kulvait at gmail.com>
Date: Wed Sep 20 00:05:54 2017 +0200
Before merge with master
---
debian/patches/092017DEBUG_main.patch | 201 ------------------
debian/patches/more_wx30_patches.patch | 376 ---------------------------------
debian/patches/series_DEBUG | 11 -
3 files changed, 588 deletions(-)
diff --git a/debian/patches/092017DEBUG_main.patch b/debian/patches/092017DEBUG_main.patch
deleted file mode 100644
index 58d7ce8..0000000
--- a/debian/patches/092017DEBUG_main.patch
+++ /dev/null
@@ -1,201 +0,0 @@
-diff --git a/dicompyler/main.py b/dicompyler/main.py
-index a067e8d..1f1393e 100644
---- a/dicompyler/main.py
-+++ b/dicompyler/main.py
-@@ -9,9 +9,13 @@
- # available at http://code.google.com/p/dicompyler/
-
- # Configure logging for dicompyler
-+DEBUG = True
- import logging, logging.handlers
- logger = logging.getLogger('dicompyler')
- logger.setLevel(logging.DEBUG)
-+#If doing debugging, print messages to the console
-+if DEBUG:
-+ logging.basicConfig(format='%(levelname)s:%(message)s', level=logging.DEBUG)
-
- import os, threading
- import sys, traceback
-@@ -31,10 +35,9 @@ __version__ = "0.4.2"
-
- class MainFrame(wx.Frame):
- def __init__(self, parent, id, title, res):
--
- # Initialize logging
- logger = logging.getLogger('dicompyler')
--
-+ logger.debug("MainFrame:__init__")
- # Configure the exception hook to process threads as well
- self.InstallThreadExcepthook()
-
-@@ -44,9 +47,8 @@ class MainFrame(wx.Frame):
- text = "".join(traceback.format_exception(*exc_info))
- logger.error("Unhandled exception: %s", text)
- pub.sendMessage('logging.exception', text)
--
- sys.excepthook = LogExcepthook
--
-+
- # Modify the logging system from pydicom to capture important messages
- pydicom_logger = logging.getLogger('pydicom')
- for l in pydicom_logger.handlers:
-@@ -54,6 +56,7 @@ class MainFrame(wx.Frame):
-
- # Add file logger
- logpath = os.path.join(guiutil.get_data_dir(), 'logs')
-+ logger.info('App logs are stored in %s.', logpath)
- if not os.path.exists(logpath):
- os.makedirs(logpath)
- self.fh = logging.handlers.RotatingFileHandler(
-@@ -61,34 +64,37 @@ class MainFrame(wx.Frame):
- maxBytes=524288, backupCount=7)
- self.fh.setFormatter(logging.Formatter(
- '%(asctime)s - %(name)s - %(levelname)s - %(message)s'))
-- self.fh.setLevel(logging.WARNING)
-+ if not DEBUG:
-+ self.fh.setLevel(logging.WARNING)
-+ else:
-+ self.fh.setLevel(logging.DEBUG)
- logger.addHandler(self.fh)
- pydicom_logger.addHandler(self.fh)
--
-+ logger.debug("MainFrame:__init__1")
- # Add console logger if not frozen
-- if not util.main_is_frozen():
-- self.ch = logging.StreamHandler()
-- self.ch.setFormatter(logging.Formatter(
-- '%(levelname)s: %(message)s'))
-- self.ch.setLevel(logging.WARNING)
-- logger.addHandler(self.ch)
-- pydicom_logger.addHandler(self.ch)
-- # Otherwise if frozen, send stdout/stderror to /dev/null since
-- # logging the messages seems to cause instability due to recursion
-- else:
-- devnull = open(os.devnull, 'w')
-- sys.stdout = devnull
-- sys.stderr = devnull
--
-+ if not DEBUG:
-+ if not util.main_is_frozen():
-+ self.ch = logging.StreamHandler()
-+ self.ch.setFormatter(logging.Formatter(
-+ '%(levelname)s: %(message)s'))
-+ self.ch.setLevel(logging.WARNING)
-+ logger.addHandler(self.ch)
-+ pydicom_logger.addHandler(self.ch)
-+ # Otherwise if frozen, send stdout/stderror to /dev/null since
-+ # logging the messages seems to cause instability due to recursion
-+ else:
-+ devnull = open(os.devnull, 'w')
-+ sys.stdout = devnull
-+ sys.stderr = devnull
- # Set the window size
- if guiutil.IsMac():
- size=(900, 700)
- else:
- size=(850, 625)
--
-+ logger.debug("MainFrame:__init__2")
- wx.Frame.__init__(self, parent, id, title, pos=wx.DefaultPosition,
- size=size, style=wx.DEFAULT_FRAME_STYLE)
--
-+ logger.debug("MainFrame:__init__3")
- # Set up the status bar
- self.sb = self.CreateStatusBar(3)
-
-@@ -101,7 +107,7 @@ class MainFrame(wx.Frame):
-
- # Load the main panel for the program
- self.panelGeneral = self.res.LoadPanel(self, 'panelGeneral')
--
-+ logger.debug("MainFrame:__init__4")
- # Initialize the General panel controls
- self.notebook = XRCCTRL(self, 'notebook')
- self.notebookTools = XRCCTRL(self, 'notebookTools')
-@@ -118,7 +124,7 @@ class MainFrame(wx.Frame):
- self.lblStructureMeanDose = XRCCTRL(self, 'lblStructureMeanDose')
- self.cclbStructures = guiutil.ColorCheckListBox(self.notebookTools, 'structure')
- self.cclbIsodoses = guiutil.ColorCheckListBox(self.notebookTools, 'isodose')
--
-+ logger.debug("MainFrame:__init__5")
- # Modify the control and font size on Mac
- controls = [self.notebookTools, self.choiceStructure]
-
-@@ -128,7 +134,7 @@ class MainFrame(wx.Frame):
- for control in controls:
- control.SetWindowVariant(wx.WINDOW_VARIANT_SMALL)
- control.SetFont(font)
--
-+ logger.debug("MainFrame:__init__6")
- # Setup the layout for the frame
- mainGrid = wx.BoxSizer(wx.VERTICAL)
- hGrid = wx.BoxSizer(wx.HORIZONTAL)
-@@ -147,7 +153,7 @@ class MainFrame(wx.Frame):
- wx.App_SetMacAboutMenuItemId(XRCID('menuAbout'))
- wx.App_SetMacPreferencesMenuItemId(XRCID('menuPreferences'))
- wx.App_SetMacExitMenuItemId(XRCID('menuExit'))
--
-+ logger.debug("MainFrame:__init__7")
- # Set the menu as the default menu for this frame
- self.SetMenuBar(menuMain)
-
-@@ -176,7 +182,7 @@ class MainFrame(wx.Frame):
- wx.EVT_MENU(self, XRCID('menuAbout'), self.OnAbout)
- wx.EVT_MENU(self, XRCID('menuHomepage'), self.OnHomepage)
- wx.EVT_MENU(self, XRCID('menuLicense'), self.OnLicense)
--
-+ logger.debug("MainFrame:__init__8")
- # Load the toolbar for the frame
- toolbarMain = self.res.LoadToolBar(self, 'toolbarMain')
- self.SetToolBar(toolbarMain)
-@@ -207,7 +213,7 @@ class MainFrame(wx.Frame):
-
- self.SetSizer(mainGrid)
- self.Layout()
--
-+ logger.debug("MainFrame:__init__9")
- #Set the Minumum size
- self.SetMinSize(size)
- self.Centre(wx.BOTH)
-@@ -235,6 +241,7 @@ class MainFrame(wx.Frame):
- self.prefmgr = preferences.PreferencesManager(
- parent = None, appname = 'dicompyler', name = 'Options')
- sp = wx.StandardPaths.Get()
-+ logger.debug("MainFrame:__init__10")
- self.generalpreftemplate = [
- {'DICOM Import Settings':
- [{'name':'Import Location',
-@@ -268,12 +275,15 @@ class MainFrame(wx.Frame):
- 'callback':'general.advanced.detailed_logging'}]
- }]
- self.preftemplate = [{'General':self.generalpreftemplate}]
-+ logger.debug("MainFrame:__init__11")
- pub.sendMessage('preferences.updated.template', self.preftemplate)
--
-+ logger.debug("MainFrame:__init__12")
- # Initialize variables
- self.ptdata = {}
-
- # Set up pubsub
-+ if DEBUG:
-+ logger.info("Subscription from main.")
- pub.subscribe(self.OnLoadPatientData, 'patient.updated.raw_data')
- pub.subscribe(self.OnStructureCheck, 'colorcheckbox.checked.structure')
- pub.subscribe(self.OnStructureUncheck, 'colorcheckbox.unchecked.structure')
-@@ -285,6 +295,8 @@ class MainFrame(wx.Frame):
- pub.subscribe(self.OnOpenPatient, 'dicomgui.show')
-
- # Send a message to the logging system to turn on/off detailed logging
-+ if DEBUG:
-+ logger.info("Sending message from main.")
- pub.sendMessage('preferences.requested.value',
- 'general.advanced.detailed_logging')
-
-@@ -926,6 +938,7 @@ class MainFrame(wx.Frame):
-
- class dicompyler(wx.App):
- def OnInit(self):
-+ logger.debug("dicompyler:OnInit")
- # no-op in wxPython2.8 and later: wx.InitAllImageHandlers()
- wx.GetApp().SetAppName("dicompyler")
-
diff --git a/debian/patches/more_wx30_patches.patch b/debian/patches/more_wx30_patches.patch
deleted file mode 100644
index d3cd106..0000000
--- a/debian/patches/more_wx30_patches.patch
+++ /dev/null
@@ -1,376 +0,0 @@
-Author: Vojtech Kulvait <kulvait at gmail.com>
-Last-Update: Mon, 18 Sep 2017 00:27:42 +0200
-Bug-Debian: https://bugs.debian.org/854837
-Description: More wx3.0 patches to make dicompyler run
-
---- a/dicompyler/baseplugins/2dview.py
-+++ b/dicompyler/baseplugins/2dview.py
-@@ -10,9 +10,7 @@
-
- import wx
- from wx.xrc import XmlResource, XRCCTRL, XRCID
--import wx.lib.pubsub.setuparg1
--import wx.lib.pubsub.core
--pub = wx.lib.pubsub.core.Publisher()
-+from wx.lib.pubsub import pub
- from matplotlib import _cntr as cntr
- from matplotlib import __version__ as mplversion
- import numpy as np
-@@ -194,18 +192,18 @@ class plugin2DView(wx.Panel):
- self.Unbind(wx.EVT_RIGHT_DOWN)
- self.Unbind(wx.EVT_RIGHT_UP)
- self.Unbind(wx.EVT_MOTION)
-- pub.unsubscribe(self.OnKeyDown)
-- pub.unsubscribe(self.OnMouseWheel)
-- pub.unsubscribe(self.OnRefresh)
-+ pub.unsubscribe(self.OnKeyDown, 'main.key_down')
-+ pub.unsubscribe(self.OnMouseWheel, 'main.mousewheel')
-+ pub.unsubscribe(self.OnRefresh, '2dview.refresh')
-
- def OnDestroy(self, evt):
- """Unbind to all events before the plugin is destroyed."""
-
-- pub.unsubscribe(self.OnUpdatePatient)
-- pub.unsubscribe(self.OnStructureCheck)
-- pub.unsubscribe(self.OnIsodoseCheck)
-- pub.unsubscribe(self.OnDrawingPrefsChange)
-- pub.unsubscribe(self.OnPluginLoaded)
-+ pub.unsubscribe(self.OnUpdatePatient, 'patient.updated.parsed_data')
-+ pub.unsubscribe(self.OnStructureCheck, 'structures.checked')
-+ pub.unsubscribe(self.OnIsodoseCheck, 'isodoses.checked')
-+ pub.unsubscribe(self.OnDrawingPrefsChange, '2dview.drawingprefs')
-+ pub.unsubscribe(self.OnPluginLoaded, 'plugin.loaded.2dview')
- self.OnUnfocus()
-
- def OnStructureCheck(self, msg):
---- a/dicompyler/baseplugins/anonymize.py
-+++ b/dicompyler/baseplugins/anonymize.py
-@@ -10,9 +10,7 @@
-
- import wx
- from wx.xrc import XmlResource, XRCCTRL, XRCID
--import wx.lib.pubsub.setuparg1
--import wx.lib.pubsub.core
--pub = wx.lib.pubsub.core.Publisher()
-+from wx.lib.pubsub import pub
- import os, threading
- from dicompyler import guiutil, util
-
-@@ -39,6 +37,7 @@ class plugin:
- self.parent = parent
-
- # Set up pubsub
-+ print "Subscibing from anonymize"
- pub.subscribe(self.OnUpdatePatient, 'patient.updated.raw_data')
-
- # Load the XRC file for our gui resources
-@@ -333,4 +332,10 @@ class AnonymizeDialog(wx.Dialog):
- else:
- self.privatetags = False
-
-- self.EndModal(wx.ID_OK)
-\ No newline at end of file
-+ self.EndModal(wx.ID_OK)
-+
-+ def OnDestroy(self, evt):
-+ """Unbind to all events before the plugin is destroyed."""
-+ print "Unsubscribing from anonymize"
-+ pub.unsubscribe(self.OnUpdatePatient, 'patient.updated.raw_data')
-+
---- a/dicompyler/baseplugins/dvh.py
-+++ b/dicompyler/baseplugins/dvh.py
-@@ -12,9 +12,7 @@
-
- import wx
- from wx.xrc import XmlResource, XRCCTRL, XRCID
--import wx.lib.pubsub.setuparg1
--import wx.lib.pubsub.core
--pub = wx.lib.pubsub.core.Publisher()
-+from wx.lib.pubsub import pub
- from dicompyler import guiutil, util
- from dicompyler import dvhdata, guidvh
- from dicompyler import wxmpl
-@@ -134,9 +132,9 @@ class pluginDVH(wx.Panel):
- def OnDestroy(self, evt):
- """Unbind to all events before the plugin is destroyed."""
-
-- pub.unsubscribe(self.OnUpdatePatient)
-- pub.unsubscribe(self.OnStructureCheck)
-- pub.unsubscribe(self.OnStructureSelect)
-+ pub.unsubscribe(self.OnUpdatePatient, 'patient.updated.parsed_data')
-+ pub.unsubscribe(self.OnStructureCheck, 'structures.checked')
-+ pub.unsubscribe(self.OnStructureSelect, 'structure.selected')
-
- def OnStructureCheck(self, msg):
- """When a structure changes, update the interface and plot."""
---- a/dicompyler/baseplugins/quickopen.py
-+++ b/dicompyler/baseplugins/quickopen.py
-@@ -11,9 +11,7 @@
- import logging
- logger = logging.getLogger('dicompyler.quickimport')
- import wx
--import wx.lib.pubsub.setuparg1
--import wx.lib.pubsub.core
--pub = wx.lib.pubsub.core.Publisher()
-+from wx.lib.pubsub import pub
- from dicompyler import dicomparser, util
- import dicom
-
-@@ -99,6 +97,7 @@ class plugin:
- pub.sendMessage('preferences.updated.value',
- {'general.dicom.import_location':dlg.GetDirectory()})
- pub.sendMessage('preferences.requested.values', 'general.dicom')
-+ print "Sending message raw data from quickopen"
- pub.sendMessage('patient.updated.raw_data', patient)
- dlg.Destroy()
- return
---- a/dicompyler/baseplugins/treeview.py
-+++ b/dicompyler/baseplugins/treeview.py
-@@ -13,9 +13,7 @@ logger = logging.getLogger('dicompyler.t
- import threading, Queue
- import wx
- from wx.xrc import XmlResource, XRCCTRL, XRCID
--import wx.lib.pubsub.setuparg1
--import wx.lib.pubsub.core
--pub = wx.lib.pubsub.core.Publisher()
-+from wx.lib.pubsub import pub
- from wx.gizmos import TreeListCtrl as tlc
- from dicompyler import guiutil, util
- import dicom
-@@ -73,6 +71,7 @@ class pluginTreeView(wx.Panel):
- self.tlcTreeView.SetFont(font)
-
- # Set up pubsub
-+ print "Subscribing from treeview"
- pub.subscribe(self.OnUpdatePatient, 'patient.updated.raw_data')
-
- def OnUpdatePatient(self, msg):
-@@ -98,8 +97,8 @@ class pluginTreeView(wx.Panel):
-
- def OnDestroy(self, evt):
- """Unbind to all events before the plugin is destroyed."""
--
-- pub.unsubscribe(self.OnUpdatePatient)
-+ print "Unsubscribing from treeview"
-+ pub.unsubscribe(self.OnUpdatePatient, 'patient.updated.raw_data')
-
- def OnLoadTree(self, event):
- """Update and load the DICOM tree."""
---- a/dicompyler/dicomgui.py
-+++ b/dicompyler/dicomgui.py
-@@ -15,9 +15,7 @@ logger = logging.getLogger('dicompyler.d
- import hashlib, os, threading
- import wx
- from wx.xrc import *
--import wx.lib.pubsub.setuparg1
--import wx.lib.pubsub.core
--pub = wx.lib.pubsub.core.Publisher()
-+from wx.lib.pubsub import pub
- import numpy as np
- from dicompyler import dicomparser, dvhdoses, guiutil, util
-
-@@ -50,8 +48,6 @@ class DicomImporterDialog(wx.Dialog):
- pre = wx.PreDialog()
- # the Create step is done by XRC.
- self.PostCreate(pre)
-- self.path = "/tmp"
-- self.import_location_setting = "Remember Last Used"
-
- def Init(self, res):
- """Method called after the panel has been initialized."""
---- a/dicompyler/dvhcalc.py
-+++ b/dicompyler/dvhcalc.py
-@@ -12,11 +12,6 @@ import logging
- logger = logging.getLogger('dicompyler.dvhcalc')
- import numpy as np
- import numpy.ma as ma
--import matplotlib
--if matplotlib.__version__ > '1.2':
-- from matplotlib.path import Path as mpl_Path
--else:
-- from matplotlib import nxutils as nx
-
- def get_dvh(structure, dose, limit=None, callback=None):
- """Get a calculated cumulative DVH along with the associated parameters."""
-@@ -104,12 +99,6 @@ def calculate_dvh(structure, dose, limit
- else:
- contour['inside'] = False
- for point in contour['data']:
-- if matplotlib.__version__ > '1.2':
-- if mpl_Path(np.array(contours[largestIndex]['data'])).contains_point(point):
-- contour['inside'] = True
-- # Assume if one point is inside, all will be inside
-- break
-- else:
- if nx.pnpoly(point[0], point[1],
- np.array(contours[largestIndex]['data'])):
- contour['inside'] = True
-@@ -171,10 +160,7 @@ def calculate_contour_areas(plane):
- def get_contour_mask(doselut, dosegridpoints, contour):
- """Get the mask for the contour with respect to the dose plane."""
-
-- if matplotlib.__version__ > '1.2':
-- grid = mpl_Path(contour).contains_points(dosegridpoints)
-- else:
-- grid = nx.points_inside_poly(dosegridpoints, contour)
-+ grid = nx.points_inside_poly(dosegridpoints, contour)
- grid = grid.reshape((len(doselut[1]), len(doselut[0])))
-
- return grid
---- a/dicompyler/guiutil.py
-+++ b/dicompyler/guiutil.py
-@@ -10,9 +10,7 @@
- import util
- import wx
- from wx.xrc import XmlResource, XRCCTRL, XRCID
--import wx.lib.pubsub.setuparg1
--import wx.lib.pubsub.core
--pub = wx.lib.pubsub.core.Publisher()
-+from wx.lib.pubsub import pub
-
- def IsMSWindows():
- """Are we running on Windows?
---- a/dicompyler/main.py
-+++ b/dicompyler/main.py
-@@ -19,10 +19,8 @@ import wx
- from wx.xrc import *
- import wx.lib.dialogs, webbrowser
- # Uncomment line to setup pubsub for frozen targets on wxPython 2.8.11 and above
--# from wx.lib.pubsub import setupv1
--import wx.lib.pubsub.setuparg1
--import wx.lib.pubsub.core
--pub = wx.lib.pubsub.core.Publisher()
-+from wx.lib.pubsub import setuparg1
-+from wx.lib.pubsub import pub
- from dicompyler import guiutil, util
- from dicompyler import dicomgui, dvhdata, dvhdoses, dvhcalc
- from dicompyler.dicomparser import DicomParser as dp
-@@ -32,7 +30,6 @@ __version__ = "0.4.2"
-
- class MainFrame(wx.Frame):
- def __init__(self, parent, id, title, res):
--
- # Initialize logging
- logger = logging.getLogger('dicompyler')
-
-@@ -275,6 +272,7 @@ class MainFrame(wx.Frame):
- self.ptdata = {}
-
- # Set up pubsub
-+ print "Subscribing from main"
- pub.subscribe(self.OnLoadPatientData, 'patient.updated.raw_data')
- pub.subscribe(self.OnStructureCheck, 'colorcheckbox.checked.structure')
- pub.subscribe(self.OnStructureUncheck, 'colorcheckbox.unchecked.structure')
-@@ -514,6 +512,7 @@ class MainFrame(wx.Frame):
- self.dvhs = {}
-
- # Re-publish the raw data
-+ print "Sending from main"
- pub.sendMessage('patient.updated.raw_data', self.ptdata)
- # Publish the parsed data
- pub.sendMessage('patient.updated.parsed_data', patient)
-@@ -927,7 +926,6 @@ class MainFrame(wx.Frame):
-
- class dicompyler(wx.App):
- def OnInit(self):
-- # no-op in wxPython2.8 and later: wx.InitAllImageHandlers()
- wx.GetApp().SetAppName("dicompyler")
-
- # Load the XRC file for our gui resources
---- a/dicompyler/plugin.py
-+++ b/dicompyler/plugin.py
-@@ -12,9 +12,7 @@ logger = logging.getLogger('dicompyler.p
- import imp, os
- import wx
- from wx.xrc import *
--import wx.lib.pubsub.setuparg1
--import wx.lib.pubsub.core
--pub = wx.lib.pubsub.core.Publisher()
-+from wx.lib.pubsub import pub
- from dicompyler import guiutil, util
-
- def import_plugins(userpath=None):
---- a/dicompyler/preferences.py
-+++ b/dicompyler/preferences.py
-@@ -10,9 +10,7 @@
- import os
- import wx
- from wx.xrc import *
--import wx.lib.pubsub.setuparg1
--import wx.lib.pubsub.core
--pub = wx.lib.pubsub.core.Publisher()
-+from wx.lib.pubsub import pub
- from dicompyler import guiutil, util
-
- try:
-@@ -230,10 +228,10 @@ class PreferencesDialog(wx.Dialog):
- c.SetValue(value)
- sizer.Add(c, 0, wx.ALIGN_CENTER)
- # Remove the label preceding the checkbox
-- t = self.FindWindowById(c.PrevControlId(c.GetId()))
-- t.SetLabel('')
-+ #t = self.FindWindowById(c.PrevControlId(c.GetId()))
-+ #t.SetLabel('') ... impossible to execute
- # Adjust the sizer preceding the label
-- fgsizer.GetItem(0).SetSpacer((20,0))
-+ fgsizer.GetItem(0).AssignSpacer((20,0))
- # Add control to the callback dict
- self.callbackdict[c] = setting['callback']
- self.Bind(wx.EVT_CHECKBOX, self.OnUpdateCheckbox, c)
-@@ -376,9 +374,7 @@ def main():
-
- import tempfile, os
- import wx
-- import wx.lib.pubsub.setuparg1
-- import wx.lib.pubsub.core
-- pub = wx.lib.pubsub.core.Publisher()
-+ from wx.lib.pubsub import pub
-
- app = wx.App(False)
-
---- a/dicompyler/resources/guiutil.xrc
-+++ b/dicompyler/resources/guiutil.xrc
-@@ -70,6 +70,6 @@
- </object>
- <title>Loading...</title>
- <centered>1</centered>
-- <style>wxCAPTION|wxSTAY_ON_TOP|wxDIALOG_MODAL</style>
-+ <style>wxCAPTION|wxSTAY_ON_TOP</style>
- </object>
- </resource>
-\ No newline at end of file
---- a/dicompyler/wxmpl.py
-+++ b/dicompyler/wxmpl.py
-@@ -21,8 +21,9 @@ import weakref
-
- import matplotlib
- matplotlib.use('WXAgg')
-+#import wxmpl
- import numpy as np
--from matplotlib.axes import _process_plot_var_args
-+#from matplotlib.axes import _process_plot_var_args
- from matplotlib.backends.backend_agg import RendererAgg
- from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg
- from matplotlib.figure import Figure
-@@ -1122,7 +1123,11 @@ class PlotPanel(FigureCanvasWxAgg):
- # find the toplevel parent window and register an activation event
- # handler that is keyed to the id of this PlotPanel
- topwin = toplevel_parent_of_window(self)
-- topwin.Connect(-1, self.GetId(), wx.wxEVT_ACTIVATE, self.OnActivate)
-+ ID = self.GetId()
-+ ID = 100
-+ print "self.GetId()", ID
-+ #print "topwin.GetId()", topwin.GetID()
-+ topwin.Connect(-1, ID, wx.wxEVT_ACTIVATE, self.OnActivate)
-
- wx.EVT_ERASE_BACKGROUND(self, self.OnEraseBackground)
- wx.EVT_WINDOW_DESTROY(self, self.OnDestroy)
-@@ -1422,7 +1427,7 @@ class PlotFrame(wx.Frame):
- fileName = wx.FileSelector('Save Plot', default_extension='png',
- wildcard=('Portable Network Graphics (*.png)|*.png|'
- + 'Encapsulated Postscript (*.eps)|*.eps|All files (*.*)|*.*'),
-- parent=self, flags=wx.FD_SAVE|wx.FD_OVERWRITE_PROMPT)
-+ parent=self, flags=wx.SAVE|wx.OVERWRITE_PROMPT)
-
- if not fileName:
- return
diff --git a/debian/patches/series_DEBUG b/debian/patches/series_DEBUG
deleted file mode 100644
index cff589b..0000000
--- a/debian/patches/series_DEBUG
+++ /dev/null
@@ -1,11 +0,0 @@
-do_not_download_distribute.patch
-wxpy30.patch
-wxpy30-more.patch
-enable_pydicom_0.9.8.patch
-allow_pillow_instead_of_pil.patch
-enable_later_versions_of_matplotlib.patch
-fix-xrc-errors.patch
-fix_DicomImporterDialog.patch
-092017A_fixpubsub.patch
-092017B_fiximportasterixs.patch
-092017DEBUG_main.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dicompyler.git
More information about the debian-med-commit
mailing list