X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fgdcmvtk%2Fsrc%2FbbgdcmvtkGetXCoherentInfoGdcmReader.cxx;h=092a2a834c1df10f6d009a4d8024c6adb66b0f16;hb=9d9d8515536607da0a24c67a95ee7429312537de;hp=e638f0ffa55f62b4d3b0e950319668ce83602f4e;hpb=b4f2f6f7aaea4344223882054b61faca214a1d99;p=bbtk.git

diff --git a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
index e638f0f..092a2a8 100644
--- a/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
+++ b/packages/gdcmvtk/src/bbgdcmvtkGetXCoherentInfoGdcmReader.cxx
@@ -29,6 +29,7 @@ void GetXCoherentInfoGdcmReader::Process()
    std::vector<double> v_iop;
    float iop[6];
    f->GetImageOrientationPatient(iop);
+   
    for(i=0; i< 6; i++)
       v_iop.push_back(iop[i]);
    bbSetOutputIOP(v_iop );
@@ -36,14 +37,15 @@ void GetXCoherentInfoGdcmReader::Process()
    std::vector<double> v_ipp;
    float ipp[3];
    f->GetImagePositionPatient(ipp);
+   
    for(i=0; i< 3; i++)
       v_ipp.push_back(ipp[i]);
    bbSetOutputIPP(v_ipp );
 
-
 // Add *all the files* to the SerieHelper
    sh = GDCM_NAME_SPACE::SerieHelper::New();
    std::vector<std::string> gii = bbGetInputIn();
+   
    for(std::vector<std::string>::iterator it = gii.begin();
                                           it != gii.end();
                                         ++it)
@@ -60,26 +62,23 @@ void GetXCoherentInfoGdcmReader::Process()
    int nbFiles;
    double zspacing = 0.;
    nbFiles = l->size() ;
-   sh->OrderFileList(l);
+   sh->OrderFileList(l); // this one should compute the *actual* Z Spacing!
    zspacing = sh->GetZSpacing();
-
-	std::vector<double> v_pixelspacing;
-	v_pixelspacing.push_back( f->GetXSpacing() );
-	v_pixelspacing.push_back( f->GetYSpacing() );
-	v_pixelspacing.push_back( zspacing );
-//	if (f->GetZSize() != 1) {
-//		v_pixelspacing.push_back(f->GetZSpacing());
-//	}
-	bbSetOutputPixelSpacing(v_pixelspacing);
-	
-	
-
-	if (reader!=NULL)
-	{ 
-		reader->Delete();
-		reader=NULL;
-	}
-	reader = vtkGdcmReader::New();
+   std::vector<double> v_pixelspacing;
+   v_pixelspacing.push_back( f->GetXSpacing() );
+   v_pixelspacing.push_back( f->GetYSpacing() );
+   v_pixelspacing.push_back( zspacing );
+//   if (f->GetZSize() != 1) {
+//      v_pixelspacing.push_back(f->GetZSpacing());
+//   }
+   bbSetOutputPixelSpacing(v_pixelspacing);
+
+   if (reader!=NULL)
+   { 
+      reader->Delete();
+      reader=NULL;
+   }
+   reader = vtkGdcmReader::New();
    //reader->SetFileName( bbGetInputIn().c_str() );
    reader->SetCoherentFileList(l);
    reader->Update();
@@ -90,10 +89,10 @@ void GetXCoherentInfoGdcmReader::Process()
 
 void GetXCoherentInfoGdcmReader::bbUserSetDefaultValues()
 {
-    std::vector<std::string> init;
-    init.push_back("");
-    bbSetInputIn(init);  
-	reader=NULL;
+   std::vector<std::string> init;
+   init.push_back("");
+   bbSetInputIn(init);  
+   reader=NULL;
 }
 
 void GetXCoherentInfoGdcmReader::bbUserInitializeProcessing()
@@ -113,5 +112,3 @@ void GetXCoherentInfoGdcmReader::bbUserFinalizeProcessing()
 
 }
 // EO namespace bbgdcmvtk
-
-