X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkFlip.cxx;h=d37aa6fb2c8a9e759174bc23d8e19c56c10af017;hb=2b1ebe5f1c885888b35d860a8c083e5abdc53678;hp=4a9bcd201f0f333457fccaecb3e86f2e547664d6;hpb=6d51daa37bb1a74e8a42053a4c47c3e3ef074406;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkFlip.cxx b/packages/vtk/src/bbvtkFlip.cxx
index 4a9bcd2..d37aa6f 100644
--- a/packages/vtk/src/bbvtkFlip.cxx
+++ b/packages/vtk/src/bbvtkFlip.cxx
@@ -1,33 +1,38 @@
-/*=========================================================================                                                                               
+/*
+ # ---------------------------------------------------------------------
+ #
+ # Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+ #                        pour la SantÈ)
+ # Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+ # Previous Authors : Laurent Guigues, Jean-Pierre Roux
+ # CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+ #
+ #  This software is governed by the CeCILL-B license under French law and
+ #  abiding by the rules of distribution of free software. You can  use,
+ #  modify and/ or redistribute the software under the terms of the CeCILL-B
+ #  license as circulated by CEA, CNRS and INRIA at the following URL
+ #  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+ #  or in the file LICENSE.txt.
+ #
+ #  As a counterpart to the access to the source code and  rights to copy,
+ #  modify and redistribute granted by the license, users are provided only
+ #  with a limited warranty  and the software's author,  the holder of the
+ #  economic rights,  and the successive licensors  have only  limited
+ #  liability.
+ #
+ #  The fact that you are presently reading this means that you have had
+ #  knowledge of the CeCILL-B license and that you accept its terms.
+ # ------------------------------------------------------------------------ */
+
+
+/*=========================================================================
   Program:   bbtk
   Module:    $RCSfile: bbvtkFlip.cxx,v $
   Language:  C++
-  Date:      $Date: 2012/08/06 11:49:20 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2012/11/16 08:51:58 $
+  Version:   $Revision: 1.5 $
 =========================================================================*/
 
-/* ---------------------------------------------------------------------
-
-* Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale)
-* Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux
-*
-*  This software is governed by the CeCILL-B license under French law and 
-*  abiding by the rules of distribution of free software. You can  use, 
-*  modify and/ or redistribute the software under the terms of the CeCILL-B 
-*  license as circulated by CEA, CNRS and INRIA at the following URL 
-*  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html 
-*  or in the file LICENSE.txt.
-*
-*  As a counterpart to the access to the source code and  rights to copy,
-*  modify and redistribute granted by the license, users are provided only
-*  with a limited warranty  and the software's author,  the holder of the
-*  economic rights,  and the successive licensors  have only  limited
-*  liability. 
-*
-*  The fact that you are presently reading this means that you have had
-*  knowledge of the CeCILL-B license and that you accept its terms.
-* ------------------------------------------------------------------------ */                                                                         
-
 /**
  *  \file 
  *  \brief 
@@ -49,6 +54,7 @@ namespace bbvtk
       //std::cout << "-------- entree ds Flip::bbUserSetDefaultValues()\n" << std::endl;
       
       bbSetInputIn(NULL); 
+      bbSetInputAxis("Y"); 
       mImageOut = NULL;
       bbSetOutputOut(NULL);
    }
@@ -115,19 +121,55 @@ void Flip::Process()
 		char *lineOut;
 		char *debPlanIn;
 		char *debPlanOut;
-		int j,k;
-		for(k=0; k<inputdims[2]; k++)  // iterate on planes
+		int i,j,k;
+		
+		if ( (bbGetInputAxis()=="X") || (bbGetInputAxis()=="x") )
 		{  
-			debPlanIn	= pixelsIn+k*planeSize;
-			debPlanOut	= pixelsOut+k*planeSize;
-			for(j=0; j<inputdims[1]; j++)  // iterates on rows
-			{ 
-				lineIn = debPlanIn+j*lineSize;
-				lineOut = debPlanOut+(inputdims[1]-1-j)*lineSize;
-				memcpy(lineOut,  lineIn, lineSize);
-			}	// for j
-		} // for k
-	
+
+  		   	for(k=0; k<inputdims[2]; k++)  // iterate  planes
+			{  
+				for(j=0; j<inputdims[1]; j++)  // iterates  rows
+				{ 
+					for(i=0; i<inputdims[0]; i++)  // iterates  columns
+					{ 
+						pixelsIn = (char *)bbGetInputIn()->GetScalarPointer(i,j,k);
+						pixelsOut = (char *)mImageOut->GetScalarPointer(inputdims[0]-1-i,j,k);
+						memcpy(pixelsOut,  pixelsIn, scalarSize );
+					}	// for i
+				}	// for j
+			} // for k
+
+		} else if ( (bbGetInputAxis()=="Z") || (bbGetInputAxis()=="z") )  {  
+
+  		   	for(k=0; k<inputdims[2]; k++)  // iterate  planes
+			{  
+				for(j=0; j<inputdims[1]; j++)  // iterates  rows
+				{ 
+					for(i=0; i<inputdims[0]; i++)  // iterates  columns
+					{ 
+						pixelsIn = (char *)bbGetInputIn()->GetScalarPointer(i,j,k);
+						pixelsOut = (char *)mImageOut->GetScalarPointer(i,j,inputdims[2]-1-k);
+						memcpy(pixelsOut,  pixelsIn, scalarSize );
+					}	// for i
+				}	// for j
+			} // for k
+
+		} else {  
+
+  		   	for(k=0; k<inputdims[2]; k++)  // iterate  planes
+			{  
+				debPlanIn	= pixelsIn+k*planeSize;
+				debPlanOut	= pixelsOut+k*planeSize;
+				for(j=0; j<inputdims[1]; j++)  // iterates  rows
+				{ 
+					lineIn = debPlanIn+j*lineSize;
+					lineOut = debPlanOut+(inputdims[1]-1-j)*lineSize;
+					memcpy(lineOut,  lineIn, lineSize);
+				}	// for j
+			} // for k
+
+		} //if
+		mImageOut->Modified();
 		bbSetOutputOut( mImageOut  );   	
 	} // bbGetInputIn