X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkRescaleSlopeIntercept.cxx;h=e9cf56dc03e893b951d6bfd9534afaf84810724e;hb=e269992d2d446784afc40073782311deaa25008f;hp=dc4e0afc299a4effc6e758f5149a2087a4f67482;hpb=0dde94ea04d1505b73e3b57bb3d736363104642f;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx b/packages/vtk/src/bbvtkRescaleSlopeIntercept.cxx
index dc4e0af..e9cf56d 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
 {
@@ -42,6 +43,7 @@ BBTK_BLACK_BOX_IMPLEMENTATION(RescaleSlopeIntercept,bbtk::AtomicBlackBox);
 //===== 
 void RescaleSlopeIntercept::Process()
 {
+printf("RescaleSlopeIntercept::Process Start\n");
 
 // THE MAIN PROCESSING METHOD BODY
 //   Here we simply set the input 'In' value to the output 'Out'
@@ -65,19 +67,9 @@ void RescaleSlopeIntercept::Process()
 	
 	if (bbGetInputIn()!=0)
 	{
-		if (bbGetInputOutputFormat()=="SAME")					outputformat = bbGetInputIn()->GetScalarType();
-		else if (bbGetInputOutputFormat()=="VTK_BIT")			outputformat = VTK_BIT;   	   // 1
-		else if (bbGetInputOutputFormat()=="VTK_CHAR")			outputformat = VTK_CHAR;  	   // 2
-		else if (bbGetInputOutputFormat()=="VTK_SIGNED_CHAR")		outputformat = VTK_SIGNED_CHAR;    // 15
-		else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_CHAR")		outputformat = VTK_UNSIGNED_CHAR;  // 3
-		else if (bbGetInputOutputFormat()=="VTK_SHORT") 		outputformat = VTK_SHORT; 	   // 4
-		else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_SHORT") 	outputformat = VTK_UNSIGNED_SHORT; // 5
-		else if (bbGetInputOutputFormat()=="VTK_INT")			outputformat = VTK_INT;            // 6
-		else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_INT")		outputformat = VTK_UNSIGNED_INT;   // 7
-		else if (bbGetInputOutputFormat()=="VTK_LONG")			outputformat = VTK_LONG;           // 8  
-		else if (bbGetInputOutputFormat()=="VTK_UNSIGNED_LONG")		outputformat = VTK_UNSIGNED_LONG;  // 9
-		else if (bbGetInputOutputFormat()=="VTK_FLOAT")			outputformat = VTK_FLOAT;          // 10
-		else if (bbGetInputOutputFormat()=="VTK_DOUBLE")		outputformat = VTK_DOUBLE;         // 11 
+
+
+		int outputformat = bbtkStaticLecture::GetTypeFormat( bbGetInputOutputFormat() , bbGetInputIn() );
 		
 		
 		bbGetInputIn()->GetScalarRange(range);
@@ -119,25 +111,50 @@ 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);
+		filter1->Update();    //important
+		filter2->Update();    //important
 		mchange->Update();    //important
 		bbSetOutputOut( mchange->GetOutput() );
+printf("RescaleSlopeIntercept::Process A\n");
 	 	
 	} else  {
+printf("RescaleSlopeIntercept::Process B\n");
 		bbSetOutputOut( NULL );
 	}		// if bbGetInputIn	
+printf("RescaleSlopeIntercept::Process End\n");
+
 }