X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkImageVtkProperties.cxx;h=9a8b563f68715fd7f628bbe54022e039e467d15e;hb=daf434343deecc059445cf8f478da95345911896;hp=aac617bf0f529a487d787cbdbb558e66d2c3f822;hpb=eafedb040993e52ecb94bb9508501d1444ace6d8;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkImageVtkProperties.cxx b/packages/vtk/src/bbvtkImageVtkProperties.cxx
index aac617b..9a8b563 100644
--- a/packages/vtk/src/bbvtkImageVtkProperties.cxx
+++ b/packages/vtk/src/bbvtkImageVtkProperties.cxx
@@ -1,4 +1,31 @@
-//===== 
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
+
+
+//=====
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)
 //===== 
 #include "bbvtkImageVtkProperties.h"
@@ -45,17 +72,19 @@ void ImageVtkProperties::Process()
 
 		vrange.push_back((float)range[0]);
 		vrange.push_back((float)range[1]);
-	
-		if (bbGetInputIn()->GetScalarType()==VTK_BIT)				nametype="VTK_BIT";
-		if (bbGetInputIn()->GetScalarType()==VTK_CHAR)				nametype="VTK_CHAR";
-		if (bbGetInputIn()->GetScalarType()==VTK_SIGNED_CHAR)		nametype="VTK_SIGNED_CHAR";
-		if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_CHAR)		nametype="VTK_UNSIGNED_CHAR";
-		if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_SHORT)	nametype="VTK_UNSIGNED_SHORT";
-		if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_INT)		nametype="VTK_UNSIGNED_INT";
-		if (bbGetInputIn()->GetScalarType()==VTK_LONG)				nametype="VTK_LONG";
-		if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_LONG)		nametype="VTK_UNSIGNED_LONG";
-		if (bbGetInputIn()->GetScalarType()==VTK_FLOAT)				nametype="VTK_FLOAT";
-		if (bbGetInputIn()->GetScalarType()==VTK_DOUBLE)			nametype="VTK_DOUBLE";
+
+		if (bbGetInputIn()->GetScalarType()==VTK_BIT)			nametype="VTK_BIT";  		// 1
+		if (bbGetInputIn()->GetScalarType()==VTK_CHAR)			nametype="VTK_CHAR"; 		// 2
+		if (bbGetInputIn()->GetScalarType()==VTK_SIGNED_CHAR)		nametype="VTK_SIGNED_CHAR";  	// 15
+		if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_CHAR)		nametype="VTK_UNSIGNED_CHAR";	// 3
+		if (bbGetInputIn()->GetScalarType()==VTK_SHORT)			nametype="VTK_SHORT"; 		// 4
+		if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_SHORT)	nametype="VTK_UNSIGNED_SHORT";  // 5
+		if (bbGetInputIn()->GetScalarType()==VTK_INT)			nametype="VTK_INT";             // 6
+		if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_INT)		nametype="VTK_UNSIGNED_INT";    // 7
+		if (bbGetInputIn()->GetScalarType()==VTK_LONG)			nametype="VTK_LONG";            // 8  
+		if (bbGetInputIn()->GetScalarType()==VTK_UNSIGNED_LONG)		nametype="VTK_UNSIGNED_LONG";   // 9
+		if (bbGetInputIn()->GetScalarType()==VTK_FLOAT)			nametype="VTK_FLOAT";           // 10
+		if (bbGetInputIn()->GetScalarType()==VTK_DOUBLE)		nametype="VTK_DOUBLE";          // 11
 	} else {	
 		dim					= 0;		
 		numberoOfComponents	= 0;