#3309 BBTK Bug New Normal Bug gdcmvtk - GetXCoherentInfoGdcmReader std - FilesFromDir...

[bbtk.git] / packages / gdcmvtk / src / bbgdcmvtkGetXCoherentInfoGdcmReader.cxx

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
index e553a6767bf18b87f86a6400daee1e241d3c3ae8..6c810593aa5758ca97dc852ed27256119e66655b 100644 (file)
--- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
@@ -87,6 +87,7 @@ vtkImageData* GetXCoherentInfoGdcmReader::CreateDefaultImage()
 #if defined USE_GDCM
 void GetXCoherentInfoGdcmReader::Process()
 {
+printf("EED GetXCoherentInfoGdcmReader::Process Start\n");
  // Read the *first* image file (a SET of file names is given as input) 
    f = GDCM_NAME_SPACE::File::New();
 
@@ -96,6 +97,7 @@ void GetXCoherentInfoGdcmReader::Process()
        } else {
                f->SetFileName( "" );
        } // if
+printf("EED GetXCoherentInfoGdcmReader::Process 1\n");
 
    bool res = f->Load();  
    if ( !res )
@@ -116,6 +118,7 @@ void GetXCoherentInfoGdcmReader::Process()
       v_iop.push_back(iop[i]);
        } // for i
    bbSetOutputIOP(v_iop );
+printf("EED GetXCoherentInfoGdcmReader::Process 2\n");
  
    std::vector<double> v_ipp;
    float ipp[3];
@@ -130,6 +133,8 @@ void GetXCoherentInfoGdcmReader::Process()
 // Add *all the files* to the SerieHelper
    sh = GDCM_NAME_SPACE::SerieHelper::New();
    std::vector<std::string> gii = bbGetInputIn();
+
+printf("EED GetXCoherentInfoGdcmReader::Process 3\n");
    
    for(std::vector<std::string>::iterator it = gii.begin();
                                           it != gii.end();
@@ -141,8 +146,17 @@ void GetXCoherentInfoGdcmReader::Process()
    GDCM_NAME_SPACE::FileList::const_iterator it;
    GDCM_NAME_SPACE::FileList *l;
 
+printf("EED GetXCoherentInfoGdcmReader::Process 4\n");
    // Should only contain one!
    l = sh->GetFirstSingleSerieUIDFileSet();
+printf("EED GetXCoherentInfoGdcmReader::Process 5\n");
+
+       if (l==NULL)
+       {       
+               printf("EED GetXCoherentInfoGdcmReader::Process Warnning not coherent list/file \n");
+               return;
+       }
+printf("EED GetXCoherentInfoGdcmReader::Process 6\n");
 
    double zspacing = 0.;
    sh->OrderFileList(l); // this one should compute the *actual* Z Spacing!
@@ -168,7 +182,6 @@ void GetXCoherentInfoGdcmReader::Process()
        for ( ; iitt != l->end(); ++iitt)
        {
                MapInfoDicom mapinfodicom;
-
                for (iTag=0; iTag<sizeDicomTagsVector; iTag++)
                {
                        key = bbGetInputDicomTags()[iTag];
@@ -208,7 +221,6 @@ 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() );
-  
        bool res = read->Read();  
        if ( !res )
        {
@@ -217,8 +229,6 @@ void GetXCoherentInfoGdcmReader::Process()
        return;
        }
     
-
-
  // Get info from the first image file
    const gdcm::File &f = read->GetFile();
    int i;
@@ -229,17 +239,17 @@ void GetXCoherentInfoGdcmReader::Process()
    gdcm::Element<gdcm::VR::DS,gdcm::VM::VM6> iop;
    iop.Read( ss );
    for(i=0; i< 6; i++)
-       {
+   {
        v_iop.push_back((float)(iop[i]));
-       }
+   }
    bbSetOutputIOP(v_iop );
  
-  std::vector<double> v_ipp;
+   std::vector<double> v_ipp;
    const gdcm::DataElement &deIpp = f.GetDataSet().GetDataElement(gdcm::Tag((0x0020,0x0032)));
    deIpp.GetValue().Print(ss);
    gdcm::Element<gdcm::VR::DS,gdcm::VM::VM3> ipp;
    ipp.Read( ss );
-       for(i=0; i< 3; i++)
+   for(i=0; i< 3; i++)
        {
                v_ipp.push_back((float)(ipp[i]));
        } // for 3
@@ -287,7 +297,7 @@ void GetXCoherentInfoGdcmReader::Process()
 
 void GetXCoherentInfoGdcmReader::bbUserSetDefaultValues()
 {
-       reader=NULL;
+   reader=NULL;
    std::vector<std::string> init;
    init.push_back("");
    bbSetInputIn(init);