X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmickView.cpp;h=d990cb56b942e509197655e39841dd74c612c30a;hb=b0843014c5482f70050fab8036c6780172e3b6c9;hp=b213cb1e474fc50361bdd1538207eec478b6173a;hpb=34d2d6b1860321978fd19668bbf6fd0606ac1e80;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmickView.cpp b/src2/creaImageIOGimmickView.cpp
index b213cb1..d990cb5 100644
--- a/src2/creaImageIOGimmickView.cpp
+++ b/src2/creaImageIOGimmickView.cpp
@@ -1,7 +1,9 @@
 #include <creaImageIOGimmickView.h>
 #include <creaImageIOSystem.h>
 #include "boost/filesystem.hpp"
-
+#include <gdcmGlobal.h>
+#include <gdcmSerieHelper.h>
+#include <vtkGdcmReader.h>
 namespace fs = boost::filesystem;
 
 namespace creaImageIO
@@ -66,7 +68,7 @@ namespace creaImageIO
 	// Anciently started the threads ...
     // Threads now automatically start at first image request
     //mReader.Start();
-	
+
   }
   //======================================================================
 
@@ -88,7 +90,7 @@ namespace creaImageIO
 	mReaderStarted=false;
   }
   //======================================================================
-  
+
   //======================================================================
   /// Finalize 
   void GimmickView::Finalize()
@@ -114,7 +116,7 @@ namespace creaImageIO
   /// Create a tree view with a given name
   void GimmickView::CreateSingleTreeView(std::string &i_name)
   {
-		this->CreateTreeView(mGimmick->GetTreeHandlerMap()[i_name]);
+	this->CreateTreeView(mGimmick->GetTreeHandlerMap()[i_name]);
      
   }
 
@@ -133,8 +135,9 @@ namespace creaImageIO
 	GimmickError("INTERNAL ERROR : GimmickView::UpdateTreeView : '"
 		     <<t<<"' is not in TreeViewMap");
       }
-    i->second->UpdateLevel(l);    
+    i->second->UpdateLevel(l);
   }
+
   //======================================================================
   /// Clears the status and begins a new selection process
   void GimmickView::ResetExtent()
@@ -146,9 +149,8 @@ namespace creaImageIO
 	  valid=true;
   }
 
-
   //======================================================================
-  
+
   //======================================================================
   bool ImageExtent::IsCompatible(const ImageExtent& ie)
   {
@@ -163,7 +165,7 @@ namespace creaImageIO
   }
 
   //======================================================================
-  
+
   //======================================================================
   void ImageExtent::Add(const ImageExtent& ie)
   {
@@ -204,9 +206,9 @@ namespace creaImageIO
 	else
 	{
 		boost::shared_ptr<ImageExtent> ie=boost::shared_ptr<ImageExtent>(new ImageExtent((*sel).GetAttribute("D0028_0010"),
-			                         (*sel).GetAttribute("D0028_0011"),
-									 (*sel).GetAttribute("D0028_0012"), 
-									 ""));
+			                         			(*sel).GetAttribute("D0028_0011"),
+									(*sel).GetAttribute("D0028_0012"), 
+									""));
 	if(mImageExtent==0)
 	{
 		mImageExtent=ie;
@@ -218,7 +220,7 @@ namespace creaImageIO
 		{
 			std::stringstream out;
 			out << mImageExtent->GetDimension() << "D image " << mImageExtent->Get(0) << "x"<< mImageExtent->Get(1) << "x"<< mImageExtent->Get(2) <<" selected";
-	        mMessage = out.str();
+	        	mMessage = out.str();
 			mImageExtent->SetDimension(2);
 			valid=true;
 		}
@@ -254,22 +256,20 @@ namespace creaImageIO
 			}
 			else
 			{
-            mImageExtent->Add(*ie);
-			std::stringstream out;
-			out << mImageExtent->GetDimension() << "D image " << mImageExtent->Get(0) << "x"<< mImageExtent->Get(1) << "x"<< mImageExtent->Get(2) <<" selected";
-	        mMessage = out.str();
+            			mImageExtent->Add(*ie);
+				std::stringstream out;
+				out << mImageExtent->GetDimension() << "D image " << mImageExtent->Get(0) << "x"<< mImageExtent->Get(1) << "x"<< mImageExtent->Get(2) <<" selected";
+	        		mMessage = out.str();
 			}
-			
 		}
 		else
 		{
 			mMessage="The selected images are not compatible.";
 			valid=false;
 		}
-	}
+	  }
 	}
 
-	
 	modifyValidationSignal(valid);
 	SetMessage(mMessage);
 	return valid;
@@ -281,30 +281,35 @@ namespace creaImageIO
 	  mValidationSignal(ivalid);
   }
 
-
    //======================================================================
   ///Reads Images (Non Threaded)
-void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vector<std::string> im, int dimension)
+void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s, std::vector<std::string> im, int dimension)
 {
-	  
+
+/* remember!
+
+#define GIMMICK_NO_IMAGE_SELECTION 0
+#define GIMMICK_2D_IMAGE_SELECTION 2
+#define GIMMICK_3D_IMAGE_SELECTION 3
+#define GIMMICK_4D_IMAGE_SELECTION 4
+
+#define NATIVE 0
+#define _2D    2
+#define _3D    3
+
+*/
 	// Create the output data
 	if (im.size()==1) 
-	{		  
-		// Only one image : give it
-		vtkImageData* out = vtkImageData::New();
-		GimmickDebugMessage(3, "State Check: Full Filename: "
-						<<im.front()
-						<<std::endl);
-		out->ShallowCopy(mReader.GetImage(im.front()));
-		s.push_back( out );
-	}	  
-    else if (im.size()>1)
+	{
+		// O0.
+	}
+    else if (im.size()>1) // Test inutile ? JPR
 	{
 		vtkImageData* first = mReader.GetImage( im.front());
-		if (dimension == 2) 
-		{  
+		if (dimension == 2)
+		{
 		 // n3D
-		  std::vector<std::string>::iterator it;
+		    std::vector<std::string>::iterator it;
 			for (it=im.begin(); it!=im.end(); ++it) 
 			{
 				vtkImageData* out = vtkImageData::New();
@@ -314,49 +319,158 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
 		}	  
 		else 
 		{
-			// n2D to 3D
+			// n*2D to 3D
 			vtkImageData* out = vtkImageData::New();
 			out->CopyStructure(first);	
 			out->SetScalarType(first->GetScalarType());
+			out->SetNumberOfScalarComponents(first->GetNumberOfScalarComponents());
 			int ext[6];
-			first->GetExtent(ext);
-			ext[5] = im.size()-1;
+			//first->GetExtent(ext);  // JPR
+			first->GetWholeExtent(ext);  // renvoie egalement 0,0 en Z // JPR
+
+			if(ext[5] == 0)
+			{
+				ext[5] = im.size()-1;
+			}
+			else
+			{
+				ext[5] = ext[5] * im.size()-1; // to deal with multiframes - JPR
+			}
 			out->SetExtent(ext);
+
 			// LG : TODO : Z Spacing  ?
 
+			int dim[3];
+			first->GetDimensions(dim);
+
+			out->SetDimensions(dim[0], dim[1], im.size() );
 			out->AllocateScalars();
+			out->Update();
 
-			//first->Print(std::cout);
-			//	    out->Print(std::cout);
+			unsigned long imsize = dim[0] * dim[1];
+			imsize = imsize * dim[2] ;  // deal with multiframes // JPR
 
-			int dim[3];
-			first->GetDimensions(dim);
-			unsigned long imsize = dim[0] * dim[1];/*
-				( (unsigned long)first->GetScalarPointer(0,1,0)
-			- (unsigned long)first->GetScalarPointer(0,0,0))
-				*dim[1];*/
 
+//EED 03-11-2009
+			// differents formats char , short, etc...
+			// differents components 1..3  ex. jpg ->RGB 3
+			imsize = imsize * first->GetScalarSize() * first->GetNumberOfScalarComponents();
+
+
+			// Order the file name vector
+
+			double spc[3];
+			out->GetSpacing(spc);
+			spc[2]=OrderTheFileNameVector(im);	
+			out->SetSpacing(spc);
 			int slice = 0;
 			std::vector<std::string>::iterator it;
+
 			for (it=im.begin(); it!=im.end(); ++it) 
-				{
-			//std::cout << "copying slice "<<slice <<std::endl;
-					vtkImageData* cur = mReader.GetImage( (*it));
-
-			void* src = cur->GetScalarPointer(0,0,0);
-			void* dst = out->GetScalarPointer(0,0,slice);
-			//		std::cout << "src="<<src<<std::endl;
-			//		std::cout << "dst="<<dst<<std::endl;
-			//		std::cout << "siz="<<imsize<<std::endl;
-			std::cout << slice;
-			memcpy(dst,src,imsize);
-
-			slice++;
-				}	
+			{
+				vtkImageData* cur = mReader.GetImage( (*it) );
+				memcpy(out->GetScalarPointer(0,0,slice), cur->GetScalarPointer(0,0,0), imsize);
+				slice++;
+			}	
 			s.push_back(out);
-				
+
+		}  // dimension == 3
+
+	}  // size >1
+
+}
+  //======================================================================
+
+
+double GimmickView::OrderTheFileNameVector(std::vector<std::string> &im)
+{
+	double spacing=1;
+	typedef std::vector<GDCM_NAME_SPACE::File* > FileList;
+	FileList fileVector;
+	//GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New();
+	GDCM_NAME_SPACE::SerieHelper *sh = GDCM_NAME_SPACE::SerieHelper::New();
+	std::vector<std::string> lstAux;
+	std::vector<std::string>::iterator it;
+	for (it=im.begin(); it!=im.end(); ++it)
+	{
+		///\TODO liberer les GDCM_NAME_SPACE::File a la fin!  // JPR
+		GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New();
+		f->SetFileName(*it);
+		f->Load();
+		if (f->IsReadable())
+		{
+			fileVector.push_back(f);
+		} else {
+			lstAux.push_back(*it);
 		}
-	}	
+	} // for
+			
+	
+	if ((fileVector.size()>1) && (sh->IsCoherent( &fileVector )))
+	{
+			sh->OrderFileList(&fileVector);
+			spacing= sh->GetZSpacing();
+			im.clear();
+			int i;
+			for (i=0; i<fileVector.size(); i++)
+			{
+				im.push_back( (fileVector[i])->GetFileName() );
+			}
+			for (i=0; i<lstAux.size(); i++)
+			{
+				im.push_back( lstAux[i] );
+			}
+	}else {
+		std::sort( im.begin(), im.end() );
+	}
+			
+   return spacing;
+}
+
+
+//======================================================================
+
+
+void GimmickView::ReadImagesNotThreadedInVector(std::vector<vtkImageData*>& s, std::vector<std::string> im, int dimension)
+{
+	// Create the output data
+	if (im.size()==1)
+	{
+		// Only one image : give it
+		vtkImageData* out = vtkImageData::New();
+		GimmickDebugMessage(3, "State Check: Full Filename: "
+						<<im.front()
+						<<std::endl);
+		out->ShallowCopy(mReader.GetImage(im.front()));
+		s.push_back( out );
+	}
+    	else if (im.size()>1) // Test inutile ? JPR
+	{
+		vtkImageData* first = mReader.GetImage( im.front());
+		if (dimension == 2)
+		{
+		 // n3D
+		  std::vector<std::string>::iterator it;
+			for (it=im.begin(); it!=im.end(); ++it)
+			{
+				vtkImageData* out = vtkImageData::New();
+				out->ShallowCopy(mReader.GetImage(*it));
+				s.push_back(out);
+			}
+		}
+		else
+		{
+			// n2D to 3D // NO!
+			// n *2D + T in a vector :
+			
+			std::vector<std::string>::iterator it;
+			for (it=im.begin(); it!=im.end(); ++it) 
+			{
+				vtkImageData* out = mReader.GetImage( (*it));
+				s.push_back(out);
+			}
+		}
+	}
 }
   //======================================================================
 
@@ -391,10 +505,10 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
 		{
 		  //What to do in this case?
 		  /*
-		GimmickDebugMessage(5,
+			GimmickDebugMessage(5,
 					"Pushing unknown image in queue"
 					<<std::endl);
-		mImageEventQueue.push_back(ImageEventType(image));*/
+			mImageEventQueue.push_back(ImageEventType(image));*/
 			return;
 		}
 		ImageEventTypeMap::iterator i;
@@ -404,8 +518,8 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
 			if (i!=mImageEventMap.end())
 			{
 				GimmickDebugMessage(5,
-							"Putting image of file '"<<filename<<"' on pointer"
-							<<std::endl);
+						"Putting image of file '"<<filename<<"' on pointer"
+						<<std::endl);
 				ImageEventType ie(i->second);
 				ie.image = image;
 				ie.pointerHolder->Set(ie.image);
@@ -445,7 +559,6 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
 		ie.pointerHolder->Set(GetDefaultImage());
 		//mImageEventMap.erase(i);
 		}
-
 	}
   }
 
@@ -455,9 +568,7 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
   void GimmickView::ConnectValidationObserver(ValidationCallbackType callback)
   {
     mValidationSignal.connect(callback);
-  }
-	  
+  }	  
   
 } // EO namespace creaImageIO
 
-