3263 creaMaracasVisu Feature New Normal - ViewerNV sync ParallelScale Camera

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

diff --git a/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx b/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
index 00fae1748ba908cee2709fc7467027938bf880a8..33bb1d776f08bac7cbcf4ca07a452cc746da09f7 100644 (file)
--- a/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
+++ b/bbtk/src/bbmaracasvisuDrawAxisTree3D.cxx
@@ -49,7 +49,12 @@ void DrawAxisTree3D::DrawOneAxis(int iGeneral,int numPoints, int iAxis)
        vtkActor                        *vtkactor               = vtkActor::New();
 
 //     polydatamapper->ScalarVisibilityOff();
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
        polydatamapper->SetInput(polydata);
+#else
+       polydatamapper->SetInputData(polydata);
+#endif
        vtkactor->SetMapper(polydatamapper);
 
        vecVtkPolyData.push_back( polydata );
@@ -192,9 +197,9 @@ void DrawAxisTree3D::Process()
     int iActor,sizeActors = vecVtkActors.size();
        int numPoints;
 
-    if (oldLstSize!=sizeLstAxis)
-        {
-        oldLstSize=sizeLstAxis;
+//    if (oldLstSize!=sizeLstAxis)
+//      {
+//        oldLstSize=sizeLstAxis;
          for (iActor=0 ; iActor<sizeActors; iActor++)
          {
             if (bbGetInputRenderer()!=NULL )
@@ -203,8 +208,8 @@ void DrawAxisTree3D::Process()
                 vecVtkPolyData[iActor]->Delete();
                 vecVtkPolyDataMaper[iActor]->Delete();
                 vecVtkActors[iActor]->Delete();
-            }
-         }
+            } // if
+         } // for iActor
          vecVtkPolyData.clear();
          vecVtkPolyDataMaper.clear();
          vecVtkActors.clear();
@@ -220,22 +225,22 @@ void DrawAxisTree3D::Process()
     //                 printf("EED  DrawAxisTree3D::Process  %d/%d\n", iAxis,sizeLstAxis );
     //         }
 
-        }
+        } // for iAxis
 
         if ( bbGetInputiAxis() < (int)(vecVtkActors.size()-1) )
         {
             bbSetOutputOutAxis( vecVtkActors[ bbGetInputiAxis() ] );
         } else         {
             printf("DrawAxisTree3D .ERROR. missing index vector...\n");
-        }
+        } // if 
 
-    } else {// if oldLstSize
+ //   } else {// if oldLstSize
         for (iActor=0 ; iActor<sizeActors; iActor++)
         {
             vecVtkActors[iActor]->GetProperty()->SetOpacity( bbGetInputOpacity() );
            vecVtkActors[iActor]->GetProperty()->SetLineWidth( bbGetInputLineWidth() );
         }
-    }
+//    } // if oldLstSize
 
        printf("EED DrawAxisTree3D::Process end \n");