X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOSimpleView.cpp;h=98321c132c24fe5f53098a125f85085640d36ec1;hb=efe10f4ac0d8de45d26ca7b1f74f3676802c1b90;hp=c7a1bd8a929903690a1a35517cd2cc736804a336;hpb=6b7ccc72c2f9cee3979d9360a55eaa65aeea8a17;p=creaImageIO.git

diff --git a/src/creaImageIOSimpleView.cpp b/src/creaImageIOSimpleView.cpp
index c7a1bd8..98321c1 100644
--- a/src/creaImageIOSimpleView.cpp
+++ b/src/creaImageIOSimpleView.cpp
@@ -34,18 +34,13 @@
 namespace creaImageIO
 {
 	bool SimpleView::readFile(	std::vector<std::string> i_filenames,   								// in information names
-										std::vector<std::string> i_attr,											// in information attributes names
+										std::vector<std::string> i_attr,								// in information attributes names
 										std::vector<std::map <std::string , std::string> > &i_imgAttr,	// out information attributes names-values
-										std::vector<vtkImageData *> &i_img)     								// out information vtkImageData
+										std::vector<vtkImageData *> &i_img)     						// out information vtkImageData
 	{
-printf("EED SimpleView::readFile 0\n");
-
 		  //Mosaic Attribute for Simens		
 			i_attr.push_back("D0019_100a");  // Number of images in mosaic (Simens)
 			i_attr.push_back("D0018_0088");  // Spacing Between Slices
-		
-
-
 			creaImageIOUnMosaicVtkImageData Mosaic;
 			vtkImageData* tmpImg1;
 			vtkImageData* tmpImg2;
@@ -68,7 +63,6 @@ printf("EED SimpleView::readFile 0\n");
 //EED borrame
 //					i_img.push_back( mReader->ReadImage( (*it).c_str() ) );
 
-printf("EED SimpleView::readFile 1\n");
 
 					// EED 18 octt 2014
 					std::map <std::string , std::string>::iterator itMapAttr;
@@ -79,18 +73,14 @@ printf("EED SimpleView::readFile 1\n");
 					if ( itMapAttr!=mapAttr.end() ) numberOfImagesInMosaicStr = itMapAttr->second;
 
 //					std::string numberOfImagesInMosaicStr = mapAttr.find("D0019_100a")->second;
-printf("EED SimpleView::readFile 1.1\n");
 					itMapAttr = mapAttr.find("D0018_0088");
 					if ( itMapAttr!=mapAttr.end() ) spaceBetweenSliceStr = itMapAttr->second;
 
 //					std::string spaceBetweenSliceStr = mapAttr.find("D0018_0088")->second;
-printf("EED SimpleView::readFile 1.2\n");
 					if (numberOfImagesInMosaicStr=="")
 					{
-printf("EED SimpleView::readFile 2\n");
 						i_img.push_back( mReader->ReadImage( (*it).c_str() ) );
 					} else {
-printf("EED SimpleView::readFile 3\n");
 						numberOfImagesInMosaic = atoi(numberOfImagesInMosaicStr.c_str());
 						spcZ = atoi(spaceBetweenSliceStr.c_str());
 						tmpImg1 = mReader->ReadImage( (*it).c_str() ) ;
@@ -106,8 +96,6 @@ printf("EED SimpleView::readFile 3\n");
 				} // if
 			} // for
 			delete mReader;
-printf("EED SimpleView::readFile 4\n");
-
 			return bfinal;	
 	}
 
@@ -153,4 +141,105 @@ printf("EED SimpleView::readFile 4\n");
 			}
 			return bresult;
 	}
-}
+
+	
+	vtkImageData* SimpleView::getVolumeSelected( std::vector<vtkImageData*> lstImages)
+	{
+		vtkImageData *result;
+
+//        creaImageIO::WxSimpleDlg dlg(0,crea::std2wx(bbGetInputTitle()),"localdatabase_Descriptor.dscp","Local Database"); 
+//		dlg.SetAttrDicomTags( bbGetInputDicomTags() );
+//		dlg.ShowModal(); 
+//		bbSetOutputDicomInfo( dlg.getDicomInfoImagesSelected() );
+
+		if (lstImages.size()!=0)
+		{ 
+//		  bbSetOutputFileName( std::string( dlg.getInfoImage().mb_str() ) );
+		  if(lstImages.size() ==1)
+		  {
+			result = lstImages[0] ;  
+		  } else {
+				// FCY: it will be a big problem if we have several kind of data in the same folder.
+			  	// creation of a huge vtkImageData!!!!
+			  	vtkImageData* first = lstImages[0];
+			  	int dim[3];
+			  	first->GetDimensions(dim);
+			  	if (dim[2]==1)
+				{
+					vtkImageData *out = vtkImageData::New();
+				  	int ext[6];
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+				  	first->GetWholeExtent(ext); 
+#else
+				  	first->GetExtent(ext); 
+#endif
+				  	if(ext[5] == 0)
+				  	{
+				 	   ext[5] = lstImages.size()-1;
+				 	 } else {
+						ext[5] = ext[5] * lstImages.size()-1; // to deal with multiframes 
+				  	} // ext
+				  	out->SetExtent(ext);
+				  	double spac[3];
+				  	first->GetDimensions(dim);
+				  	first->GetSpacing(spac);
+ 				  	if (spac[0]==spac[1])
+					{
+						spac[2]=spac[0];  
+		          	}
+					out->SetSpacing(spac);
+					out->SetDimensions(dim[0], dim[1], lstImages.size() );
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
+
+				  	out->SetScalarType(first->GetScalarType());
+				  	out->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
+					out->AllocateScalars();
+					out->Update();
+#else
+					out->AllocateScalars(first->GetScalarType(),first->GetNumberOfScalarComponents());
+#endif
+
+
+					unsigned long imsize = dim[0] * dim[1];
+					imsize = imsize * dim[2];  // deal with multiframes here
+					// differents formats char , short, etc...
+					// differents components 1..3  ex. jpg ->RGB 3
+					imsize = imsize * first->GetScalarSize() * first->GetNumberOfScalarComponents();
+  		        	int slice,sizeImageVector=lstImages.size();
+					for (slice=0 ; slice<sizeImageVector ; slice++)
+					{
+						vtkImageData *img = lstImages[slice];
+						memcpy(out->GetScalarPointer(0,0,slice), img->GetScalarPointer(0,0,0), imsize);
+						//img->Delete();
+				 	} // for slice	
+					out->Modified();
+//EED This is NOT working. The iteration over the pointer vtkImageData
+//		    	  	int slice=0;
+//		  	    	std::vector<vtkImageData*>::iterator it;
+//		  	    	for (it=dlg.getImagesSelected().begin(); it!=dlg.getImagesSelected().end(); ++it) 
+//					{
+//						  memcpy(out->GetScalarPointer(0,0,slice), (*it)->GetScalarPointer(0,0,0), imsize);
+//						  slice++;
+//					}	
+//		     	  	//for (it=dlg.getImagesSelected().begin(); it!=dlg.getImagesSelected().end(); ++it) 
+//					//{
+// 					//		(*it)->Delete();
+//					//}
+
+					result =out;
+
+				} else {
+					result = first;
+				} // dim
+			} // if getImagesSelected size
+			result->Modified();
+		} else { 
+	    	result = NULL;  
+		} // getImagesSelected().size()!=0
+       	return result;
+	}
+	
+	
+} // NAMESPACE