X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=PackRecalage%2Fsrc%2FbbPackRecalageImageRecalageProperties.cxx;h=6f763ab80ee6dc8e8dc725f7137e13d584f79a87;hb=5de2560696c73fae856eba087176a1a7b0ba5fbd;hp=e5863e5811e69eb9df9f740cf88238c36b3b99d2;hpb=4b3375d0842a53375e79e35e0b0e690f485534bf;p=creaRigidRegistration.git

diff --git a/PackRecalage/src/bbPackRecalageImageRecalageProperties.cxx b/PackRecalage/src/bbPackRecalageImageRecalageProperties.cxx
index e5863e5..6f763ab 100644
--- a/PackRecalage/src/bbPackRecalageImageRecalageProperties.cxx
+++ b/PackRecalage/src/bbPackRecalageImageRecalageProperties.cxx
@@ -1,3 +1,29 @@
+/*
+# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image 
+#                        pour la Santé)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+#
+#  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 "bbPackRecalageImageRecalageProperties.h"
 #include "bbPackRecalagePackage.h"
 namespace bbPackRecalage
@@ -10,25 +36,19 @@ void ImageRecalageProperties::Process()
 	image = bbGetInputIn();
 	if(image != NULL)
 	{
+		bbSetOutputLengthX((int)image->GetDimensions()[0] - 1);
+		bbSetOutputLengthY((int)image->GetDimensions()[1] - 1);
 		bbSetOutputLengthZ((int)image->GetDimensions()[2] - 1);
-		std::cout << "image scalar size: " << image->GetScalarSize() << std::endl;
-		std::cout << "image scalar max: " << image->GetScalarTypeMax() << std::endl;
-		std::cout << "image scalar min: " << image->GetScalarTypeMin() << std::endl;
-		std::cout << "image scalar type: " << image->GetScalarType() << std::endl;
+		
 		if(image->GetScalarType() == VTK_DOUBLE)
 		{
 				bbSetOutputColorLevel(50);
 				bbSetOutputMidColorLevel(25);
 		}
-		else if(image->GetScalarType() == VTK_UNSIGNED_SHORT)
-		{
-				bbSetOutputColorLevel(500);
-				bbSetOutputMidColorLevel(250);
-		}
 		else
 		{
-				bbSetOutputColorLevel(500);
-				bbSetOutputMidColorLevel(250);
+				bbSetOutputColorLevel(255);
+				bbSetOutputMidColorLevel(127.5);
 		}
 	}
 }
@@ -52,4 +72,4 @@ void ImageRecalageProperties::bbUserFinalizeProcessing()
 	image->Delete();
 }
 }
-// EO namespace bbPackRecalage
\ No newline at end of file
+// EO namespace bbPackRecalage