X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOGimmickView.cpp;h=672f9224b9874b4a8297f9904bb023f2fd331ad9;hb=f6c90a7f05ae0fd545dfdba5cd5a37d124bd8056;hp=0281042c2c1e5e62502f8c8972c3cfb9d22f1348;hpb=f4345fcbbb606af15d5af72b6179d5103ff75565;p=creaImageIO.git

diff --git a/src/creaImageIOGimmickView.cpp b/src/creaImageIOGimmickView.cpp
index 0281042..672f922 100644
--- a/src/creaImageIOGimmickView.cpp
+++ b/src/creaImageIOGimmickView.cpp
@@ -489,26 +489,15 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vect
 
 		i_attr.outside.push_back("D0019_100a");  // simens Number Of Images In Mosaic
 
-//EED Borrame
-		int i,isize=i_attr.outside.size();
-		for (i=0;i<isize;i++)
-		{
-   		printf("EED GimmickView::readImages1 A  i_attr out %s \n", i_attr.outside[i].c_str());
-		}
-
-
-
 		std::vector<std::string>::iterator it;
 		for (it=im.begin(); it!=im.end(); ++it)
 		{
 			OutStrGimmick out;
 			out.img = vtkImageData::New();
 			out.img->ShallowCopy(mReader.GetImage(*it));
-printf("EED GimmickView::readImages1 A\n ");
 			if(i_attr.mult) 
 			{
 				getAttributes((*it),out.infos,i_attr);
-printf("EED GimmickView::readImages1 B   %s \n ", out.infos.find("D0019_100a")->second.c_str() );				
 			}
 			o_output.push_back(out);
 		}
@@ -516,7 +505,6 @@ printf("EED GimmickView::readImages1 B   %s \n ", out.infos.find("D0019_100a")->
 		if(!i_attr.mult)
 		{
 			getAttributes(im.front(), o_output.front().infos, i_attr);
-printf("EED GimmickView::readImages1 C   %s \n ", o_output.front().infos.find("D0019_100a")->second.c_str() );
 		}
 		
 	}
@@ -746,7 +734,7 @@ void GimmickView::ReadImagesNotThreadedInVector(std::vector<vtkImageData*>& s, s
     	else if (im.size()>1) // Test inutile ? JPR
 	{
 		/// \TODO fix unused variable 'first'
-		vtkImageData* first = mReader.GetImage( im.front());
+//		vtkImageData* first = mReader.GetImage( im.front());
 		if (dimension == 2)
 		{
 		 // n3D
@@ -756,10 +744,8 @@ void GimmickView::ReadImagesNotThreadedInVector(std::vector<vtkImageData*>& s, s
 				vtkImageData* out = vtkImageData::New();
 				out->ShallowCopy(mReader.GetImage(*it));
 				s.push_back(out);
-			}
-		}
-		else
-		{
+			} // for
+		} else {
 			// n2D to 3D // NO!
 			// n *2D + T in a vector :
 			
@@ -768,9 +754,9 @@ void GimmickView::ReadImagesNotThreadedInVector(std::vector<vtkImageData*>& s, s
 			{
 				vtkImageData* out = mReader.GetImage( (*it));
 				s.push_back(out);
-			}
-		}
-	}
+			} // for
+		} // if dimension
+	} // if im.size
 }
   //======================================================================
 
@@ -901,8 +887,9 @@ void GimmickView::Anonymize(std::vector<std::string> i_filenames, int type)
 		
 		// We need a gdcm::FileHelper, since we want to load the pixels        
 		GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New(file);
-	
-   uint8_t *imageData = fh->GetImageData();
+
+//Borrame
+//EED   uint8_t *imageData = fh->GetImageData();
 
 	   // Institution name 
 	   file->AddAnonymizeElement(0x0008, 0x0080, "*"); 
@@ -926,7 +913,7 @@ void GimmickView::Anonymize(std::vector<std::string> i_filenames, int type)
 	   fh->SetContentType(GDCM_NAME_SPACE::UNMODIFIED_PIXELS_IMAGE);
    
 	   fh->WriteDcmExplVR(file->GetFileName() +".ano1" );
-	   std::cout << i <<"  End Anonymize" << std::cout;  
+	   std::cout << i <<"  End Anonymize" << std::endl;  
 	   file->ClearAnonymizeList();
 	   file->Delete();
 	   fh->Delete();