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

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

diff --git a/lib/creaVtk/vtkVectorsVisu.cpp b/lib/creaVtk/vtkVectorsVisu.cpp
index 92c3df40293c4ceac6970204482ccad1dbd404da..45276a5551e3f419cd1d61fea3a274dde60e600a 100644 (file)
--- a/lib/creaVtk/vtkVectorsVisu.cpp
+++ b/lib/creaVtk/vtkVectorsVisu.cpp
@@ -37,20 +37,21 @@
 vtkVectorsVisu::vtkVectorsVisu()
   :vtkVectorsTensorsVisuBase()
 {
-       _vtkarrowsource = vtkArrowSource::New();
+       _vtkarrowsource         = vtkArrowSource::New();
        _vtklinesource          = vtkLineSource::New();
        _vtkglyph                       = vtkGlyph3D::New();
 }
 
-
 //------------------------------------------------------------------------------
 vtkVectorsVisu::~vtkVectorsVisu()
 {
 }
 
+
 //------------------------------------------------------------------------------
 void vtkVectorsVisu::Process()
 {
+
      if(_active==true)
      {
 #if VTK_MAJOR_VERSION <= 5
@@ -62,14 +63,16 @@ void vtkVectorsVisu::Process()
                        if(GetTypeForm()==1)                                                            // source Arrow
                        {
 #if VTK_MAJOR_VERSION <= 5
-                _vtkglyph->SetSource( _vtkarrowsource->GetOutput() );
+                       _vtkglyph->SetSource( _vtkarrowsource->GetOutput() );
 #else
-                _vtkglyph->SetSourceData( _vtkarrowsource->GetOutput() );
+                               _vtkarrowsource->Update();
+                       _vtkglyph->SetSourceData( _vtkarrowsource->GetOutput() );
 #endif
                        } else {                                                                                                // source Line
 #if VTK_MAJOR_VERSION <= 5
                                _vtkglyph->SetSource( _vtklinesource->GetOutput() );    
 #else
+                               _vtklinesource->Update();
                                _vtkglyph->SetSourceData( _vtklinesource->GetOutput() );        
 #endif
                        }
@@ -77,7 +80,8 @@ void vtkVectorsVisu::Process()
          _vtkglyph->SetScaleModeToScaleByVector();
          _vtkglyph->SetColorModeToColorByVector();
          _vtkglyph->SetScaleFactor( GetScaleFactor() );
-         _vtkglyph->Update();
+
+               _vtkglyph->Update();
 
 #if VTK_MAJOR_VERSION <= 5
          _pdm->SetInput( _vtkglyph->GetOutput());
@@ -112,10 +116,6 @@ for (i=0;i<sizeDa;i++)
 //EED         bbGetInputIn()->GetPointData()->AddArray( nda );
 //EED2         _pdm->ScalarVisibilityOn();
 
-
-
-
-
        _pdm->ScalarVisibilityOn();
        _pdm->SetColorModeToMapScalars();
        //_pdm->SetColorModeToDefault();
@@ -127,8 +127,6 @@ for (i=0;i<sizeDa;i++)
        //_LutEED->SetVectorModeToRGBColors();
        //_LutEED->SetVectorModeToMagnitud();
 
-
-
 //         _pdm->SetScalarModeToUsePointFieldData();
          _pdm->SetLookupTable( _LutEED );
          _pdm->SelectColorArray( "GlyphVector" );
@@ -136,15 +134,15 @@ for (i=0;i<sizeDa;i++)
 //       vSliceMapperVec->SetLookupTable( vGreenToRedLut );
 //       vSliceMapperVec->SetColorModeToMapScalars();
 
+#if VTK_MAJOR_VERSION <= 5
+               // ..
+#else
+         _pdm->Update();
+#endif
          _actor->SetMapper( _pdm );
          _actor->GetProperty()->SetOpacity( GetOpacity() );
     }// if _active
 
     VisibilityActor(); 
 }
-       
-
-
-
-