X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkInversCrop.cxx;h=03673e6f1b476d88636824cfb70c7591c8a7e17f;hb=fc44a74636803d2efca46c6e66562a839e9d52f1;hp=8581943820eb2e983ad2861975efcda79f2223cb;hpb=d19c5512748aa8e2dd5c3d01d9ec680ded1f17ce;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkInversCrop.cxx b/packages/vtk/src/bbvtkInversCrop.cxx
index 8581943..03673e6 100644
--- a/packages/vtk/src/bbvtkInversCrop.cxx
+++ b/packages/vtk/src/bbvtkInversCrop.cxx
@@ -26,13 +26,17 @@ void InversCrop::Process()
 //    * TYPE is the C++ type of the input/output
 //      (the one provided in the attribute 'type' of the tag 'input')
 
-    if ((bbGetInputImageFix()!=NULL) && (bbGetInputImageMove()!=NULL) )
-    {
-     if ( bbGetInputImageFix()->GetScalarType()==bbGetInputImageMove()->GetScalarType() ) 
-     {
-        // Creating Image
-	int dim[3];
-	int ext[6];
+printf("\n\n EED InversCrop::Process Start \n" );
+
+	if (bbGetInputActive()==true)
+	{
+	    if ( (bbGetInputImageFix()!=NULL) && (bbGetInputImageMove()!=NULL) )
+	    {
+	     if ( bbGetInputImageFix()->GetScalarType()==bbGetInputImageMove()->GetScalarType() ) 
+	     {
+		// Creating Image
+		int dim[3];
+		int ext[6];
 	
 //EED 2017-01-01 Migration VTK7
 #if (VTK_MAJOR_VERSION <= 5) 
@@ -41,91 +45,116 @@ void InversCrop::Process()
 #if (VTK_MAJOR_VERSION >= 6) 
 	bbGetInputImageFix()->GetExtent(ext);
 #endif
-	dim[0]= ext[1]-ext[0]+1;
-	dim[1]= ext[3]-ext[2]+1;
-	dim[2]= ext[5]-ext[4]+1;
+		dim[0]= ext[1]-ext[0]+1;
+		dim[1]= ext[3]-ext[2]+1;
+		dim[2] = 1;
+		if (bbGetInputImageFix()->GetDataDimension()==3) 
+		{
+			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();
-		_imageoutput->Initialize();
-		_imageoutput->SetSpacing( bbGetInputImageFix()->GetSpacing() );
-		_imageoutput->SetDimensions(  dim[0], dim[1], dim[2] );
+		if (bbGetInputType()==0)
+		{
+			_imageoutput = vtkImageData::New();
+			_imageoutput->Initialize();
+			_imageoutput->SetSpacing( bbGetInputImageFix()->GetSpacing() );
+			_imageoutput->SetDimensions(  dim[0], dim[1], dim[2] );			
 //EED 2017-01-01 Migration VTK7
 #if (VTK_MAJOR_VERSION <= 5) 
-		_imageoutput->SetScalarType( bbGetInputImageFix()->GetScalarType() );
-		_imageoutput->AllocateScalars();
+			_imageoutput->SetScalarType( bbGetInputImageFix()->GetScalarType() );
+			_imageoutput->AllocateScalars();
 #endif
 #if (VTK_MAJOR_VERSION >= 6) 
-		_imageoutput->AllocateScalars(bbGetInputImageFix()->GetScalarType() , 1);
+			_imageoutput->AllocateScalars(bbGetInputImageFix()->GetScalarType() , 1);
 #endif
-	}
-	if (bbGetInputType()==1)
-	{
-		_imageoutput=bbGetInputImageFix();
-	}
-
-
-        // Duplicating Fix Image
-	long sizeimage = dim[0]*dim[1]*dim[2]*bbGetInputImageFix()->GetScalarSize(); 	
-	memcpy( _imageoutput->GetScalarPointer() , bbGetInputImageFix()->GetScalarPointer() , sizeimage);
+			
+			// Duplicating Fix Image
+			long sizeimage = dim[0]*dim[1]*dim[2]*bbGetInputImageFix()->GetScalarSize(); 	
+			memcpy( _imageoutput->GetScalarPointer() , bbGetInputImageFix()->GetScalarPointer() , sizeimage);
+		}
+		if (bbGetInputType()==1)
+		{
+			_imageoutput=bbGetInputImageFix();
+		}
 
-	// Copy the Move Image
-	int j,k; 
-	int px,py,pz;
+		// Copy the Move Image
+		int j,k; 
+		int px,py,pz;
 
 //EED 2017-01-01 Migration VTK7
 #if (VTK_MAJOR_VERSION <= 5) 
-	bbGetInputImageMove()->GetWholeExtent(ext);
+		bbGetInputImageMove()->GetWholeExtent(ext);
 #endif
 #if (VTK_MAJOR_VERSION >= 6) 
-	bbGetInputImageMove()->GetExtent(ext);
+		bbGetInputImageMove()->GetExtent(ext);
 #endif
+		int dimMoveX 	= ext[1]-ext[0]+1;
+		int dimMoveY 	= ext[3]-ext[2]+1;
+		int dimMoveZ	= 1;
+		if (bbGetInputImageMove()->GetDataDimension()==3) 
+		{
+			dimMoveZ = ext[5]-ext[4]+1;
+		} 
 
-	int dimMoveX = ext[1]-ext[0]+1;
-	int dimMoveY = ext[3]-ext[2]+1;
-	int dimMoveZ = ext[5]-ext[4]+1;
-
-        int spxM=0;  // start px MoveImage
-        int sizeXM=0;  // sizeX MoveImage
-
-	px=bbGetInputOrigin()[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();
-	for (k=0; k<dimMoveZ; k++)
-	{
-	   for (j=0; j<dimMoveY; j++)
-	   {
-                py=j+bbGetInputOrigin()[1];
-		pz=k+bbGetInputOrigin()[2];
 		
-		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 );
+printf("EED InversCrop::Process 3   %d %d  %d \n",dimMoveX,dimMoveY,dimMoveZ  );
+
+		
+		
+		int spxM		= 0;  // start px MoveImage
+		int sizeXM		= 0;  // sizeX MoveImage
+printf("EED InversCrop::Process 3.1   sizeOrigin %d \n", bbGetInputOrigin().size() );
+printf("EED InversCrop::Process 3.1   Origin %d  %d %d\n", bbGetInputOrigin()[0],bbGetInputOrigin()[1],bbGetInputOrigin()[2] );
+
+		px				= bbGetInputOrigin()[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();
+		for (k=0; k<dimMoveZ; k++)
+		{
+		   for (j=0; j<dimMoveY; j++)
+		   {
+		        py = j+bbGetInputOrigin()[1];
+				if (bbGetInputImageMove()->GetDataDimension()==3) 
+				{
+					pz = k+bbGetInputOrigin()[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
+printf("EED InversCrop::Process 4   %d %d  %d \n",px,py,pz  );
+
+		_imageoutput->Modified();
+	} else { // If Image Fixe Move the same GetScalarType
+		   printf ("ERROR: InversCrop  both ImageFixe and ImageMove need the same format.\n");
+		   printf ("       type ImageFix:%d   type ImageMove:%d\n", bbGetInputImageFix()->GetScalarType(), bbGetInputImageMove()->GetScalarType() );
+
+	      }  
+	    } else { // If Image Fixe Move != NULL
+			printf ("ERROR: InversCrop  need ImageFixe and ImageMove to run.\n");
+	   } 
+	 bbSetOutputOut(_imageoutput);
+
+	} // if Active
+printf("EED InversCrop::Process End \n" );
 
-	   } // for j
-	} // for k
-        _imageoutput->Modified();
-      } // If Image Fixe Move the same GetScalarType
-        else {
-           printf ("ERROR: InversCrop  both ImageFixe and ImageMove need the same format.\n");
-      }  
-    } // If Image Fixe Move != NULL
-     else {
-        printf ("ERROR: InversCrop  need ImageFixe and ImageMove to run.\n");
-    } 
-    bbSetOutputOut(_imageoutput);
 }
 
 //===== 
@@ -133,19 +162,17 @@ void InversCrop::Process()
 //===== 
 void InversCrop::bbUserSetDefaultValues()
 {
-
 //  SET HERE THE DEFAULT INPUT/OUTPUT VALUES OF YOUR BOX 
 //    Here we initialize the input 'In' to 0
+   bbSetInputActive(true);
    bbSetInputType(0);
    bbSetInputImageFix(NULL);
    bbSetInputImageMove(NULL);
-
    std::vector<int> origin;
    origin.push_back(0);
    origin.push_back(0);
    origin.push_back(0);
    bbSetInputOrigin(origin);
-   
    _imageoutput=NULL;
 }
 //=====