X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fgdcmvtk%2Fsrc%2FbbgdcmvtkGetXCoherentInfoGdcmReader.cxx;h=197ed037997da829b0de5672b6af03575e0bc767;hb=6b2916fb6359ead51e50b3ee9b473dc1c3c057d4;hp=dd8e57a87b8bdd3eaf86387f8b98fad4b8308e03;hpb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;p=bbtk.git

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
index dd8e57a..197ed03 100644
--- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
@@ -1,3 +1,4 @@
+/*
 # ---------------------------------------------------------------------
 #
 # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
@@ -47,18 +48,56 @@ namespace bbgdcmvtk
 
 BBTK_ADD_BLACK_BOX_TO_PACKAGE(gdcmvtk,GetXCoherentInfoGdcmReader)
 BBTK_BLACK_BOX_IMPLEMENTATION(GetXCoherentInfoGdcmReader,bbtk::AtomicBlackBox);
+
+
+vtkImageData* GetXCoherentInfoGdcmReader::CreateDefaultImage()
+{
+	int i;
+	int sizeX, sizeY, sizeZ;
+	sizeX = 200;
+	sizeY = sizeX;
+	sizeZ = 1;
+	vtkImageData *newImage = vtkImageData::New();
+   	newImage->Initialize();
+   	newImage->SetScalarTypeToUnsignedChar();
+   	newImage->SetSpacing( 1,1,1 );
+   	newImage->SetDimensions(  sizeX,sizeY,sizeZ );
+   	newImage->SetWholeExtent(0,  sizeX-1,0,sizeY-1,0,sizeZ-1 );
+   	newImage->SetExtent(0,  sizeX-1,0,sizeY-1,0,sizeZ-1 );
+   	newImage->SetNumberOfScalarComponents(1);
+   	newImage->AllocateScalars();
+   	newImage->Update();
+	memset ( (void*)newImage->GetScalarPointer(), 0, sizeX*sizeY*1 );
+   	for (i=0; i<sizeX; i++)
+   	{
+		newImage->SetScalarComponentFromDouble(i,i,0, 0, 255 );
+		newImage->SetScalarComponentFromDouble(i,sizeY-1-i,0, 0, 255 );
+  	} // for i
+	return newImage;
+} 
+
+
 #if defined USE_GDCM
 void GetXCoherentInfoGdcmReader::Process()
 {
+
  // Read the *first* image file (a SET of file names is given as input) 
    f = GDCM_NAME_SPACE::File::New();
-   f->SetFileName( bbGetInputIn()[0] );
+
+	if ( bbGetInputIn().size()!=0 )
+	{
+		f->SetFileName( bbGetInputIn()[0] );
+	} else {
+		f->SetFileName( "" );
+	}
+   
    bool res = f->Load();  
    if ( !res )
    {
-      f->Delete();
-      bbSetOutputOut(0);
-      return;
+		printf("EED GetXCoherentInfoGdcmReader::Process resultImage NULL\n");
+      	f->Delete();
+      	bbSetOutputOut( CreateDefaultImage() );
+      	return;
    }
  // Get info from the first image file
    int i;
@@ -89,6 +128,7 @@ void GetXCoherentInfoGdcmReader::Process()
       sh->AddFileName(*it);
    }
 
+
    GDCM_NAME_SPACE::FileList::const_iterator it;
    GDCM_NAME_SPACE::FileList *l;
 
@@ -123,8 +163,6 @@ void GetXCoherentInfoGdcmReader::Process()
    //reader->SetFileName( bbGetInputIn().c_str() );
    reader->SetCoherentFileList(l);
    reader->Update();
-   reader->GetOutput();
-
    bbSetOutputOut( reader->GetOutput() );
 }
 #endif
@@ -135,16 +173,18 @@ void GetXCoherentInfoGdcmReader::Process()
 {
  // Read the *first* image file (a SET of file names is given as input) 
 	gdcm::Reader *read = new gdcm::Reader();
-	reader->SetFileName( bbGetInputIn()[0].c_str());
+	reader->SetFileName( bbGetInputIn()[0].c_str() );
   
 	bool res = read->Read();  
-   if ( !res )
-   {
-      delete read;
-      bbSetOutputOut(0);
-      return;
-   }
+  	if ( !res )
+   	{
+     	delete read;
+      	bbSetOutputOut(NULL);
+      	return;
+   	}
     
+
+
  // Get info from the first image file
    const gdcm::File &f = read->GetFile();
    int i;
@@ -202,7 +242,6 @@ void GetXCoherentInfoGdcmReader::Process()
    }
    reader->SetFileNames(files);
    reader->Update();
-   reader->GetOutput();
    bbSetOutputOut( reader->GetOutput() );
 }
 #endif