[med-svn] [dicompyler] 07/15: Pubsub unsubscribe correction

[Vojtech Kulvait]

This is an automated email from the git hooks/post-receive script.

kulvait-guest pushed a commit to branch master
in repository dicompyler.

commit cda874c53b3b6aebfe822ed89cc4f0fc4d0ffb75
Author: Vojtěch Kulvait <kulvait at gmail.com>
Date:   Tue Sep 19 10:03:04 2017 +0200

    Pubsub unsubscribe correction
---
 debian/patches/092017A_fixpubsub.patch | 49 ++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/debian/patches/092017A_fixpubsub.patch b/debian/patches/092017A_fixpubsub.patch
index e9dc02b..7b727cd 100644
--- a/debian/patches/092017A_fixpubsub.patch
+++ b/debian/patches/092017A_fixpubsub.patch
@@ -19,6 +19,33 @@ Index: dicompyler/dicompyler/baseplugins/2dview.py
  from matplotlib import _cntr as cntr
  from matplotlib import __version__ as mplversion
  import numpy as np
+@@ -194,18 +193,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):
 @@ -725,4 +724,4 @@ class plugin2DView(wx.Panel):
              menu.Append(id, "No tools found")
              menu.Enable(id, False)
@@ -65,6 +92,19 @@ Index: dicompyler/dicompyler/baseplugins/dvh.py
  from dicompyler import guiutil, util
  from dicompyler import dvhdata, guidvh
  from dicompyler import wxmpl
+@@ -134,9 +133,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."""
 Index: dicompyler/dicompyler/baseplugins/quickopen.py
 ===================================================================
 --- dicompyler.orig/dicompyler/baseplugins/quickopen.py
@@ -97,6 +137,15 @@ Index: dicompyler/dicompyler/baseplugins/treeview.py
  from wx.gizmos import TreeListCtrl as tlc
  from dicompyler import guiutil, util
  import dicom
+@@ -99,7 +98,7 @@ class pluginTreeView(wx.Panel):
+     def OnDestroy(self, evt):
+         """Unbind to all events before the plugin is destroyed."""
+ 
+-        pub.unsubscribe(self.OnUpdatePatient)
++        pub.unsubscribe(self.OnUpdatePatient, 'patient.updated.raw_data')
+ 
+     def OnLoadTree(self, event):
+         """Update and load the DICOM tree."""
 Index: dicompyler/dicompyler/dicomgui.py
 ===================================================================
 --- dicompyler.orig/dicompyler/dicomgui.py

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/dicompyler.git