#3107 BBTK Bug New Normal - branch vtk7itk4 compilation with vtk7

[bbtk.git] / packages / vtk / src / bbvtkVecIsoSurfaceExtractor.cxx

diff --git a/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx b/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx
index ebe70c1095edfe07f0e213e301cd298a570c5696..2e25383433759e0d7950c4ef2e0051f0f9cc4f9c 100644 (file)
--- a/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx
+++ b/packages/vtk/src/bbvtkVecIsoSurfaceExtractor.cxx
@@ -1,3 +1,30 @@
+/*
+ # ---------------------------------------------------------------------
+ #
+ # 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.
+ # ------------------------------------------------------------------------ */
+
+
 #include "bbvtkVecIsoSurfaceExtractor.h"
 #include "bbvtkPackage.h"
 
@@ -13,6 +40,7 @@ BBTK_BLACK_BOX_IMPLEMENTATION(VecIsoSurfaceExtractor,bbtk::AtomicBlackBox);
        //-----------------------------------------------------------   
        void VecIsoSurfaceExtractor::bbUserSetDefaultValues()
        {
+//EED std::cout << "================================VecIsoSurfaceExtractor::bbUserSetDefaultValues()" << std::endl;
                std::vector<double> colour;
                // 1- red
                colour.push_back(1.0);
@@ -51,15 +79,17 @@ BBTK_BLACK_BOX_IMPLEMENTATION(VecIsoSurfaceExtractor,bbtk::AtomicBlackBox);
        
        //-----------------------------------------------------------   
        void VecIsoSurfaceExtractor::bbUserInitializeProcessing() 
+       
        { 
                //    bbSetInputIn(NULL);
-               //     bbSetInputInVtkObject(NULL);
-               
+               //    bbSetInputInVtkObject(NULL);
+//EED std::cout << "================================VecIsoSurfaceExtractor::bbUserInitializeProcessing()" << std::endl;        
        }
        
        //-----------------------------------------------------------   
        void VecIsoSurfaceExtractor::bbUserFinalizeProcessing()
        {
+//EED std::cout << "================================VecIsoSurfaceExtractor::bbUserFinalizeProcessing()" << std::endl;
                int i,size = VecMarchingcubes.size();
                for (i=0;i<size;i++)
                {
@@ -75,10 +105,11 @@ BBTK_BLACK_BOX_IMPLEMENTATION(VecIsoSurfaceExtractor,bbtk::AtomicBlackBox);
        //-----------------------------------------------------------   
        void VecIsoSurfaceExtractor::Process()
        {
+//EED std::cout <<"================================VecIsoSurfaceExtractor::Process()" << std::endl;
                double r,g,b;
-               vtkMarchingCubes        *marchingcubes;
-               vtkPolyDataMapper       *polydatamapper;
-               vtkActor                        *vtkactor;
+               vtkMarchingCubes  *marchingcubes;
+               vtkPolyDataMapper *polydatamapper;
+               vtkActor          *vtkactor;
 
                 int i,size;
 
@@ -97,14 +128,19 @@ BBTK_BLACK_BOX_IMPLEMENTATION(VecIsoSurfaceExtractor,bbtk::AtomicBlackBox);
                VecPolydatamapper.clear();
                VecVtkactor.clear();
 
-
-                size = bbGetInputIn().size();
+               size = bbGetInputIn().size();
                for( i=0 ; i<size ; i++){
-                       marchingcubes           = vtkMarchingCubes::New();
-                       polydatamapper          = vtkPolyDataMapper::New();
-                       vtkactor                        = vtkActor::New();
+                       marchingcubes  = vtkMarchingCubes::New();
+                       polydatamapper = vtkPolyDataMapper::New();
+                       vtkactor       = vtkActor::New();
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                        polydatamapper->SetInput(marchingcubes->GetOutput());
+#else
+                       polydatamapper->SetInputData(marchingcubes->GetOutput());
+#endif
+
                        vtkactor->SetMapper(polydatamapper);
 
                        polydatamapper->ScalarVisibilityOff();
@@ -115,14 +151,19 @@ BBTK_BLACK_BOX_IMPLEMENTATION(VecIsoSurfaceExtractor,bbtk::AtomicBlackBox);
                        VecVtkactor.push_back(vtkactor);
                } // for i
 
-
                for( i=0 ; i<size ; i++){
                        // Visualisation - result volume
                        marchingcubes=VecMarchingcubes[i];
                        vtkactor=(vtkActor*)VecVtkactor[i];
 
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                        marchingcubes->SetInput( bbGetInputIn()[i] );
-                       marchingcubes->SetValue(0,  bbGetInputIsovalue() );
+#else
+                       marchingcubes->SetInputData( bbGetInputIn()[i] );
+#endif
+
+                       marchingcubes->SetValue(0, bbGetInputIsovalue() );
                        marchingcubes->Update();
                         
                        if ( (i*3+1)<(int)(bbGetInputColour().size()) ){
@@ -135,7 +176,7 @@ BBTK_BLACK_BOX_IMPLEMENTATION(VecIsoSurfaceExtractor,bbtk::AtomicBlackBox);
                                b = bbGetInputColour()[2];
                        }
                        vtkactor->GetProperty()->SetColor( r,g,b );
-                        
+ 
                        vtkactor->GetProperty()->SetOpacity( bbGetInputOpacity() );
                        
                        if ( bbGetInputTransform()!=NULL )
@@ -152,9 +193,5 @@ BBTK_BLACK_BOX_IMPLEMENTATION(VecIsoSurfaceExtractor,bbtk::AtomicBlackBox);
 
                 bbSetOutputOut( VecVtkactor );
        }
-
-
 }
 // EO namespace bbvtk
-
-