X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkRescaleSlopeIntercept.cxx;h=9262c509af330d0effaaa09e1175bb38b470c154;hb=d19c5512748aa8e2dd5c3d01d9ec680ded1f17ce;hp=639fd2a036b2a7d4ac36d79a9702596a5ed301f9;hpb=cfad95b6e08e6e53846ffcda7fbc5932065f2c47;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx b/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx
index 639fd2a..9262c50 100644
--- a/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx
+++ b/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx
@@ -31,6 +31,7 @@
 #include "bbvtkRescaleSlopeIntercept.h"
 #include "bbvtkPackage.h"
 
+#include "bbtkStaticLecture.h"
 
 namespace bbvtk
 {
@@ -65,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);
@@ -118,17 +110,36 @@ void RescaleSlopeIntercept::Process()
 			shift= A + (range[1]*newdifrange/difrange);
 		} // if type 3
 		
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		filter1->SetInput( bbGetInputIn() );
+#else
+		filter1->SetInputData( bbGetInputIn() );
+#endif
+
 		filter1->SetOutputScalarType( VTK_DOUBLE );
 		filter1->SetShift( 0 );
 		filter1->SetScale( scale );
 		
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		filter2->SetInput( filter1->GetOutput() );
+#else
+		filter2->SetInputData( filter1->GetOutput() );
+#endif
+
 		filter2->SetOutputScalarType( outputformat );
 		filter2->SetShift( shift );
 		filter2->SetScale( 1 );
 		
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 		mchange->SetInput( filter2->GetOutput() );
+#else
+		mchange->SetInputData( filter2->GetOutput() );
+#endif
+
 		mchange->SetExtentTranslation( -ext[0], -ext[2], -ext[4] );
 		mchange->SetOutputSpacing (spc);
 		mchange->Update();    //important