X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmickView.cpp;h=46ab5643d04fd73baae7da439846cef77cd3dbbd;hb=6ce1377c642f91e9b173b8a5440543eb5320fcd5;hp=c8064d5f4312a8b946bef33e2182936e7456a288;hpb=415955d46ea550c344aa4d2215b8a790e348eb72;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmickView.cpp b/src2/creaImageIOGimmickView.cpp
index c8064d5..46ab564 100644
--- a/src2/creaImageIOGimmickView.cpp
+++ b/src2/creaImageIOGimmickView.cpp
@@ -141,7 +141,7 @@ namespace creaImageIO
   {
 	  if(mImageExtent!=0)
 	  {
-	//  mImageExtent=0;
+		  mImageExtent.reset();
 	  }
 	  valid=true;
   }
@@ -259,17 +259,15 @@ namespace creaImageIO
 			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,12 +279,10 @@ 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)
 {
-	  
 	// Create the output data
 	if (im.size()==1) 
 	{		  
@@ -298,13 +294,13 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
 		out->ShallowCopy(mReader.GetImage(im.front()));
 		s.push_back( out );
 	}	  
-    else if (im.size()>1)
+    	else if (im.size()>1) // Test inutile ? JPR
 	{
 		vtkImageData* first = mReader.GetImage( im.front());
 		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();
@@ -320,7 +316,14 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
 			out->SetScalarType(first->GetScalarType());
 			int ext[6];
 			first->GetExtent(ext);
-			ext[5] = im.size()-1;
+			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  ?
 
@@ -331,7 +334,10 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
 
 			int dim[3];
 			first->GetDimensions(dim);
-			unsigned long imsize = dim[0] * dim[1];/*
+			unsigned long imsize = dim[0] * dim[1];
+			imsize = imsize * dim[2] ;  // deal with multiframes// JPR
+
+			 /*
 				( (unsigned long)first->GetScalarPointer(0,1,0)
 			- (unsigned long)first->GetScalarPointer(0,0,0))
 				*dim[1];*/
@@ -339,24 +345,61 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
 			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);
+			{
+		
+			vtkImageData* cur = mReader.GetImage( (*it));
+		//	void* src = cur->GetScalarPointer(0,0,0);
+		//	void* dst = out->GetScalarPointer(0,0,slice);
+			memcpy(out->GetScalarPointer(0,0,slice),cur->GetScalarPointer(0,0,0),imsize);
 
 			slice++;
-				}	
+			}	
 			s.push_back(out);
-				
 		}
-	}	
+	}
+}
+  //======================================================================
+
+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 +434,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 +447,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 +488,6 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
 		ie.pointerHolder->Set(GetDefaultImage());
 		//mImageEventMap.erase(i);
 		}
-
 	}
   }
 
@@ -455,9 +497,7 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
   void GimmickView::ConnectValidationObserver(ValidationCallbackType callback)
   {
     mValidationSignal.connect(callback);
-  }
-	  
+  }	  
   
 } // EO namespace creaImageIO
 
-