From 69aa6af451b77a223b85184fa93a794167b5df3f Mon Sep 17 00:00:00 2001
From: tfmoraes <totonixsame@gmail.com>
Date: Wed, 23 Mar 2011 17:38:48 +0000
Subject: [PATCH] Working with the last version of gdcm

---
 invesalius/control.py              |   4 ----
 invesalius/data/imagedata_utils.py |   1 -
 invesalius/gui/widgets/gradient.py |   2 +-
 invesalius/reader/dicom.py         | 140 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------
 invesalius/reader/dicom_reader.py  |  18 +++++++++---------
 5 files changed, 80 insertions(+), 85 deletions(-)

diff --git a/invesalius/control.py b/invesalius/control.py
index bf8ad43..e31d2f7 100755
--- a/invesalius/control.py
+++ b/invesalius/control.py
@@ -123,10 +123,8 @@ class Controller():
         # Import project
         dirpath = dialog.ShowImportDirDialog()
         if dirpath and not os.listdir(dirpath):
-            print "IFFFFFFFfff"
             dialog.ImportEmptyDirectory(dirpath)
         elif dirpath:
-            print "ELSE..........."
             self.StartImportPanel(dirpath)
             ps.Publisher().sendMessage("Load data to import panel", dirpath)
 
@@ -289,8 +287,6 @@ class Controller():
         data = evt.data
         if (data):
             message = _("Loading file %d of %d")%(data[0],data[1])
-
-        if (data):
             if not(self.progress_dialog):
                 self.progress_dialog = dialog.ProgressDialog(
                                     maximum = data[1], abort=1)
diff --git a/invesalius/data/imagedata_utils.py b/invesalius/data/imagedata_utils.py
index 4d98f15..40fd708 100644
--- a/invesalius/data/imagedata_utils.py
+++ b/invesalius/data/imagedata_utils.py
@@ -472,7 +472,6 @@ def dcm2memmap(files, slice_size, orientation):
         shape = slice_size[1], len(files), slice_size[0]
     else:
         shape = len(files), slice_size[1], slice_size[0]
-    print shape
     matrix = numpy.memmap(temp_file, mode='w+', dtype='int16', shape=shape)
     dcm_reader = vtkgdcm.vtkGDCMImageReader()
     cont = 0
diff --git a/invesalius/gui/widgets/gradient.py b/invesalius/gui/widgets/gradient.py
index 5c4362e..35ce57b 100755
--- a/invesalius/gui/widgets/gradient.py
+++ b/invesalius/gui/widgets/gradient.py
@@ -219,6 +219,7 @@ class GradientSlider(wx.Panel):
         evt.Skip()
 
     def OnSize(self, evt):
+        print "OnSize gradient"
         self.CalculateControlPositions()
         self.Refresh()
         evt.Skip()
@@ -236,7 +237,6 @@ class GradientSlider(wx.Panel):
                                       proportion)) + PUSH_WIDTH
         self.max_position = int(round((self.maximun - self.min_range) * \
                                       proportion)) + PUSH_WIDTH
-        print self.min_position, self.max_position
 
     def _max_position_to_maximun(self, max_position):
         """ 
diff --git a/invesalius/reader/dicom.py b/invesalius/reader/dicom.py
index 667a748..9c77e53 100644
--- a/invesalius/reader/dicom.py
+++ b/invesalius/reader/dicom.py
@@ -200,7 +200,7 @@ class Parser():
         to the number of columns on the image.
         Return "" if not defined.
         """
-        data = self.data_image['0028']['0011']
+        data = self.data_image[0x028][0x011]
         if (data):
             return int(str(data))
         return ""
@@ -212,7 +212,7 @@ class Parser():
         to the number of rows on the image.
         Return "" if not defined.
         """
-        data = self.data_image['0028']['0010']
+        data = self.data_image[0x028][0x010]
         if (data):
             return int(str(data))
         return ""
@@ -299,7 +299,7 @@ class Parser():
         """
         # TODO: internationalize data
         try:
-            date = self.data_image['0008']['0022'] 
+            date = self.data_image[0x0008][0x0022] 
         except(KeyError):
             return ""
 
@@ -314,7 +314,7 @@ class Parser():
 
         DICOM standard tag (0x0020, 0x0012) was used.
         """
-        data = self.data_image['0020']['0012'] 
+        data = self.data_image[0x0020][0x0012] 
         if (data):
             return int(str(data))
         return ""
@@ -325,7 +325,7 @@ class Parser():
 
         DICOM standard tag (0x0008, 0x0050) was used.
         """
-        data = self.data_image['0008']['0050']
+        data = self.data_image[0x008][0x050]
         if (data):
             try:
                 value = int(str(data))
@@ -342,7 +342,7 @@ class Parser():
 
         DICOM standard tag (0x0008,0x0032) was used.
         """
-        data = self.data_image['0008']['0032']
+        data = self.data_image[0x008][0x032]
         if (data) and (data != ''):
             return self.__format_time(str(data))
         return ""
@@ -377,7 +377,7 @@ class Parser():
         DICOM standard tag (0x0028,0x1050) was used.
         """
         try:
-            data = self.data_image['0028']['1050']
+            data = self.data_image[0x028][0x1050]
         except(KeyError):
             return "300"
         if (data):
@@ -409,7 +409,7 @@ class Parser():
         DICOM standard tag (0x0028,0x1051) was used.
         """
         try:
-            data = self.data_image['0028']['1051']
+            data = self.data_image[0x028][0x1051]
         except(KeyError):
             return "2000"
 
@@ -438,7 +438,7 @@ class Parser():
         DICOM standard tag (0x0020, 0x0032) was used.
         """
         try:
-            data = self.data_image['0020']['0032']
+            data = self.data_image[0x020][0x032]
         except(KeyError):
             return ""
         if (data):
@@ -453,7 +453,7 @@ class Parser():
 
         DICOM standard tag (0x0020, 0x0032) was used.
         """
-        data = self.data_image['0020']['1041']
+        data = self.data_image[0x020][0x1041]
         if (data):
             return eval(data)
         return ""
@@ -466,7 +466,7 @@ class Parser():
         DICOM standard tag (0x7fe0, 0x0010) was used.
         """
         try:
-            data = self.data_image['7fe0']['0010']
+            data = self.data_image[0x7fe0][0x0010]
         except(KeyError):
             return ""
 
@@ -484,7 +484,7 @@ class Parser():
         DICOM standard tag (0x0020, 0x0011) was used.
         """
         try:
-            data = self.data_image['0020']['0011']
+            data = self.data_image[0x020][0x011]
         except(KeyError):
             return ""
 
@@ -504,7 +504,7 @@ class Parser():
         DICOM standard tag (0x0028, 0x0030) was used.
         """
         try:
-            data = self.data_image['0028']['0030'] 
+            data = self.data_image[0x0028][0x0030] 
         except(KeyError):
             return ""
         if (data):
@@ -519,7 +519,7 @@ class Parser():
         DICOM standard tag (0x0010, 0x1030) was used.
         """
         try:
-            data = self.data_image['0010']['1030']
+            data = self.data_image[0x0010][0x1030]
         except(KeyError):
             return ""
 
@@ -535,7 +535,7 @@ class Parser():
         DICOM standard tag (0x0010, 0x1030) was used.
         """
         try:
-            data = self.data_image['0010']['1020']
+            data = self.data_image[0x010][0x1020]
         except(KeyError):
             return ""
 
@@ -550,7 +550,7 @@ class Parser():
         DICOM standard tag (0x0010, 0x1040) was used.
         """
         try:
-            data = self.data_image['0010']['1040']
+            data = self.data_image[0x010][0x1040]
         except(KeyError):
             return ""
         if (data):
@@ -565,7 +565,7 @@ class Parser():
         DICOM standard tag (0x0010, 0x1080) was used.
         """
         try:
-            data = self.data_image['0010']['1080']
+            data = self.data_image[0x010][0x1080]
         except(KeyError):
             return ""
         if (data):
@@ -582,7 +582,7 @@ class Parser():
         DICOM standard tag (0x0010, 0x1081) was used.
         """
         try:
-            data = self.data_image['0010']['1081']
+            data = self.data_image[0x010][0x1081]
         except(KeyError):
             return ""
         if (data):
@@ -598,7 +598,7 @@ class Parser():
         DICOM standard tag (0x0010, 0x2150) was used.
         """
         try:
-            data = self.data_image['0010']['2150']
+            data = self.data_image[0x0010][0x2150]
         except(KeyError):
             return ""
 
@@ -615,7 +615,7 @@ class Parser():
         DICOM standard tag (0x0010, 0x2152) was used.
         """
         try:
-            data = self.data_image['0010']['2152']
+            data = self.data_image[0x0010][0x2152]
         except(KeyError):
             return ""
 
@@ -631,7 +631,7 @@ class Parser():
         DICOM standard tag (0x0010, 0x2154) was used.
         """
         try:
-            data = self.data_image['0010']['2154']
+            data = self.data_image[0x0010][0x2154]
         except(KeyError):
             return ""
 
@@ -648,7 +648,7 @@ class Parser():
         DICOM standard tag (0x0010, 0x2297) was used.
         """
         try:
-            data = self.data_image['0010']['2297']
+            data = self.data_image[0x0010][0x2297]
         except(KeyError):
             return ""
 
@@ -665,7 +665,7 @@ class Parser():
         DICOM standard tag (0x0010, 0x2298) was used.
         """
         try:
-            data = self.data_image['0010']['2298'] 
+            data = self.data_image[0x0010][0x2298] 
         except(KeyError):
             return ""
 
@@ -682,7 +682,7 @@ class Parser():
         DICOM standard tag (0x0010, 0x2299) was used.
         """
         try:
-            data = self.data_image['0010']['2299']
+            data = self.data_image[0x0010][0x2299]
         except(KeyError):
             return ""
 
@@ -699,7 +699,7 @@ class Parser():
         DICOM standard tag (0x0010, 0x2000) was used.
         """
         try:
-            data = self.data_image['0010']['2000']
+            data = self.data_image[0x0010][0x2000]
         except(KeyError):
             return ""
 
@@ -716,7 +716,7 @@ class Parser():
         DICOM standard tag (0x0008, 0x2110) was used.
         """
         try:
-            data = self.data_image['0008']['2110'] 
+            data = self.data_image[0x0008][0x2110] 
         except(KeyError):
             return ""
 
@@ -734,7 +734,7 @@ class Parser():
         DICOM standard tag (0x0008, 0x0090) was used.
         """
         try:
-            data = self.data_image['0008']['0090']
+            data = self.data_image[0x0008][0x0090]
         except(KeyError):
             return ""
 
@@ -753,7 +753,7 @@ class Parser():
         DICOM standard tag (0x0008, 0x0092) was used.
         """
         try:
-            data = self.data_image['0008']['0092']
+            data = self.data_image[0x0008][0x0092]
         except(KeyError):
             return ""
 
@@ -769,7 +769,7 @@ class Parser():
         DICOM standard tag (0x0008, 0x0094) was used.
         """
         try:
-            data = self.data_image['0008']['0094']
+            data = self.data_image[0x0008][0x0094]
         except(KeyError):
             return ""
         
@@ -785,7 +785,7 @@ class Parser():
         DICOM standard tag (0x0018, 0x1030) was used.
         """
         try:
-            data = self.data_image['0018']['1030']
+            data = self.data_image[0x0018][0x1030]
         except(KeyError):
             return None
 
@@ -803,7 +803,7 @@ class Parser():
         Critical DICOM tag (0x0008, 0x0008). Cannot be editted.
         """
         try:
-            data = self.data_image['0008']['0008']
+            data = self.data_image[0x008][0x008]
         except(IndexError):
             return []
 
@@ -823,7 +823,7 @@ class Parser():
         Critical DICOM tag (0x0008, 0x0016). Cannot be edited.
         """
         try:
-            data = self.data_image['0008']['0016']
+            data = self.data_image[0x0008][0x0016]
         except(KeyError):
             return ""
 
@@ -840,7 +840,7 @@ class Parser():
         Critical DICOM tag (0x0008, 0x0018). Cannot be edited.
         """
         try:
-            data = self.data_image['0008']['0018']
+            data = self.data_image[0x0008][0x0018]
         except(KeyError):
             return ""
 
@@ -855,7 +855,7 @@ class Parser():
         DICOM tag (0x0008, 0x1030). Cannot be edited.
         """
         try:
-            data = self.data_image['0008']['1030']
+            data = self.data_image[0x0008][0x1030]
         except(KeyError):
             return ""
 
@@ -872,7 +872,7 @@ class Parser():
         Critical DICOM Tag (0x0020,0x000D). Cannot be edited.
         """
         try:
-            data = self.data_image['0020']['000D'] 
+            data = self.data_image[0x0020][0x000D] 
         except(KeyError):
             return ""
 
@@ -892,7 +892,7 @@ class Parser():
         Critical DICOM tag (0x0020,0x0037). Cannot be edited.
         """
         try:
-            data = self.data_image['0020']['0037']
+            data = self.data_image[0x0020][0x0037]
         except(KeyError):
             return [1.0, 0.0, 0.0, 0.0, 1.0, 0.0]
 
@@ -910,7 +910,7 @@ class Parser():
         Critical DICOM tag (0x0020,0x0037). Cannot be edited.
         """
         try:
-            data = self.data_image['0020']['0037']
+            data = self.data_image[0x0020][0x0037]
         except(KeyError):
             return [0.0, 1.0, 0.0]
 
@@ -928,7 +928,7 @@ class Parser():
         Critical DICOM tag (0x0020,0x0037). Cannot be edited.
         """
         try:
-            data = self.data_image['0020']['0037']
+            data = self.data_image[0x0020][0x0037]
         except(KeyError):
             return [1.0, 0.0, 0.0]
 
@@ -944,7 +944,7 @@ class Parser():
         Critical DICOM tag (0x0020,0x0052). Cannot be edited.
         """
         try:
-            data = self.data_image['0020']['0052']
+            data = self.data_image[0x0020][0x0052]
         except(KeyError):
             return ""
 
@@ -1024,7 +1024,7 @@ class Parser():
         DICOM standard tag (0x0018, 0x1030) was used.
         """
         try:
-            data = self.data_image['0018']['1030']
+            data = self.data_image[0x0018][0x1030]
             if (data):
                 return data
         except(KeyError):
@@ -1048,7 +1048,7 @@ class Parser():
         Critical DICOM tag (0x0018, 0x0020). Cannot be edited.
         """
         try:
-            data = self.data_image['0018']['0020']
+            data = self.data_image[0x0018][0x0020]
         except(KeyError):
             return ""
 
@@ -1064,7 +1064,7 @@ class Parser():
         DICOM standard tag (0x0008, 0x0080) was used.
         """
         try:
-            data = self.data_image['0008']['0080']    
+            data = self.data_image[0x0008][0x0080]    
         except(KeyError):
             return ""
 
@@ -1082,7 +1082,7 @@ class Parser():
         DICOM standard tag (0x0008, 0x0081) was used.
         """
         try:
-            data = self.data_image['0008']['0081']
+            data = self.data_image[0x0008][0x0081]
         except(KeyError):
             return ""
 
@@ -1099,7 +1099,7 @@ class Parser():
         Critical DICOM tag (0x0020, 0x000D). Cannot be edited.
         """
         try:
-            data = self.data_image['0020']['000D']
+            data = self.data_image[0x0020][0x000D]
         except(KeyError):
             return ""
 
@@ -1115,7 +1115,7 @@ class Parser():
         DICOM standard tag (0x0010,0x2180) was used.
         """
         try:
-            data = self.data_image['0010']['2180']
+            data = self.data_image[0x0010][0x2180]
         except(KeyError):
             return ""
 
@@ -1153,7 +1153,7 @@ class Parser():
         #sf.SetFile(self.gdcm_reader.GetFile())
         #res = sf.ToStringPair(tag)
         try:
-            data = self.data_image['0028']['0100']
+            data = self.data_image[0x0028][0x0100]
         except(KeyError):
             return ""
 
@@ -1172,7 +1172,7 @@ class Parser():
         """
         # TODO: internationalize data
         try:
-            data = self.data_image['0010']['0030']
+            data = self.data_image[0x0010][0x0030]
         except(KeyError):
             return ""
 
@@ -1189,7 +1189,7 @@ class Parser():
         DICOM standard tag (0x0020,0x0010) was used.
         """
         try:
-            data = self.data_image['0020']['0010']
+            data = self.data_image[0x0020][0x0010]
         except(KeyError):
             return ""
 
@@ -1206,7 +1206,7 @@ class Parser():
         DICOM standard tag (0x0018,0x1120) was used.
         """
         try:
-            data = self.data_image['0018']['1120']
+            data = self.data_image[0x0018][0x1120]
         except(KeyError):
             return 0.0
 
@@ -1225,7 +1225,7 @@ class Parser():
         DICOM standard tag (0x0010,0x0040) was used.
         """
         try:
-            data = self.data_image['0010']['0040']
+            data = self.data_image[0x0010][0x0040]
         except(KeyError):
             return ""
 
@@ -1242,7 +1242,7 @@ class Parser():
         DICOM standard tag (0x0010, 0x1010) was used.
         """
         try:
-            data = self.data_image['0010']['1010']
+            data = self.data_image[0x0010][0x1010]
         except(KeyError):
             return ""
 
@@ -1262,7 +1262,7 @@ class Parser():
         DICOM standard tag (0x0010,0x0010) was used.
         """
         try:
-            data = self.data_image['0010']['0010']
+            data = self.data_image[0x0010][0x0010]
         except(KeyError):
             return ""
 
@@ -1282,7 +1282,7 @@ class Parser():
         DICOM standard tag (0x0010,0x0020) was used.
         """
         try:
-            data = self.data_image['0010']['0020']
+            data = self.data_image[0x0010][0x0020]
         except(KeyError):
             return ""
 
@@ -1302,7 +1302,7 @@ class Parser():
         DICOM standard tag (0x0018,0x1151) was used.
         """
         try:
-            data = self.data_image['0018']['1151']
+            data = self.data_image[0x0018][0x1151]
         except(KeyError):
             return ""
 
@@ -1319,7 +1319,7 @@ class Parser():
         DICOM standard tag (0x0018, 0x1152) was used.
         """
         try:
-            data = self.data_image['0018']['1152']
+            data = self.data_image[0x0018][0x1152]
         except(KeyError):
             return ""
 
@@ -1336,7 +1336,7 @@ class Parser():
         DICOM standard tag (0x0018,0x0060) was used.
         """
         try:
-            data = self.data_image['0018']['0060']
+            data = self.data_image[0x0018][0x0060]
         except(KeyError):
             return ""
 
@@ -1353,7 +1353,7 @@ class Parser():
         DICOM standard tag (0x0018,0x0050) was used.
         """
         try:
-            data = self.data_image['0018']['0050']
+            data = self.data_image[0x0018][0x0050]
         except(KeyError):
             return 0
         if (data):
@@ -1371,7 +1371,7 @@ class Parser():
         DICOM standard tag (0x0018,0x1210) was used.
         """
         try:
-            data = self.data_image['0018']['1210']
+            data = self.data_image[0x0018][0x1210]
         except(KeyError):
             return ""
 
@@ -1388,7 +1388,7 @@ class Parser():
         DICOM standard tag (0x0008,0x0080) was used.
         """
         try:
-            data = self.data_image['0008']['0080']
+            data = self.data_image[0x0008][0x0080]
         except(KeyError):
             return ""
 
@@ -1405,7 +1405,7 @@ class Parser():
         DICOM standard tag (0x0008, 0x1010) was used.
         """
         try:
-            data = self.data_image['0008']['1010']
+            data = self.data_image[0x0008][0x1010]
         except(KeyError):
             return ""
 
@@ -1422,7 +1422,7 @@ class Parser():
         DICOM standard tag (0x0008,0x1090) was used.
         """
         try:
-            data = self.data_image['0008']['1090']
+            data = self.data_image[0x0008][0x1090]
         except(KeyError):
             return ""
 
@@ -1438,7 +1438,7 @@ class Parser():
         DICOM standard tag (0x0008, 0x1010) was used.
         """
         try:
-            data = self.data_image['0008']['1010']
+            data = self.data_image[0x0008][0x1010]
         except(KeyError):
             return ""
 
@@ -1456,7 +1456,7 @@ class Parser():
         DICOM standard tag (0x0008,0x0060) was used.
         """
         try:
-            data = self.data_image['0008']['0060']
+            data = self.data_image[0x0008][0x0060]
         except(KeyError):
             return ""
 
@@ -1473,7 +1473,7 @@ class Parser():
         DICOM standard tag (0x0020,0x0013) was used.
         """
         try:
-            data = self.data_image['0020']['0013']
+            data = self.data_image[0x0020][0x0013]
         except(KeyError):
             return ""
 
@@ -1489,7 +1489,7 @@ class Parser():
         DICOM standard tag (0x0008,0x1030) was used.
         """
         try:
-            data = self.data_image['0008']['1030']
+            data = self.data_image[0x0008][0x1030]
             if (data):
                 encoding = self.GetEncoding()
                 return data.decode(encoding)
@@ -1520,7 +1520,7 @@ class Parser():
         DICOM standard tag (0x0008, 0x103E) was used.
         """
         try:
-            data = self.data_image['0008']['103E']
+            data = self.data_image[0x0008][0x103E]
             if data == "None":
                 return _("unnamed")
             if (data):
@@ -1534,7 +1534,7 @@ class Parser():
         DICOM standard tag (0x0008,0x0033) was used.
         """
         try:
-            data = self.data_image['0008']['0033']
+            data = self.data_image[0x0008][0x0033]
         except(KeyError):
             return ""
 
@@ -1548,7 +1548,7 @@ class Parser():
         DICOM standard tag (0x0008,0x032) was used.
         """
         try:
-            data = self.data_image['0008']['0032']
+            data = self.data_image[0x0008][0x0032]
         except(KeyError):
             return ""
 
@@ -1562,7 +1562,7 @@ class Parser():
         DICOM standard tag (0x0020, 0x0011) was used.
         """
         try:
-            data = self.data_image['0020']['0011']
+            data = self.data_image[0x0020][0x0011]
         except(KeyError):
             return ""
         
@@ -1576,7 +1576,7 @@ class Parser():
         DICOM standard tag (0x0008, 0x0005) was used.
         """
         try:
-            encoding = self.data_image['0008']['0005']
+            encoding = self.data_image[0x0008][0x0005]
         except(KeyError):
             return 'ISO_IR_100'
 
diff --git a/invesalius/reader/dicom_reader.py b/invesalius/reader/dicom_reader.py
index eb58ce1..c1fb04f 100644
--- a/invesalius/reader/dicom_reader.py
+++ b/invesalius/reader/dicom_reader.py
@@ -134,8 +134,9 @@ class LoadDicom:
                 data = stf.ToStringPair(tag)
                 stag = tag.PrintAsPipeSeparatedString()
                 
-                group = stag.split("|")[0][1:]
-                field = stag.split("|")[1][:-1]
+                group = tag.GetGroup()
+                field = tag.GetElement()
+
                 tag_labels[stag] = data[0]
                 
                 if not group in data_dict.keys():
@@ -157,8 +158,9 @@ class LoadDicom:
                 data = stf.ToStringPair(tag)
                 stag = tag.PrintAsPipeSeparatedString()
 
-                group = stag.split("|")[0][1:]
-                field = stag.split("|")[1][:-1]
+                group = tag.GetGroup()
+                field = tag.GetElement()
+
                 tag_labels[stag] = data[0]
 
                 if not group in data_dict.keys():
@@ -177,9 +179,9 @@ class LoadDicom:
             rvtk.Update()
             
             try:
-                data = data_dict['0028']['1050']
+                data = data_dict[0x028][0x1050]
                 level = [float(value) for value in data.split('\\')][0]
-                data = data_dict['0028']['1051']
+                data = data_dict[0x028][0x1051]
                 window =  [float(value) for value in data.split('\\')][0]
             except(KeyError):
                 level = 300.0
@@ -227,7 +229,7 @@ class LoadDicom:
             #----------  Verify is DICOMDir -------------------------------
             is_dicom_dir = 1
             try: 
-                if (data_dict['0002']['0002'] != "1.2.840.10008.1.3.10"): #DICOMDIR
+                if (data_dict[0x002][0x002] != "1.2.840.10008.1.3.10"): #DICOMDIR
                     is_dicom_dir = 0
             except(KeyError):
                     is_dicom_dir = 0
@@ -336,8 +338,6 @@ class ProgressDicomReader:
             fow.SetFileName(log_path)
             ow = vtk.vtkOutputWindow()
             ow.SetInstance(fow)
-        print "=====>>> Progress... dicom_reader.py 367"
-        
  
         y = yGetDicomGroups(path, recursive)
         for value_progress in y:
--
libgit2 0.21.2