X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkRescaleSlopeIntercept.cxx;h=117b97931a3c68e7634a99f9cb074b2d4e5ceb6b;hb=fd579f268efe95807b8800d073ac4e9b8645aea2;hp=cb1a77050240e041c2764afd6d908b74d0d23f95;hpb=1f1b5b4e42d62897b26be343ebfdb620acc7e367;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx b/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx
index cb1a770..117b979 100644
--- a/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx
+++ b/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx
@@ -1,9 +1,37 @@
-//===== 
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
+
+
+//=====
 // Don't edit this file. This file is generated from xml description.. 
 //===== 
 #include "bbvtkRescaleSlopeIntercept.h"
 #include "bbvtkPackage.h"
 
+#include "bbtkStaticLecture.h"
 
 namespace bbvtk
 {
@@ -30,7 +58,6 @@ void RescaleSlopeIntercept::Process()
 //    bbSetOutputOut( bbGetInputIn() );
 //    std::cout << "Output value = " <<bbGetOutputOut() << std::endl;
   
-
 	double range[2];
 	double spc[3];
 	int ext[6];
@@ -39,18 +66,9 @@ void RescaleSlopeIntercept::Process()
 	
 	if (bbGetInputIn()!=0)
 	{
-		if (bbGetInputOutputFormat()=="SAME")					outputformat = bbGetInputIn()->GetScalarType();
-		else if (bbGetInputOutputFormat()=="VTK_BIT")			outputformat = VTK_BIT;
-		else if (bbGetInputOutputFormat()=="VTK_CHAR")			outputformat = VTK_CHAR;
-		else if (bbGetInputOutputFormat()=="VTK_SIGNED_CHAR")	outputformat = VTK_SIGNED_CHAR;
-		else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_CHAR")	outputformat = VTK_UNSIGNED_CHAR;
-		else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_SHORT") outputformat = VTK_UNSIGNED_SHORT;
-		else if (bbGetInputOutputFormat()=="VTK_INT")			outputformat = VTK_INT;
-		else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_INT")	outputformat = VTK_UNSIGNED_INT;
-		else if (bbGetInputOutputFormat()=="VTK_LONG")			outputformat = VTK_LONG;
-		else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_LONG")	outputformat = VTK_UNSIGNED_LONG;
-		else if (bbGetInputOutputFormat()=="VTK_FLOAT")			outputformat = VTK_FLOAT;
-		else if (bbGetInputOutputFormat()=="VTK_DOUBLE")		outputformat = VTK_DOUBLE;
+
+
+		int outputformat = bbtkStaticLecture::GetTypeFormat( bbGetInputOutputFormat() , bbGetInputIn() );
 		
 		
 		bbGetInputIn()->GetScalarRange(range);
@@ -106,12 +124,14 @@ void RescaleSlopeIntercept::Process()
 		mchange->SetExtentTranslation( -ext[0], -ext[2], -ext[4] );
 		mchange->SetOutputSpacing (spc);
 		mchange->Update();    //important
-		
 		bbSetOutputOut( mchange->GetOutput() );
 	 	
-	} // if
+	} else  {
+		bbSetOutputOut( NULL );
+	}		// if bbGetInputIn	
 }
 	
+	
 //===== 
 // Don't edit this file. This file is generated from xml description.. 
 //=====