X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=vtk%2FvtkGdcmReader.cxx;h=5dd9fcfedd1d20a9f2bbb3ddd694c4a1043aee13;hb=d92be82d301c24a42e894d1d40b2b2c7173b1032;hp=02f05672b4f7c49687c54acba1ff250152386a69;hpb=c34ecaa3bf4a10a611d4324686a8c25e93d805b8;p=gdcm.git

diff --git a/vtk/vtkGdcmReader.cxx b/vtk/vtkGdcmReader.cxx
index 02f05672..5dd9fcfe 100644
--- a/vtk/vtkGdcmReader.cxx
+++ b/vtk/vtkGdcmReader.cxx
@@ -1,4 +1,47 @@
-// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.cxx,v 1.15 2003/07/07 09:10:33 regrain Exp $
+// $Header: /cvs/public/gdcm/vtk/vtkGdcmReader.cxx,v 1.17 2003/07/07 17:05:17 frog Exp $
+// //////////////////////////////////////////////////////////////
+// WARNING TODO CLENAME 
+// Actual limitations of this code:
+//
+// /////// Redundant and unnecessary header parsing
+// In it's current state this code actually parses three times the Dicom
+// header of a file before the corrersponding image gets loaded in the
+// ad-hoc vtkData !
+// Here is the process:
+//  1/ First loading happens in ExecuteInformation which in order to
+//     positionate the vtk extents calls CheckFileCoherence. The purpous
+//     of CheckFileCoherence is to make sure all the images in the future
+//     stack are "homogenous" (same size, same representation...). This
+//     can only be achieved by parsing all the Dicom headers...
+//  2/ ExecuteData is then responsible for the next two loadings:
+//  2a/ ExecuteData calls AllocateOutputData that in turn seems to 
+//      (indirectely call) ExecuteInformation which ends up in a second
+//      header parsing
+//  2b/ the core of ExecuteData then needs gdcmFile (which in turns
+//      initialiszes gdcmHeader in the constructor) in order to access
+//      the data-image.
+//
+// Possible solution:
+// maintain a list of gdcmFiles (created by say ExecuteInformation) created
+// once and for all accross the life of vtkGdcmHeader (it would only load
+// new gdcmFile if the user changes the list). ExecuteData would then use 
+// those gdcmFile and hence avoid calling the consctutor:
+//  - advantage: the header of the files would only be parser once.
+//  - drawback: once execute information is called (i.e. on creation of
+//              a vtkGdcmHeader) the gdcmFile sctructue is loaded in memory.
+//              The average size of a gdcmHeader being of 100Ko, is one
+//              loads 10 stacks of images with say 200 images each, you
+//              end-up with a loss of 200Mo...
+//
+// /////// Never unallocated memory:
+// ExecuteData allocates space for the pixel data [which will get pointed
+// by the vtkPointData() through the call
+// data->GetPointData()->GetScalars()->SetVoidArray(mem, StackNumPixels, 0);]
+// This data is never "freed" neither in the desctutor nor when the
+// filename list is extended, ExecuteData is called a second (or third)
+// time...
+// //////////////////////////////////////////////////////////////
+
 #include <stdio.h>
 #include <vtkObjectFactory.h>
 #include <vtkImageData.h>
@@ -14,7 +57,6 @@ vtkGdcmReader::vtkGdcmReader()
 //----------------------------------------------------------------------------
 vtkGdcmReader::~vtkGdcmReader()
 { 
-  // FIXME free memory
   this->RemoveAllFileName();
   this->InternalFileNameList.clear();
 }
@@ -97,7 +139,7 @@ void vtkGdcmReader::BuildFileListFromPattern()
      return;
      }
 
-	this->RemoveAllInternalFileName();
+   this->RemoveAllInternalFileName();
    for (int idx = this->DataExtent[4]; idx <= this->DataExtent[5]; ++idx)
      {
      this->ComputeInternalFileName(idx);
@@ -283,7 +325,6 @@ int vtkGdcmReader::CheckFileCoherence()
 // Configure the output e.g. WholeExtent, spacing, origin, scalar type...
 void vtkGdcmReader::ExecuteInformation()
 {
-	//FIXME free any old memory
   this->TotalNumberOfPlanes = this->CheckFileCoherence();
   if ( this->TotalNumberOfPlanes == 0)
     {
@@ -423,8 +464,7 @@ size_t vtkGdcmReader::LoadImageInMemory(
 // (see vtkSource.cxx for last step).
 // This function (redefinition of vtkImageReader::ExecuteData, see 
 // VTK/IO/vtkImageReader.cxx) reads a data from a file. The datas
-// extent/axes are assumed to be the
-// same as the file extent/order.
+// extent/axes are assumed to be the same as the file extent/order.
 void vtkGdcmReader::ExecuteData(vtkDataObject *output)
 {
   if (this->InternalFileNameList.empty())
@@ -433,16 +473,16 @@ void vtkGdcmReader::ExecuteData(vtkDataObject *output)
     return;
     }
 
-  // FIXME : the bad parse of header is made when allocating OuputData
+  // FIXME : extraneous parsing of header is made when allocating OuputData
   vtkImageData *data = this->AllocateOutputData(output);
   data->SetExtent(this->DataExtent);
   data->GetPointData()->GetScalars()->SetName("DicomImage-Volume");
 
   // Test if output has valid extent
   // Prevent memory errors
-  if((this->DataExtent[1]-this->DataExtent[0]>0) &&
-     (this->DataExtent[3]-this->DataExtent[2]>0) &&
-     (this->DataExtent[5]-this->DataExtent[4]>0))
+  if((this->DataExtent[1]-this->DataExtent[0]>=0) &&
+     (this->DataExtent[3]-this->DataExtent[2]>=0) &&
+     (this->DataExtent[5]-this->DataExtent[4]>=0))
     {
     // The memory size for a full stack of images of course depends
     // on the number of planes and the size of each image:
@@ -491,7 +531,6 @@ void vtkGdcmReader::ExecuteData(vtkDataObject *output)
             }
 		      }
         } // Else, file not loadable
-
       } // Loop on files
 
     // The "size" of the vtkScalars data is expressed in number of points,