X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkTransform.cxx;h=84aaddf2965822ea90115145dbafeb9f406968cf;hb=03cc68dd6b831aa98e1e0fad20a977ffa074be39;hp=db2618fffbae14ee08e1b51fe4d2dc0297d37b07;hpb=baba8ec4d60d8609b87b7506704611d78449d455;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkTransform.cxx b/packages/vtk/src/bbvtkTransform.cxx
index db2618f..84aaddf 100644
--- a/packages/vtk/src/bbvtkTransform.cxx
+++ b/packages/vtk/src/bbvtkTransform.cxx
@@ -1,3 +1,30 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
+
+
 #include "bbvtkTransform.h"
 #include "bbvtkPackage.h"
 namespace bbvtk
@@ -40,6 +67,7 @@ namespace bbvtk
 	{
 		bbUserFinalizeProcessing();
 		result = vtkTransform::New();
+		result->Update();
 	}
 
 	// --------------------------------------------------------------	
@@ -55,37 +83,33 @@ namespace bbvtk
   	// --------------------------------------------------------------	
   void Transform::Process()
   {
-	  printf("EED %p Transform::Process() 1\n", this);
 	  bbUserInitializeProcessing();
 	  if (bbGetInputIn()!=NULL)
       {
 		  result->Concatenate( bbGetInputIn()->GetMatrix() );
-		  printf("EED %p Transform::Process() 2\n", this);
       }
 
-	  if (bbGetInputScale().size()>=3)
-      {
-		  result->Scale(bbGetInputScale()[0], bbGetInputScale()[1], bbGetInputScale()[2]);
-		  printf("EED %p Transform::Process() 3\n", this);
-      }
  
 	  if ((bbGetInputTranslate().size()>=3) && (bbGetInputSpacing().size()>=3))
       {
 		  double tx = bbGetInputTranslate()[0] * bbGetInputSpacing()[0];
 		  double ty = bbGetInputTranslate()[1] * bbGetInputSpacing()[1];
 		  double tz = bbGetInputTranslate()[2] * bbGetInputSpacing()[2];
+printf("Transform::Process() %f %f %f\n",tx, ty,tz);
 		  result->Translate(tx,ty,tz);
-		  printf("EED %p Transform::Process() 4\n", this);
+      }
+
+	  if (bbGetInputScale().size()>=3)
+      {
+		  result->Scale(bbGetInputScale()[0], bbGetInputScale()[1], bbGetInputScale()[2]);
       }
 
 	  if (bbGetInputRotateWXYZ().size()>=4)
       {
 		  result->RotateWXYZ(bbGetInputRotateWXYZ()[0],bbGetInputRotateWXYZ()[1], bbGetInputRotateWXYZ()[2], bbGetInputRotateWXYZ()[3]);
-		  printf("EED %p Transform::Process() 5\n", this);
       }
 
-	  result->Update();
-	  printf("EED %p Transform::Process() 6\n", this);
+	 
  
 	  bbSetOutputOut(result);
   }