X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FcreaImageIOWxSimpleDlg.cpp;h=ca984309b7eaf5d5e5cb27d8f3110c929317dd28;hb=e7ba14e2a36189a6ba6d8490c2b4edf3be86f894;hp=f69261f6c0b9c8b0238b9190c047a7f00f5e01ea;hpb=c7482ec7d04a5e5987841932a6856ebd471cebdb;p=creaImageIO.git

diff --git a/src/creaImageIOWxSimpleDlg.cpp b/src/creaImageIOWxSimpleDlg.cpp
index f69261f..ca98430 100644
--- a/src/creaImageIOWxSimpleDlg.cpp
+++ b/src/creaImageIOWxSimpleDlg.cpp
@@ -79,13 +79,14 @@ namespace creaImageIO
 				if(wxArray.size() >0)
 				{
 					m_results.clear();
-					infoimage=_T("FILE(s):")+wxArray[0];
+					infoimage		=	wxArray[0];
+					infoimageSource	=	_T("FILE(s)");
 					std::vector<std::string> files;
 					for( int i = 0; i < wxArray.GetCount(); i++)
 					{
 						files.push_back( crea::wx2std(wxArray[i]));
 					}
-					if(!m_view.readFile(files,m_results))
+					if( !m_view.readFile(files , m_attrDicomTags , m_resultsDicomAtr , m_results) )
 					{
 						//TO DO WARNING MESSAGE;
 					}
@@ -112,8 +113,9 @@ namespace creaImageIO
 		 if ( resultShowModal==wxID_OK )
 		 {  
 			 m_results.clear();
-			infoimage=_T("DIRECTORY:")+dirDlg->GetPath();
-			if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()),m_results))
+			infoimage		=	dirDlg->GetPath();
+			infoimageSource	=	_T("DIRECTORY");
+			if(! m_view.readDirectory(crea::wx2std(dirDlg->GetPath()) , m_attrDicomTags , m_resultsDicomAtr , m_results))
 			{
 				//TO DO WARNING MESSAGE;
 			}
@@ -143,38 +145,49 @@ namespace creaImageIO
 		 dlg.ShowModal();
 		 if (dlg.GetReturnCode() == wxID_OK)
 	     {
-			std::vector<creaImageIO::OutStrGimmick> out;
-			std::vector<std::string> attr;
 				dlg.stopReading();
-				dlg.getSelected(out, attr,true,"");
+
+				std::vector<creaImageIO::OutStrGimmick> outStrGimmick;
+				dlg.getSelected(outStrGimmick, m_attrDicomTags,true,"");
+
 			m_results.clear();
-			int size=out.size();
+			int size=(int)outStrGimmick.size();
 			int ii;
-			if(!bInfo)
-			{
+//			if(!bInfo)
+//			{
 				for (ii=0;ii<size;ii++)
 				{
-					m_results.push_back(out[ii].img);
+					m_results.push_back(outStrGimmick[ii].img);
+					m_resultsDicomAtr.push_back( outStrGimmick[ii].infos );
 				}
-			}
-			else
-			{
-				for (ii=0;ii<size;ii++)
-				{
-					m_resultsInfo.push_back(out[ii]);
-				}
-			}
+//			} else {
+//				for (ii=0;ii<size;ii++)
+//				{
+//					m_resultsInfo.push_back(outStrGimmick[ii]);
+//				}
+//			}
+
+			infoimage		=	_T("EED Missing info <void> ???");
+			infoimageSource	=	_T("GIMMICK");
+
 			dlg.OnExit();
 		 }
 		 SetReturnCode( dlg.GetReturnCode() );
 		 EndModal( dlg.GetReturnCode() );
 	   }
 
+//-----------------------------------------------------------------------------   
 	wxString WxSimpleDlg::getInfoImage()
 	{
 		return infoimage;
 	}
 
+//-----------------------------------------------------------------------------   
+	wxString WxSimpleDlg::getInfoImageSource()
+	{
+		return infoimageSource;
+	}
+
  //////////////////////////////////////////////////////////////////////
 // Return the results vector										//
 //////////////////////////////////////////////////////////////////////
@@ -183,6 +196,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