X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src2%2FcreaImageIOGimmickView.cpp;h=c2ece7433afe15826af0a878010a2f7b059c1135;hb=37692ca5ea7fb8414cb70bcae0ce16e51da57568;hp=e8fdb5595eb5da4c9bc245842dba254b34a0dd89;hpb=a67d921cdc10d438852b48c2985f14d91320e016;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmickView.cpp b/src2/creaImageIOGimmickView.cpp
index e8fdb55..c2ece74 100644
--- a/src2/creaImageIOGimmickView.cpp
+++ b/src2/creaImageIOGimmickView.cpp
@@ -28,7 +28,6 @@ namespace creaImageIO
 	     else if (mExtent[0]>1) mDim=1;
 		 else mDim=0;
 	}
-	
 
 	///Clears the extent
     void Clear() { mExtent[0] = mExtent[1] = mExtent[2] = mExtent[3] = 1; }
@@ -57,7 +56,7 @@ namespace creaImageIO
 
   //======================================================================
   // CTor
-  GimmickView::GimmickView(Gimmick* gimmick, int threads)
+  GimmickView::GimmickView(boost::shared_ptr<Gimmick> gimmick, int threads)
     : mGimmick(gimmick),
 	  mReader(threads)
   {
@@ -66,7 +65,6 @@ namespace creaImageIO
 	// Anciently started the threads ...
     // Threads now automatically start at first image request
     //mReader.Start();
-	
   }
   //======================================================================
 
@@ -85,11 +83,10 @@ namespace creaImageIO
   /// 
   void GimmickView::Initialize()
   {
-	mImageExtent=0;
 	mReaderStarted=false;
   }
   //======================================================================
-  
+
   //======================================================================
   /// Finalize 
   void GimmickView::Finalize()
@@ -115,11 +112,10 @@ 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]);
      
   }
 
-
   //======================================================================
 
   //======================================================================
@@ -134,22 +130,22 @@ 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()
   {
 	  if(mImageExtent!=0)
 	  {
-	  mImageExtent=0;
+		  mImageExtent.reset();
 	  }
 	  valid=true;
   }
 
-
   //======================================================================
-  
+
   //======================================================================
   bool ImageExtent::IsCompatible(const ImageExtent& ie)
   {
@@ -164,7 +160,7 @@ namespace creaImageIO
   }
 
   //======================================================================
-  
+
   //======================================================================
   void ImageExtent::Add(const ImageExtent& ie)
   {
@@ -176,6 +172,19 @@ namespace creaImageIO
 	  }
   }
 
+  //======================================================================
+  /// No selected image
+  bool GimmickView::NoValidateSelected ()
+  {
+	GimmickDebugMessage(2,"Validating selected"<<std::endl);
+	std::string mMessage;
+	mMessage="Cannot have 0 images selected!";
+	valid=false;
+	modifyValidationSignal(valid);
+	SetMessage(mMessage);
+	return valid;
+  }
+
   //======================================================================
   ///Validates the dimension compliance of the images with the maximum and 
   ///minimum given, and between their sizes
@@ -191,10 +200,10 @@ namespace creaImageIO
 	}
 	else
 	{
-	ImageExtent* ie=new ImageExtent((*sel).GetAttribute("D0028_0010"),
-			                         (*sel).GetAttribute("D0028_0011"),
-									 (*sel).GetAttribute("D0028_0012"), 
-									 "");
+		boost::shared_ptr<ImageExtent> ie=boost::shared_ptr<ImageExtent>(new ImageExtent((*sel).GetAttribute("D0028_0010"),
+			                         			(*sel).GetAttribute("D0028_0011"),
+									(*sel).GetAttribute("D0028_0012"), 
+									""));
 	if(mImageExtent==0)
 	{
 		mImageExtent=ie;
@@ -206,7 +215,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;
 		}
@@ -242,22 +251,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;
@@ -269,30 +276,43 @@ 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);
+					<<im.front()
+					<<std::endl);
 		out->ShallowCopy(mReader.GetImage(im.front()));
 		s.push_back( out );
-	}	  
-    else if (im.size()>1)
+	}
+    	else if (im.size()>1) // Test inutile ? JPR
 	{
+		// Read the FIRST image to get info ... about all the other ones. ?!? // 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();
@@ -300,51 +320,107 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
 				s.push_back(out);
 			}
 		}	  
-		else 
+		else if (dimension == 3)
 		{
-			// n2D to 3D
+			// n*2D to 3D  :: --> NON ! Ca va tres bien pour du 2D+T (le ZSpacing, on s'en tape)
+			//			// ne convient pas pour du n*2D a  lire comme un 3D
+			//			// Il faut un gdcmSerieHelper !
 			vtkImageData* out = vtkImageData::New();
 			out->CopyStructure(first);	
 			out->SetScalarType(first->GetScalarType());
 			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
+						     // Normal :
+
+std::cout <<"in GimmickView::ReadImagesNotThreaded GetWholeExtent ext =";
+for (int jjj=0;jjj<6;jjj++)
+	std:cout << "   [" << jjj << "]=" << ext[jjj];
+std::cout << std::endl;
+
+			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  ?
 
-			out->AllocateScalars();
+			// LG : TODO : Z Spacing  ?  // Voir + loin // JPR
 
-			//first->Print(std::cout);
-			//	    out->Print(std::cout);
+			out->AllocateScalars();
 
 			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];*/
+			unsigned long imsize = dim[0] * dim[1];
+			imsize = imsize * dim[2] ;  // deal with multiframes // JPR
+//EED 03-11-2009
+			imsize = imsize * first->GetScalarSize();
 
 			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));
+			//	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)
+			{
+			std::cout << "----------------------------------------n3D" << std::endl;
+				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::cout << "---------------------------------------- n *2D + T" << std::endl;			
+			std::vector<std::string>::iterator it;
+			for (it=im.begin(); it!=im.end(); ++it) 
+			{
+			std::cout << "---------------------------------------- [" << *it << "]" << std::endl;
+				//vtkImageData* out = mReader.GetImage( (*it));
+				//s.push_back(out);
+				vtkImageData* out = vtkImageData::New();
+				out->ShallowCopy(mReader.GetImage(*it));
+				s.push_back(out);
+			}
+		}
+	}
 }
   //======================================================================
 
@@ -353,15 +429,15 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
   void GimmickView::RequestReading(tree::Node* n, 
 	  int prio, int selection_index, boost::shared_ptr<ImagePointerHolder> p)
   {
-	  if(!mReaderStarted)
-	  {
-		mReader.Start();
-		mReaderStarted=true;
-	  }
-    ImageEventType t(n,selection_index);
-	t.pointerHolder = p;
-    mImageEventMap[n->GetAttribute("FullFileName")] = t;    
-    mReader.Request(this,n->GetAttribute("FullFileName"),prio);
+     if(!mReaderStarted)
+     {
+        mReader.Start();
+        mReaderStarted=true;
+      }
+      ImageEventType t(n,selection_index);
+      t.pointerHolder = p;
+      mImageEventMap[n->GetAttribute("FullFileName")] = t;
+      mReader.Request(this,n->GetAttribute("FullFileName"),prio);
   }
   //======================================================================
 
@@ -379,10 +455,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;
@@ -392,8 +468,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);
@@ -433,7 +509,6 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
 		ie.pointerHolder->Set(GetDefaultImage());
 		//mImageEventMap.erase(i);
 		}
-
 	}
   }
 
@@ -443,9 +518,7 @@ void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vecto
   void GimmickView::ConnectValidationObserver(ValidationCallbackType callback)
   {
     mValidationSignal.connect(callback);
-  }
-	  
+  }	  
   
 } // EO namespace creaImageIO
 
-