X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkInversCrop.cxx;h=9064a09d20cce394198cdd96199bf18c550db20d;hb=edb8e9b8948e7216e06b3ef5228b16f18417ca52;hp=68b2b1c4797895febcef1449f6f40a6a74030f32;hpb=879c32e4e9dab882f99c737dc8ec1d82327a36e9;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkInversCrop.cxx b/packages/vtk/src/bbvtkInversCrop.cxx
index 68b2b1c..9064a09 100644
--- a/packages/vtk/src/bbvtkInversCrop.cxx
+++ b/packages/vtk/src/bbvtkInversCrop.cxx
@@ -26,8 +26,6 @@ void InversCrop::Process()
 //    * TYPE is the C++ type of the input/output
 //      (the one provided in the attribute 'type' of the tag 'input')
 
-printf("\n\n EED InversCrop::Process Start \n" );
-
 	if (bbGetInputActive()==true)
 	{
 	    if ( (bbGetInputImageFix()!=NULL) && (bbGetInputImageMove()!=NULL) )
@@ -52,10 +50,6 @@ printf("\n\n EED InversCrop::Process Start \n" );
 		{
 			dim[2] = ext[5]-ext[4]+1;
 		} 
-		
-printf("EED InversCrop::Process 1   %d\n", bbGetInputImageFix()->GetDataDimension()    );
-printf("EED InversCrop::Process 2   %d %d  %d \n",dim[0],dim[1],dim[2]  );
-
 		if (bbGetInputType()==0)
 		{
 			_imageoutput = vtkImageData::New();
@@ -70,7 +64,7 @@ printf("EED InversCrop::Process 2   %d %d  %d \n",dim[0],dim[1],dim[2]  );
 #if (VTK_MAJOR_VERSION >= 6) 
 			_imageoutput->AllocateScalars(bbGetInputImageFix()->GetScalarType() , 1);
 #endif
-			
+		
 			// Duplicating Fix Image
 			long sizeimage = dim[0]*dim[1]*dim[2]*bbGetInputImageFix()->GetScalarSize(); 	
 			memcpy( _imageoutput->GetScalarPointer() , bbGetInputImageFix()->GetScalarPointer() , sizeimage);
@@ -98,37 +92,54 @@ printf("EED InversCrop::Process 2   %d %d  %d \n",dim[0],dim[1],dim[2]  );
 		{
 			dimMoveZ = ext[5]-ext[4]+1;
 		} 
-
-		
-		printf("EED InversCrop::Process 3   %d %d  %d \n",dimMoveX,dimMoveY,dimMoveZ  );
-
-		
-		
+		double org[3];
+		org[0]=0;
+		org[1]=0;
+		org[2]=0;		
+		if (bbGetInputOrigin().size()==3)
+		{
+			org[0]=bbGetInputOrigin()[0];
+			org[1]=bbGetInputOrigin()[1];
+			org[2]=bbGetInputOrigin()[2];
+		}
+		if (bbGetInputOrigin().size()==2)
+		{
+			org[0]=bbGetInputOrigin()[0];
+			org[1]=bbGetInputOrigin()[1];
+		}
+		if (bbGetInputOrigin().size()==1)
+		{
+			org[0]=bbGetInputOrigin()[0];
+		}
 		int spxM		= 0;  // start px MoveImage
 		int sizeXM		= 0;  // sizeX MoveImage
-		px				= bbGetInputOrigin()[0];
+		px				= org[0];
 		spxM			= 0;
 		if (px<0)
 		{ 
 		   spxM	= px*(-1);
 		   px	= 0;
 		}
-		sizeXM = dimMoveX-spxM;
-		if (px+sizeXM>=dim[0]) sizeXM=dim[0]-px;
-		sizeXM = sizeXM * bbGetInputImageFix()->GetScalarSize();
+		sizeXM 	= dimMoveX-spxM;
+		if (px+sizeXM>=dim[0]) { sizeXM=dim[0]-px; }
+		sizeXM 	= sizeXM * bbGetInputImageFix()->GetScalarSize();
 		for (k=0; k<dimMoveZ; k++)
 		{
 		   for (j=0; j<dimMoveY; j++)
 		   {
-		        py = j+bbGetInputOrigin()[1];
-				pz = k+bbGetInputOrigin()[2];
+		        py = j+org[1];
+				if (bbGetInputImageMove()->GetDataDimension()==3) 
+				{
+					pz = k+org[2];
+				} else {
+					pz = k;
+				}// Dimension 3
 				if ( (py<dim[1]) && (pz<dim[2]) &&
 		 	         (py>=0)    && (pz>=0)	&&
 					 (sizeXM>0) ) 
 				{
 					memcpy( _imageoutput->GetScalarPointer(px,py,pz) , bbGetInputImageMove()->GetScalarPointer(spxM,j,k) , sizeXM );
 				}
-
 		   } // for j
 		} // for k
 		_imageoutput->Modified();
@@ -141,10 +152,7 @@ printf("EED InversCrop::Process 2   %d %d  %d \n",dim[0],dim[1],dim[2]  );
 			printf ("ERROR: InversCrop  need ImageFixe and ImageMove to run.\n");
 	   } 
 	 bbSetOutputOut(_imageoutput);
-
 	} // if Active
-printf("EED InversCrop::Process End \n" );
-
 }
 
 //=====