X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src2%2FcreaImageIOGimmickView.cpp;h=945b091ce3552ddc80bb3d4d3dc945926d7bd163;hb=cf9b62742f0699be21da81b01cb9656be0f78c4f;hp=0a2b8e1800b944ea7685a10072d02e9bba22aae9;hpb=76e207a0161dd493be1b96d93d54d35cf3e88422;p=creaImageIO.git

diff --git a/src2/creaImageIOGimmickView.cpp b/src2/creaImageIOGimmickView.cpp
index 0a2b8e1..945b091 100644
--- a/src2/creaImageIOGimmickView.cpp
+++ b/src2/creaImageIOGimmickView.cpp
@@ -8,6 +8,54 @@ namespace fs = boost::filesystem;
 namespace creaImageIO
 {
 
+	///Class used to represent the actual state of the image selected and to perform comparisons on its values
+  class ImageExtent
+  {
+  public:
+    ImageExtent(const std::string& x, const std::string& y, const std::string& z, const std::string& t)
+	{
+		 sscanf(x.c_str(),"%d",&mExtent[0]);
+		 sscanf(y.c_str(),"%d",&mExtent[1]);
+		 sscanf(z.c_str(),"%d",&mExtent[2]);
+		 sscanf(t.c_str(),"%d",&mExtent[3]);
+		 if(x==""){mExtent[0]=1;}
+	     if(y==""){mExtent[1]=1;}
+	     if(z==""){mExtent[2]=1;}
+		 if(t==""){mExtent[3]=1;}
+
+		 if (mExtent[3]>1) mDim=4;
+		 else if (mExtent[2]>1) mDim=3;
+	     else if (mExtent[1]>1) mDim=2;
+	     else if (mExtent[0]>1) mDim=1;
+		 else mDim=0;
+	}
+	
+
+	///Clears the extent
+    void Clear() { mExtent[0] = mExtent[1] = mExtent[2] = mExtent[3] = 1; }
+
+	///Returns true if the two extents are compatible
+    bool IsCompatible( const ImageExtent& );
+
+	///Adds the extent passed as a parameter to the current extent
+    void Add ( const ImageExtent& );
+		
+	///Returns the ieth position of the extent
+    int Get(int i) { return mExtent[i]; }
+    
+	///Returns the dimension of the current image
+    void SetDimension(int dim) { mDim=dim; }
+
+	///Returns the dimension of the current image
+    int GetDimension() { return mDim; }
+
+  private:
+    int mExtent[4];
+    int mDim;
+  };
+
+  //======================================================================
+
   //======================================================================
   // CTor
   GimmickView::GimmickView(Gimmick* gimmick, int threads)
@@ -19,7 +67,7 @@ namespace creaImageIO
 	// Anciently started the threads ...
     // Threads now automatically start at first image request
     //mReader.Start();
-
+	
   }
   //======================================================================
 
@@ -38,10 +86,8 @@ namespace creaImageIO
   /// 
   void GimmickView::Initialize()
   {
-	  row="";
-	  col="";
-	  plane="";
-	  selectionSize=0;
+	mImageExtent=0;
+	mReaderStarted=false;
   }
   //======================================================================
   
@@ -66,6 +112,15 @@ namespace creaImageIO
 	this->CreateTreeView(i->second);
       }
   }
+
+  /// Create a tree view with a given name
+  void GimmickView::CreateSingleTreeView(std::string &i_name)
+  {
+		this->CreateTreeView(mGimmick->GetTreeHandlerMap()[i_name]);
+     
+  }
+
+
   //======================================================================
 
   //======================================================================
@@ -84,129 +139,141 @@ namespace creaImageIO
   }
   //======================================================================
   /// Clears the status and begins a new selection process
-  void GimmickView::ClearStatus()
+  void GimmickView::ResetExtent()
   {
-	  row="";
-	  col="";
-	  plane="";
-	  selectionSize=0;
+	  if(mImageExtent!=0)
+	  {
+	  mImageExtent=0;
+	  }
 	  valid=true;
   }
+
+
+  //======================================================================
+  
+  //======================================================================
+  bool ImageExtent::IsCompatible(const ImageExtent& ie)
+  {
+	  bool compatible=true;
+	  ImageExtent * extent= (ImageExtent*)&ie;
+	  if((*extent).Get(0)!=Get(0)
+		 || (*extent).Get(1)!=Get(1))
+	  {
+		  compatible=false;
+	  }
+	  return compatible;
+  }
+
+  //======================================================================
+  
+  //======================================================================
+  void ImageExtent::Add(const ImageExtent& ie)
+  {
+	  ImageExtent * extent= (ImageExtent*)&ie;
+	  mExtent[2]+=(*extent).Get(2);
+	  if(mExtent[2]>1)
+	  {
+	  SetDimension(3);
+	  }
+  }
+
   //======================================================================
   ///Validates the dimension compliance of the images with the maximum and 
   ///minimum given, and between their sizes
   bool GimmickView::ValidateSelected (tree::Node* sel, int min_dim, int max_dim)
   {
-	GimmickMessage(2,"Validating selected"<<std::endl);
-	selectionSize++;
-	  /*// EED validate all
-	  mValidationSignal(valid);
-	  return valid;*/
-	  
-	int level;
+	GimmickDebugMessage(2,"Validating selected"<<std::endl);
 	std::string mMessage;
 	
-	if(row.compare("")==0 || col.compare("")==0)
+	if(sel==0)
 	{
-		row=(*sel).GetAttribute("D0028_0010");
-		col=(*sel).GetAttribute("D0028_0011");
-		plane=(*sel).GetAttribute("D0028_0012");
-		level=(*sel).GetLevel();
+		mMessage="Cannot have 0 images selected!";
+		valid=false;
 	}
 	else
 	{
-		if(((*sel).GetAttribute("D0028_0010"))!=row ||
-			((*sel).GetAttribute("D0028_0011"))!=col ||
-			((*sel).GetAttribute("D0028_0012"))!=plane)
+	ImageExtent* ie=new ImageExtent((*sel).GetAttribute("D0028_0010"),
+			                         (*sel).GetAttribute("D0028_0011"),
+									 (*sel).GetAttribute("D0028_0012"), 
+									 "");
+	if(mImageExtent==0)
+	{
+		mImageExtent=ie;
+		if((mImageExtent->Get(min_dim-1)<2)||(mImageExtent->Get(max_dim)>1))
+		{
+			valid=false;
+		}
+		else
+		{
+			std::stringstream out;
+			out << mImageExtent->GetDimension() << "D image " << mImageExtent->Get(0) << "x"<< mImageExtent->Get(1) << "x"<< mImageExtent->Get(2) <<" selected";
+	        mMessage = out.str();
+			mImageExtent->SetDimension(2);
+			valid=true;
+		}
+	}
+	else
+	{
+		if(mImageExtent->IsCompatible(*ie))
+		{
+			if(mImageExtent->GetDimension()==max_dim && mImageExtent->Get(max_dim)>2)
+			{
+				std::stringstream out;
+				out<<"Cannot add this image to selection : would result in a "<<mImageExtent->GetDimension()+1<<"D image!";
+				mMessage=out.str();
+				valid=false;
+			}
+			else if(max_dim<3)
 			{
-				mMessage="The selected images are not compatible.";
+				std::stringstream out;
+				out<<"Selecting "<<mImageExtent->GetDimension()<<"D images is not allowed !";
+				mMessage=out.str();
 				valid=false;
 			}
+			else if(min_dim==3 && (ie->Get(2)+mImageExtent->Get(2))<2)
+			{
+				std::stringstream out;
+				out << "Cannot build the selection as it would result in a ";
+				out << mImageExtent->GetDimension();
+				out << "D image, and the minimum is ";
+				out << min_dim;
+				out << "D!";
+				mMessage=out.str();
+				valid=false;
+			}
+			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();
+			}
+			
+		}
+		else
+		{
+			mMessage="The selected images are not compatible.";
+			valid=false;
+		}
+	}
 	}
-		
 
-		//Dimention validation
-		//Compatibility with maximum and minimum
-			if(valid)
-			{	
-				
-				int rows;
-				int cols;
-				int planes;
-				std::string s;
-				std::istringstream t(s);
-				s=row;
-				t >> rows;
-				if(row==""){rows=1;}
-				s=col;
-				t >> cols;
-				if(col==""){cols=1;}
-				s=plane;
-				t >> planes;
-				if(plane==""){planes=1;}
-
-				int dim = 0;
-				if (planes>1) dim=3;
-				else if (cols>1) dim=2;
-				else if (rows>1) dim=1;
-			    
-				if (dim == 0) 
-				{
-					mMessage="Unknown image dimension : cannot select !";
-					valid= false;
-				}
-				else if (dim>max_dim)
-				{
-					mMessage="Selecting ";
-					mMessage+=dim;
-					mMessage+="D images is not allowed !";
-					valid= false;
-				}
-				if ( dim == max_dim )
-				{
-					mMessage="Cannot add this image to selection : would result in a ";
-					mMessage+=(dim+1);
-					mMessage+="D image!";
-					
-					valid= false;
-				}
-				if ( dim < min_dim )
-				{
-					GimmickMessage(1, "State Check: Dim: "
-						<<dim
-						<<" Dim min:"
-						<<min_dim
-						<<std::endl);
-					mMessage="Cannot build the selection as it would result in a ";
-					std::string a;
-					std::stringstream out;
-					out<<dim;
-					a=out.str();
-					mMessage+=a;
-					mMessage+="D image, and the minimum is ";
-					out<<min_dim;
-					a=out.str();
-					mMessage+=a;
-					mMessage+="D!";
-					valid= false;
-				}
-			}
 	
-	
-	if(valid)
-	{
-		mMessage="Selection OK !";
-	}
-	mValidationSignal(valid);
+	modifyValidationSignal(valid);
 	SetMessage(mMessage);
 	return valid;
   }
 
-   //======================================================================
+  //======================================================================
+  void GimmickView::modifyValidationSignal(bool ivalid)
+  {
+	  mValidationSignal(ivalid);
+  }
+
 
    //======================================================================
   ///Reads Images (Non Threaded)
-  void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vector<tree::Node*> im, int dimension)
+  void GimmickView::ReadImagesNotThreaded(std::vector<vtkImageData*>& s,std::vector<std::string> im, int dimension)
   {
 	  
 	// Create the output data
@@ -215,16 +282,16 @@ namespace creaImageIO
 		  
 		// Only one image : give it
 		vtkImageData* out = vtkImageData::New();
-		GimmickMessage(1, "State Check: Full Filename: "
-						<<im.front()->GetAttribute("FullFileName")
+		GimmickDebugMessage(3, "State Check: Full Filename: "
+						<<im.front()
 						<<std::endl);
-		out->ShallowCopy(mReader.GetImage(im.front()->GetAttribute("FullFileName")));
+		out->ShallowCopy(mReader.GetImage(im.front()));
 		s.push_back( out );
       }
 	  
     else if (im.size()>1)
       {
-	vtkImageData* first = mReader.GetImage( im.front()->GetAttribute("FullFileName"));
+	vtkImageData* first = mReader.GetImage( im.front());
 	if (dimension==2) 
 	  {   	
 	    // n2D to 3D
@@ -250,11 +317,11 @@ namespace creaImageIO
 	      *dim[1];
 
 	    int slice = 0;
-		std::vector<tree::Node*>::iterator it;
-	    for (it=im.begin(); it!=im.end(); ++it) 
+		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)->GetAttribute("FullFileName"));
+			  vtkImageData* cur = mReader.GetImage( (*it));
 		
 		void* src = cur->GetScalarPointer(0,0,0);
 		void* dst = out->GetScalarPointer(0,0,slice);
@@ -270,11 +337,11 @@ namespace creaImageIO
 	else 
 	  {
 	    // n3D
-		  std::vector<tree::Node*>::iterator it;
+		  std::vector<std::string>::iterator it;
 	    for (it=im.begin(); it!=im.end(); ++it) 
 	      {
 		vtkImageData* out = vtkImageData::New();
-		out->ShallowCopy(mReader.GetImage((*it)->GetAttribute("FullFileName")));
+		out->ShallowCopy(mReader.GetImage(*it));
 		s.push_back(out);
 	      }
 	  }
@@ -288,7 +355,11 @@ namespace creaImageIO
   void GimmickView::RequestReading(tree::Node* n, 
 				   int prio, int selection_index, ImagePointerHolder *p)
   {
-	mReader.Start();
+	  if(!mReaderStarted)
+	  {
+		mReader.Start();
+		mReaderStarted=true;
+	  }
     ImageEventType t(n,selection_index, p);
     mImageEventMap[n->GetAttribute("FullFileName")] = t;    
     mReader.Request(this,n->GetAttribute("FullFileName"),prio);