X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vtk%2FvtkGdcmReader.cxx;h=ea4545a02a57c104cbe938be545d633b254083be;hb=9cfc9aff66a9339b8b467f48c8a5ef6e39ae9e34;hp=1e3f9a21ee6717a8c62c6e5088f860d87df39774;hpb=b178cc9e1efeff5116c138ac66beaf0235d8c09a;p=gdcm.git

diff --git a/vtk/vtkGdcmReader.cxx b/vtk/vtkGdcmReader.cxx
index 1e3f9a21..ea4545a0 100644
--- a/vtk/vtkGdcmReader.cxx
+++ b/vtk/vtkGdcmReader.cxx
@@ -63,6 +63,7 @@
 vtkGdcmReader::vtkGdcmReader()
 {
    this->LookupTable = NULL;
+   this->AllowLookupTable = 0;
 }
 
 vtkGdcmReader::~vtkGdcmReader()
@@ -122,6 +123,7 @@ void vtkGdcmReader::SetFileName(const char *name)
    // Since we maintain a list of filenames, when building a volume,
    // (see vtkGdcmReader::AddFileName), we additionaly need to purge
    // this list when we manually positionate the filename.
+   vtkDebugMacro("Clearing all files given with AddFileName");
    this->FileNameList.clear();
    this->Modified();
 }
@@ -319,10 +321,26 @@ void vtkGdcmReader::ExecuteData(vtkDataObject *output)
  */
 void vtkGdcmReader::BuildFileListFromPattern()
 {
+   this->RemoveAllInternalFileName();
+
    if ((! this->FileNameList.empty()) && this->FileName )
    {
-      vtkErrorMacro("Both file patterns and AddFileName schemes were used");
-      vtkErrorMacro("Only the files specified with AddFileName shall be used");
+      vtkErrorMacro("Both AddFileName and SetFileName schemes were used");
+      vtkErrorMacro("No images loaded ! ");
+      return;
+   }
+
+   if ((! this->FileNameList.empty()) && this->FilePrefix )
+   {
+      vtkErrorMacro("Both AddFileName and SetFilePrefix schemes were used");
+      vtkErrorMacro("No images loaded ! ");
+      return;
+   }
+
+   if (this->FileName && this->FilePrefix)
+   {
+      vtkErrorMacro("Both SetFileName and SetFilePrefix schemes were used");
+      vtkErrorMacro("No images loaded ! ");
       return;
    }
 
@@ -333,24 +351,24 @@ void vtkGdcmReader::BuildFileListFromPattern()
       return;
    }
 
-   if (!this->FileName && !this->FilePattern)
+   if (!this->FileName && !this->FilePrefix)
    {
       vtkErrorMacro("FileNames are not set. Either use AddFileName() or");
-      vtkErrorMacro("specify a FileName or FilePattern.");
+      vtkErrorMacro("specify a FileName or FilePrefix.");
       return;
    }
 
-   this->RemoveAllInternalFileName();
-   if( this->FileNameList.empty() )
+   if( this->FileName )
    {
-      //Multiframe case:
+      // Single file loading (as given with ::SetFileName()):
+      // Case of multi-frame file considered here
       this->ComputeInternalFileName(this->DataExtent[4]);
       vtkDebugMacro("Adding file " << this->InternalFileName);
       this->AddInternalFileName(this->InternalFileName);
    }
    else
    {
-      //stack of 2D dicom case:
+      // Multi file loading (as given with ::SetFilePattern()):
       for (int idx = this->DataExtent[4]; idx <= this->DataExtent[5]; ++idx)
       {
          this->ComputeInternalFileName(idx);
@@ -421,9 +439,10 @@ int vtkGdcmReader::CheckFileCoherence()
          continue;
       }
       fclose(fp);
-   
+
       // Stage 1.2: check for Gdcm parsability
-      gdcmHeaderHelper GdcmHeader(FileName->c_str());
+      gdcmHeaderHelper GdcmHeader(FileName->c_str(), false, true);
+      //                             true : for enableSequences
       if (!GdcmHeader.IsReadable())
       {
          vtkErrorMacro("Gdcm cannot parse file " << FileName->c_str());
@@ -511,8 +530,9 @@ int vtkGdcmReader::CheckFileCoherence()
          this->ImageType = type;
          this->PixelSize = GdcmHeader.GetPixelSize();
 
-         if( GdcmHeader.HasLUT() )
+         if( GdcmHeader.HasLUT() && this->AllowLookupTable )
          {
+            // I could raise an error is AllowLookupTable is on and HasLUT() off
             this->NumComponents = GdcmHeader.GetNumberOfScalarComponentsRaw();
          }
          else
@@ -587,8 +607,9 @@ size_t vtkGdcmReader::LoadImageInMemory(
              const unsigned long UpdateProgressTarget,
              unsigned long & UpdateProgressCount)
 {
-   vtkDebugMacro("Copying to memory image" << FileName.c_str());
-   gdcmFile GdcmFile(FileName.c_str());
+   vtkDebugMacro("Copying to memory image [" << FileName.c_str() << "]");
+   gdcmFile GdcmFile(FileName.c_str(),false,true);
+   // true : to enable SeQuences
    size_t size;
 
    // If the data structure of vtk for image/volume representation
@@ -605,7 +626,7 @@ size_t vtkGdcmReader::LoadImageInMemory(
 
    unsigned char * Source;
    
-   if( GdcmFile.GetHeader()->HasLUT() )
+   if( GdcmFile.GetHeader()->HasLUT() && this->AllowLookupTable )
    {
       size               = GdcmFile.GetImageDataSizeRaw();
       Source             = (unsigned char*) GdcmFile.GetImageDataRaw();
@@ -632,7 +653,8 @@ size_t vtkGdcmReader::LoadImageInMemory(
    {
       size        = GdcmFile.GetImageDataSize();
       Source      = (unsigned char*)GdcmFile.GetImageData();
-   }
+   } 
+   
    unsigned char * pSource     = Source; //pointer for later deletion
    unsigned char * Destination = Dest + size - LineSize;
 
@@ -652,6 +674,16 @@ size_t vtkGdcmReader::LoadImageInMemory(
          UpdateProgressCount++;
       }
    }
+   
+// DO NOT remove this commented out code .
+// Nobody knows what's expecting you ...
+// Just to 'see' what was actually read on disk :-(
+
+//   FILE * f2;
+//   f2 = fopen("SpuriousFile.RAW","wb");
+//   fwrite(Dest,size,1,f2);
+//   fclose(f2); 
+   
    //GetImageData allocate a (void*)malloc, remove it:
    free(pSource);
    return size;