#3110 creaVtk Bug New Normal - branch vtk7itk4 compilation with vtk7

[creaVtk.git] / lib / creaVtk / vtkTensorsVisu.cpp

diff --git a/lib/creaVtk/vtkTensorsVisu.cpp b/lib/creaVtk/vtkTensorsVisu.cpp
index 81bcef7f573aeb36caf95b38eed7f3bd24439963..9a535195eb1666e548a0173ae90c2bf13490e4c3 100644 (file)
--- a/lib/creaVtk/vtkTensorsVisu.cpp
+++ b/lib/creaVtk/vtkTensorsVisu.cpp
@@ -52,7 +52,6 @@ vtkTensorsVisu::~vtkTensorsVisu()
 //------------------------------------------------------------------------
 void vtkTensorsVisu::Process()
 {
-printf("EED vtkTensorsVisu::Process() start\n");
   if (_active==true)
   {
        if(GetTypeForm()==2)                                                            // source superquadratic
@@ -62,18 +61,21 @@ printf("EED vtkTensorsVisu::Process() start\n");
 #if VTK_MAJOR_VERSION <= 5
                tg->SetSource(superquadratic->GetOutput());
 #else
+               superquadratic->Update();
                tg->SetSourceData(superquadratic->GetOutput());
 #endif
        } else if(GetTypeForm()==1) {                                   // source sphere
 #if VTK_MAJOR_VERSION <= 5
                tg->SetSource(ss->GetOutput());
 #else
+               ss->Update();
                tg->SetSourceData(ss->GetOutput());
 #endif
        } else {                                                                                                // source cube
 #if VTK_MAJOR_VERSION <= 5
                tg->SetSource(cs->GetOutput());         
 #else
+               cs->Update();
                tg->SetSourceData(cs->GetOutput());     
 #endif
        }
@@ -87,9 +89,6 @@ printf("EED vtkTensorsVisu::Process() start\n");
        //              tg->SetScaling(25);
        tg->SetScaleFactor( GetScaleFactor() );
 
-printf("EED vtkTensorsVisu::Process() 1\n");
-
-
        //The normals are needed to generate the right colors and if
        // not used some of the glyphs are black.
 //EED 2017-01-01 Migration VTK7
@@ -97,30 +96,18 @@ printf("EED vtkTensorsVisu::Process() 1\n");
        pdn->SetInput(tg->GetOutput());
        _pdm->SetInput( pdn->GetOutput() );
 #else
-printf("EED vtkTensorsVisu::Process() 1.1\n");
        pdn->SetInputData(tg->GetOutput());
-printf("EED vtkTensorsVisu::Process() 1.2\n");
+       pdn->Update();
        _pdm->SetInputData( pdn->GetOutput() );
        _pdm->Update();
 #endif
-printf("EED vtkTensorsVisu::Process() 1.3\n");
        _actor->SetMapper( _pdm );
-printf("EED vtkTensorsVisu::Process() 1.4\n");
    _actor->GetProperty()->SetOpacity( GetOpacity() );
 
-
-
-
-printf("EED vtkTensorsVisu::Process() 1.5\n");
    tg->SetColorModeToEigenvalues();
 //   tg->SetColorModeToScalars();
-printf("EED vtkTensorsVisu::Process() 1.6\n");
    tg->Update();
 
-printf("EED vtkTensorsVisu::Process() 1.7\n");
-
-
-
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
        pd = tg->GetOutput();
@@ -131,9 +118,7 @@ printf("EED vtkTensorsVisu::Process() 1.7\n");
 #endif
 
        pod = pd->GetPointData();
-printf("EED vtkTensorsVisu::Process() 1.8\n");
        pod->Update();
-printf("EED vtkTensorsVisu::Process() 1.9\n");
 
        tg->Update();
        vtkPolyData             *pd_pdn                         = pdn->GetOutput();
@@ -142,7 +127,6 @@ printf("EED vtkTensorsVisu::Process() 1.9\n");
        vtkPolyData             *pd_tg                          = tg->GetOutput();
        vtkPointData    *pointdata_tg           = pd_tg->GetPointData();
 
-printf("EED vtkTensorsVisu::Process() 1.20\n");
        vtkPolyData             *pd_do                          = (vtkPolyData*)GetDataObject();
        vtkPointData    *pointdata_do           = pd_do->GetPointData();
 
@@ -151,18 +135,12 @@ printf("EED vtkTensorsVisu::Process() 1.20\n");
        vtkIdType numSourcePts;
 //     vtkIdType numSourceCells;
 
-printf("EED vtkTensorsVisu::Process() 1.22\n");
        vtkPoints *sourcePts    = tg->GetSource()->GetPoints();
-printf("EED vtkTensorsVisu::Process() 1.23\n"); 
 
 
        numSourcePts                    = sourcePts->GetNumberOfPoints();
 //     numSourceCells = tg->GetSource()->GetNumberOfCells();
 
-
-printf("EED vtkTensorsVisu::Process() 2\n");
-
-
        vtkDataArray *tensorsArray = pointdata_do->GetArray("tensors");
        if (tensorsArray)
    {
@@ -218,12 +196,6 @@ printf("EED vtkTensorsVisu::Process() 2\n");
                tg->Update();
        } // if  tensorsArray
 
-
-
-
-
-printf("EED vtkTensorsVisu::Process() 3\n");
-
        _pdm->ScalarVisibilityOn();
        _pdm->SetColorModeToMapScalars();
        //_pdm->SetColorModeToDefault();
@@ -255,15 +227,7 @@ printf("EED vtkTensorsVisu::Process() 3\n");
 
                        }
 */
-
-
   } // _active
-printf("EED vtkTensorsVisu::Process() 4\n");
-
-    VisibilityActor(); 
-
-printf("EED vtkTensorsVisu::Process() END\n");
-
-
+  VisibilityActor(); 
 }