X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxSimpleDlg.cpp;fp=src%2FcreaImageIOWxSimpleDlg.cpp;h=e750b912c185811e58608c261985f64daf97fee4;hb=7fe8cc3b940607846369ea5d10e2c2aaa6359862;hp=5d053226805a45430b51785d2e0af1d1a6e2ecb9;hpb=52f3d800d1bfa583dbdf0115860cc183ca9319cd;p=creaImageIO.git

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index 5d05322..e750b91 100644
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -171,6 +171,7 @@ namespace creaImageIO
 		 EndModal( dlg.GetReturnCode() );
 	   }
 
+//-----------------------------------------------------------------------------   
 	wxString WxSimpleDlg::getInfoImage()
 	{
 		return infoimage;
@@ -184,17 +185,108 @@ namespace creaImageIO
 		  return m_results;
 	  }
 
+//-----------------------------------------------------------------------------   
 	std::vector< std::map<std::string, std::string> >  WxSimpleDlg::getDicomInfoImagesSelected()
 	{
 		return m_resultsDicomAtr;
 	}
 
+//-----------------------------------------------------------------------------   
 	void WxSimpleDlg::SetAttrDicomTags( std::vector<std::string> attr )
 	{
 		m_attrDicomTags=attr;
 	}
 	  
 
+//-----------------------------------------------------------------------------   
+	vtkImageData*  WxSimpleDlg::getVolumeSelected()
+	{
+		vtkImageData *result;
+
+//        creaImageIO::WxSimpleDlg dlg(0,crea::std2wx(bbGetInputTitle()),"localdatabase_Descriptor.dscp","Local Database"); 
+//		dlg.SetAttrDicomTags( bbGetInputDicomTags() );
+//		dlg.ShowModal(); 
+//		bbSetOutputDicomInfo( dlg.getDicomInfoImagesSelected() );
+
+		if (getImagesSelected().size()!=0){ 
+//		  bbSetOutputFileName( std::string( dlg.getInfoImage().mb_str() ) );
+		  if(getImagesSelected().size() ==1)
+		  {
+			result = getImagesSelected()[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 = getImagesSelected()[0];
+			  	int dim[3];
+			  	first->GetDimensions(dim);
+			  	if (dim[2]==1)
+				{
+					vtkImageData *out;
+				  	out  = vtkImageData::New();
+				  	out->SetScalarType(first->GetScalarType());
+				  	out->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
+				  	int ext[6];
+				  	first->GetWholeExtent(ext); 
+				  	if(ext[5] == 0)
+				  	{
+				 	   ext[5] = getImagesSelected().size()-1;
+				 	 } else {
+						ext[5] = ext[5] * getImagesSelected().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], getImagesSelected().size() );
+					out->AllocateScalars();
+					out->Update();
+					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=getImagesSelected().size();
+					for (slice=0 ; slice<sizeImageVector ; slice++)
+					{
+						vtkImageData *img = getImagesSelected()[slice];
+						memcpy(out->GetScalarPointer(0,0,slice), img->GetScalarPointer(0,0,0), imsize);
+						//img->Delete();
+				 	} // for slice	
+
+//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
+		} else { 
+	    	result = NULL;  
+		} // getImagesSelected().size()!=0
+
+
+        	return result;
+
+		}
+
+
 
-}
+} // namespace creaImageIO