[med-svn] [dicompyler] 08/15: Fix dicomparser due to exception.

[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 0cc5f7093e0978caf97299cc35b5de3ee8054803
Author: Vojtěch Kulvait <kulvait at gmail.com>
Date:   Tue Sep 19 20:26:36 2017 +0200

    Fix dicomparser due to exception.
---
 debian/patches/092017G_fixdicomparser.patch | 47 +++++++++++++++++++++++++++++
 debian/patches/series                       |  2 ++
 2 files changed, 49 insertions(+)

diff --git a/debian/patches/092017G_fixdicomparser.patch b/debian/patches/092017G_fixdicomparser.patch
new file mode 100644
index 0000000..c3a5c2e
--- /dev/null
+++ b/debian/patches/092017G_fixdicomparser.patch
@@ -0,0 +1,47 @@
+Author: Vojtěch Kulvait <kulvait at gmail.com>
+Last-Update: Tue Sep 19 14:51:01 CEST 2017
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=854837
+Description: dicomparser.py:GetStudyInfo was replaced by the new version from dicompyler-core commit 13e5265
+
+Index: dicompyler/dicompyler/dicomparser.py
+===================================================================
+--- dicompyler.orig/dicompyler/dicomparser.py
++++ dicompyler/dicompyler/dicomparser.py
+@@ -64,19 +64,25 @@ class DicomParser:
+         return self.ds.SOPInstanceUID
+ 
+     def GetStudyInfo(self):
+-        """Return the study information of the current file."""
++        """Return the study information of the current file. Function from dicompyler-core commit 13e5265"""
+ 
+         study = {}
+         if 'StudyDescription' in self.ds:
+-            desc=self.ds.StudyDescription
++            desc = self.ds.StudyDescription
+         else:
+-            desc='No description'
++            desc = 'No description'
+         study['description'] = desc
++        if 'StudyDate' in self.ds:
++            date = self.ds.StudyDate
++        else:
++            date = None
++        study['date'] = date
+         # Don't assume that every dataset includes a study UID
+-        study['id'] = self.ds.SeriesInstanceUID
+         if 'StudyInstanceUID' in self.ds:
+             study['id'] = self.ds.StudyInstanceUID
+-        
++        else:
++            study['id'] = str(random.randint(0, 65535))
++
+         return study
+ 
+     def GetSeriesInfo(self):
+@@ -690,4 +696,4 @@ class DicomParser:
+                     if "BeamDose" in b:
+                         beams[b.ReferencedBeamNumber]['dose'] = \
+                             b.BeamDose * nfx * 100
+-        return beams
+\ No newline at end of file
++        return beams
diff --git a/debian/patches/series b/debian/patches/series
index 49dfdbd..00dd858 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,5 @@ fix_DicomImporterDialog.patch
 092017C_fixwx30.patch
 092017E_newwxmpl.patch
 092017F_pillowtostringtobytes.patch
+092017G_fixdicomparser.patch
+BUG201709dicomgui.patch

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