#3138 creaMaracasVisu Feature New Normal - branch vtk7itk4wx3

[creaMaracasVisu.git] / bbtk / src / bbmaracasvisuDrawAxe3D.cxx

diff --git a/bbtk/src/bbmaracasvisuDrawAxe3D.cxx b/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
index 9d65ade80712dd580a5db61edbd0472ae07bd1a9..f7be326c61962da3983b7cab719e1fe130671dd1 100644 (file)
--- a/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
+++ b/bbtk/src/bbmaracasvisuDrawAxe3D.cxx
@@ -44,6 +44,7 @@ void DrawAxe3D::Process()
        std::vector< double > vecty = bbGetInputlstPointY();
        std::vector< double > vectz = bbGetInputlstPointZ();    
 
+
 //     vtkImageData* img = bbGetInputImage();  
        unsigned int i;
        double spc[3];  
@@ -52,7 +53,8 @@ void DrawAxe3D::Process()
        spc[1]=1;
        spc[2]=1;
 
-       if(!vectx.empty()&&!vecty.empty()&&!vectz.empty()){
+       if(!vectx.empty()&&!vecty.empty()&&!vectz.empty())
+        {
                vtkPoints* allPoints = vtkPoints::New( );
                vtkCellArray* allTopology = vtkCellArray::New( );
                allTopology->InsertNextCell( vectx.size() );
@@ -89,6 +91,9 @@ void DrawAxe3D::Process()
      }
 }
 
+
+
+
 void DrawAxe3D::bbUserSetDefaultValues()
 {
        firsttime        = true;
@@ -102,6 +107,8 @@ void DrawAxe3D::bbUserSetDefaultValues()
     colour.push_back(0.0);
     bbSetInputColour(colour);
     bbSetInputOpacity(1.0);
+    bbSetInputRenderer(NULL);
+    bbSetInputTransform(NULL);
 }
 
 
@@ -113,7 +120,13 @@ void DrawAxe3D::bbUserSetDefaultValues()
                polydatamapper = vtkPolyDataMapper::New();
                mvtkactor      = vtkActor::New();
                
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
                polydatamapper->SetInput(mallData);
+#else
+               polydatamapper->SetInputData(mallData);
+#endif
+
                mvtkactor->SetMapper(polydatamapper);
                bbSetOutputOut(mvtkactor);
        }