Commit a633461fb1cbe683bcf197793508115bb5a92aed

Authored by tfmoraes
1 parent 95859bf7

FIX: It was missing a file in my last commit

Showing 1 changed file with 2 additions and 14 deletions   Show diff stats
invesalius/reader/dicom_reader.py
@@ -16,27 +16,19 @@ @@ -16,27 +16,19 @@
16 # PARTICULAR. Consulte a Licenca Publica Geral GNU para obter mais 16 # PARTICULAR. Consulte a Licenca Publica Geral GNU para obter mais
17 # detalhes. 17 # detalhes.
18 #-------------------------------------------------------------------------- 18 #--------------------------------------------------------------------------
19 -import glob  
20 -import math  
21 import os 19 import os
22 import Queue 20 import Queue
23 -import tempfile  
24 import threading 21 import threading
25 22
26 from multiprocessing import cpu_count 23 from multiprocessing import cpu_count
27 24
28 import vtk 25 import vtk
29 -import vtkgdcm  
30 import gdcm 26 import gdcm
31 -import wx  
32 import wx.lib.pubsub as ps 27 import wx.lib.pubsub as ps
33 28
34 -from vtk.util.colors import yellow  
35 -  
36 import constants as const 29 import constants as const
37 import dicom 30 import dicom
38 import dicom_grouper 31 import dicom_grouper
39 -import data.imagedata_utils as iu  
40 import session 32 import session
41 33
42 def ReadDicomGroup(dir_): 34 def ReadDicomGroup(dir_):
@@ -79,16 +71,14 @@ def SortFiles(filelist, dicom): @@ -79,16 +71,14 @@ def SortFiles(filelist, dicom):
79 return filelist 71 return filelist
80 72
81 class LoadDicom(threading.Thread): 73 class LoadDicom(threading.Thread):
82 - def __init__(self, grouper, tempdir, q, l): 74 + def __init__(self, grouper, q, l):
83 threading.Thread.__init__(self) 75 threading.Thread.__init__(self)
84 self.grouper = grouper 76 self.grouper = grouper
85 - self.tempdir = tempdir  
86 self.q = q 77 self.q = q
87 self.l = l 78 self.l = l
88 def run(self): 79 def run(self):
89 grouper = self.grouper 80 grouper = self.grouper
90 q = self.q 81 q = self.q
91 - tempdir = self.tempdir  
92 while 1: 82 while 1:
93 filepath = q.get() 83 filepath = q.get()
94 print "thread %s consumed %s" % (self.getName(), filepath) 84 print "thread %s consumed %s" % (self.getName(), filepath)
@@ -101,7 +91,6 @@ class LoadDicom(threading.Thread): @@ -101,7 +91,6 @@ class LoadDicom(threading.Thread):
101 dcm.SetParser(parser) 91 dcm.SetParser(parser)
102 grouper.AddFile(dcm) 92 grouper.AddFile(dcm)
103 self.l.release() 93 self.l.release()
104 - dcm.image.SetTempDir(tempdir)  
105 94
106 95
107 def yGetDicomGroups(directory, recursive=True, gui=True): 96 def yGetDicomGroups(directory, recursive=True, gui=True):
@@ -109,7 +98,6 @@ def yGetDicomGroups(directory, recursive=True, gui=True): @@ -109,7 +98,6 @@ def yGetDicomGroups(directory, recursive=True, gui=True):
109 Return all full paths to DICOM files inside given directory. 98 Return all full paths to DICOM files inside given directory.
110 """ 99 """
111 nfiles = 0 100 nfiles = 0
112 - tempdir = tempfile.mkdtemp()  
113 # Find total number of files 101 # Find total number of files
114 if recursive: 102 if recursive:
115 for dirpath, dirnames, filenames in os.walk(directory): 103 for dirpath, dirnames, filenames in os.walk(directory):
@@ -124,7 +112,7 @@ def yGetDicomGroups(directory, recursive=True, gui=True): @@ -124,7 +112,7 @@ def yGetDicomGroups(directory, recursive=True, gui=True):
124 l = threading.Lock() 112 l = threading.Lock()
125 threads = [] 113 threads = []
126 for i in xrange(cpu_count()): 114 for i in xrange(cpu_count()):
127 - t = LoadDicom(grouper, tempdir, q, l) 115 + t = LoadDicom(grouper, q, l)
128 t.start() 116 t.start()
129 threads.append(t) 117 threads.append(t)
130 # Retrieve only DICOM files, splited into groups 118 # Retrieve only DICOM files, splited into groups