FIX: Fixed problems with import KBCT (Koning Breast CT) and Anatomage

Paulo Henrique Junqueira Amorim
1 parent 83bd621f
Showing 3 changed files with 24 additions and 4 deletions Show diff stats
invesalius/i18n.py
invesalius/reader/dicom.py
invesalius/reader/dicom_grouper.py
@@ -20,7 +20,11 @@
 #    detalhes.
 #--------------------------------------------------------------------------
-import ConfigParser
+try:
+    import configparser as ConfigParser
+except(ImportError):
+    import ConfigParser
+
 import locale
 import gettext
 import os
@@ -1439,6 +1439,20 @@ class Parser():
             return data
         return ""
+    def GetManufacturerName(self):
+        """
+        Return Manufacturer of the equipment that produced 
+        the composite instances.
+        """
+        try:
+            data = self.data_image[str(0x0008)][str(0x0070)]
+        except(KeyError):
+            return ""
+
+        if (data):
+            return data
+        return ""
+
     def GetEquipmentManufacturer(self):
         """
         Return manufacturer name (string).
@@ -111,7 +111,7 @@ class DicomGroup:
         filelist = [dicom.image.file for dicom in
                 self.slices_dict.values()]
-        
+       
         # Sort slices using GDCM
         if (self.dicom.image.orientation_label <> "CORONAL"):
             #Organize reversed image
@@ -121,10 +121,12 @@ class DicomGroup:
             sorter.Sort(filelist)
             filelist = sorter.GetFilenames()
-            #Getting organized image
+        # for breast-CT of koning manufacturing (KBCT)
+        if self.slices_dict.values()[0].parser.GetManufacturerName() == "Koning":
+            filelist.sort()
+        
         return filelist
-
     def GetHandSortedList(self):
         # This will be used to fix problem 1, after merging
         # single DicomGroups of same study_id and orientation
	@@ -1439,6 +1439,20 @@ class Parser():		@@ -1439,6 +1439,20 @@ class Parser():
1439	return data	1439	return data
1440	return ""	1440	return ""
1441		1441
		1442	+ def GetManufacturerName(self):
		1443	+ """
		1444	+ Return Manufacturer of the equipment that produced
		1445	+ the composite instances.
		1446	+ """
		1447	+ try:
		1448	+ data = self.data_image[str(0x0008)][str(0x0070)]
		1449	+ except(KeyError):
		1450	+ return ""
		1451	+
		1452	+ if (data):
		1453	+ return data
		1454	+ return ""
		1455	+
1442	def GetEquipmentManufacturer(self):	1456	def GetEquipmentManufacturer(self):
1443	"""	1457	"""
1444	Return manufacturer name (string).	1458	Return manufacturer name (string).