ENH: Rule for reducing imagedata quality under win32 FIX #76

Paulo Henrique Junqueira Amorim
1 parent a06516c0
Showing 5 changed files with 47 additions and 8 deletions Show diff stats
invesalius/control.py
invesalius/data/imagedata_utils.py
invesalius/reader/dicom.py
invesalius/reader/dicom_reader.py
invesalius/utils.py
@@ -367,7 +367,10 @@ class Controller():
             print ">Not used the IPPSorter"
             filelist = [i.image.file for i in dicom_group.GetHandSortedList()]
         zspacing = dicom_group.zspacing
-        imagedata = utils.CreateImageData(filelist, zspacing)
+        size = dicom.image.size
+        bits = dicom.image.bits_allocad
+        
+        imagedata = utils.CreateImageData(filelist, zspacing, size, bits)
         # 1(a): Fix gantry tilt, if any
         tilt_value = dicom.acquisition.tilt
@@ -24,7 +24,7 @@ import wx.lib.pubsub as ps
 import constants as const
 from data import vtk_utils
-
+import utils
 # TODO: Test cases which are originally in sagittal/coronal orientation
 # and have gantry
@@ -217,7 +217,7 @@ def ExtractVOI(imagedata,xi,xf,yi,yf,zi,zf):
     voi.Update()  
     return voi.GetOutput()
-def CreateImageData(filelist, zspacing):
+def CreateImageData(filelist, zspacing, size, bits):
     message = "Generating multiplanar visualization..."
     if not const.VTK_WARNING:
@@ -245,12 +245,16 @@ def CreateImageData(filelist, zspacing):
         spacing = imagedata.GetSpacing()
         imagedata.SetSpacing(spacing[0], spacing[1], zspacing)
     else:
+    
         update_progress= vtk_utils.ShowProgress(2*len(filelist),
                                             dialog_type = "ProgressDialog")
         # Reformat each slice and future append them
         appender = vtk.vtkImageAppend()
         appender.SetAppendAxis(2) #Define Stack in Z
+        
+        x,y = size        
+        p = utils.PredictingMemory(len(filelist), x, y, bits)
         # Reformat each slice
         for x in xrange(len(filelist)):
@@ -262,10 +266,9 @@ def CreateImageData(filelist, zspacing):
             reader.AddObserver("ProgressEvent", lambda obj,evt:
                          update_progress(reader,message))
             reader.Update()
-
+           
             #Resample image in x,y dimension
-            slice_imagedata = ResampleImage2D(reader.GetOutput(), 256, update_progress)
-
+            slice_imagedata = ResampleImage2D(reader.GetOutput(), p, update_progress)
             #Stack images in Z axes
             appender.AddInput(slice_imagedata)
             #appender.AddObserver("ProgressEvent", lambda obj,evt:update_progress(appender))
@@ -285,6 +288,7 @@ def CreateImageData(filelist, zspacing):
     return imagedata
+"""
 class ImageCreator:
     def __init__(self):
         ps.Publisher().sendMessage("Cancel imagedata load", self.CancelImageDataLoad)
@@ -332,6 +336,7 @@ class ImageCreator:
                 reader.Update()
                 #Resample image in x,y dimension
+               
                 slice_imagedata = ResampleImage2D(reader.GetOutput(), 256, update_progress)
                 #Stack images in Z axes
@@ -351,5 +356,5 @@ class ImageCreator:
         imagedata.Update()
         return imagedata
-    
+"""
@@ -1854,6 +1854,7 @@ class Image(object):
         self.type = parser.GetImageType()
         self.size = (parser.GetDimensionX(), parser.GetDimensionY())
         self.imagedata = parser.GetImageData()
+        self.bits_allocad = parser._GetBitsAllocated()
         if (parser.GetImageThickness()):
             try:
@@ -37,7 +37,10 @@ def ReadDicomGroup(dir_):
     if len(patient_group) > 0:
         filelist, dicom, zspacing = SelectLargerDicomGroup(patient_group)
         filelist = SortFiles(filelist, dicom)
-        imagedata = CreateImageData(filelist, zspacing)
+        size = dicom.image.size
+        bits = dicom.image.bits_allocad
+        
+        imagedata = CreateImageData(filelist, zspacing, size, bits)
         session.Session().project_status = const.NEW_PROJECT
         return imagedata, dicom
     else:
@@ -82,3 +82,30 @@ def frange(start, end=None, inc=None):
         L.append(next)
     return L
+
+def PredictingMemory(qtd, x, y, p):
+    m = qtd * (x * y * p)
+    
+    #314859200 = 350 MB
+    #house 25 MB increases the 
+    #factor 0.4
+    if (m >= 314859200):
+        porcent = 1.5 + (m - 314859200) / 26999999 * 0.04
+        x = x/porcent
+        y = y/porcent
+        return x
+    else:
+        return x  
+        
+    return x
+
+def BytesConvert(bytes):
+    if bytes >= 1073741824:
+        return str(bytes / 1024 / 1024 / 1024) + ' GB'
+    elif bytes >= 1048576:
+        return str(bytes / 1024 / 1024) + ' MB'
+    elif bytes >= 1024:
+        return str(bytes / 1024) + ' KB'
+    elif bytes < 1024:
+        return str(bytes) + ' bytes'
+
	@@ -1854,6 +1854,7 @@ class Image(object):		@@ -1854,6 +1854,7 @@ class Image(object):
1854	self.type = parser.GetImageType()	1854	self.type = parser.GetImageType()
1855	self.size = (parser.GetDimensionX(), parser.GetDimensionY())	1855	self.size = (parser.GetDimensionX(), parser.GetDimensionY())
1856	self.imagedata = parser.GetImageData()	1856	self.imagedata = parser.GetImageData()
		1857	+ self.bits_allocad = parser._GetBitsAllocated()
1857		1858
1858	if (parser.GetImageThickness()):	1859	if (parser.GetImageThickness()):
1859	try:	1860	try:
	@@ -82,3 +82,30 @@ def frange(start, end=None, inc=None):		@@ -82,3 +82,30 @@ def frange(start, end=None, inc=None):
82	L.append(next)	82	L.append(next)
83		83
84	return L	84	return L
		85	+
		86	+def PredictingMemory(qtd, x, y, p):
		87	+ m = qtd * (x * y * p)
		88	+
		89	+ #314859200 = 350 MB
		90	+ #house 25 MB increases the
		91	+ #factor 0.4
		92	+ if (m >= 314859200):
		93	+ porcent = 1.5 + (m - 314859200) / 26999999 * 0.04
		94	+ x = x/porcent
		95	+ y = y/porcent
		96	+ return x
		97	+ else:
		98	+ return x
		99	+
		100	+ return x
		101	+
		102	+def BytesConvert(bytes):
		103	+ if bytes >= 1073741824:
		104	+ return str(bytes / 1024 / 1024 / 1024) + ' GB'
		105	+ elif bytes >= 1048576:
		106	+ return str(bytes / 1024 / 1024) + ' MB'
		107	+ elif bytes >= 1024:
		108	+ return str(bytes / 1024) + ' KB'
		109	+ elif bytes < 1024:
		110	+ return str(bytes) + ' bytes'
		111	+