3223 creaVtk Feature New Normal - vtk8itk4wx3-mingw64

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

diff --git a/lib/creaVtk/vtkVectorsVisu.cpp b/lib/creaVtk/vtkVectorsVisu.cpp
index eee31ee946f37e4b0db21185288911eaaf46fc01..376d4036211699121b49e0d31a4b75de98b1f118 100644 (file)
--- a/lib/creaVtk/vtkVectorsVisu.cpp
+++ b/lib/creaVtk/vtkVectorsVisu.cpp
@@ -38,10 +38,6 @@ vtkVectorsVisu::vtkVectorsVisu()
   :vtkVectorsTensorsVisuBase()
 {
        _vtkarrowsource         = vtkArrowSource::New();
-<<<<<<< HEAD
-       _vtklinesource          = vtkLineSource::New();
-=======
->>>>>>> master
        _vtkglyph                       = vtkGlyph3D::New();
        _vtklinesource          = vtkLineSource::New();
 
@@ -66,21 +62,13 @@ vtkVectorsVisu::~vtkVectorsVisu()
 //------------------------------------------------------------------------------
 void vtkVectorsVisu::Process()
 {
-<<<<<<< HEAD
-
-=======
->>>>>>> master
      if(_active==true)
      {
 #if VTK_MAJOR_VERSION <= 5
          _vtkglyph->SetInput( GetDataObject() );  
-<<<<<<< HEAD
 #else
          _vtkglyph->SetInputData( GetDataObject() );  
 #endif
-
-=======
->>>>>>> master
                        if(GetTypeForm()==1)                                                            // source Arrow
                        {
 #if VTK_MAJOR_VERSION <= 5
@@ -100,8 +88,6 @@ void vtkVectorsVisu::Process()
          _vtkglyph->SetScaleModeToScaleByVector();
          _vtkglyph->SetColorModeToColorByVector();
          _vtkglyph->SetScaleFactor( GetScaleFactor() );
-<<<<<<< HEAD
-
                _vtkglyph->Update();
 
 #if VTK_MAJOR_VERSION <= 5
@@ -110,10 +96,6 @@ void vtkVectorsVisu::Process()
          _pdm->SetInputData( _vtkglyph->GetOutput());
 #endif
 
-=======
-         _vtkglyph->Update();
-         _pdm->SetInput( _vtkglyph->GetOutput());
->>>>>>> master
 vtkPointData   *data   = _vtkglyph->GetOutput()->GetPointData();
 //printf("EED -------------------------------------------\n");
 //_vtkglyph->GetOutput()->Print(std::cout);
@@ -122,27 +104,9 @@ vtkPointData       *data   = _vtkglyph->GetOutput()->GetPointData();
 int i,sizeDa = data->GetNumberOfArrays();
 for (i=0;i<sizeDa;i++)
 {
-<<<<<<< HEAD
-       printf("EED vtkVectorsVisu::Process-name %d, %s \n", i, data->GetArrayName(i) );
-}
-
-//EED         _pdm->SetScalarRange( range );
-//EED         vtkPolyData      *pd                     = vGlyphFlowPlane->GetOutput();
-//EED         vtkPointData     *pointdata              = pd->GetPointData();
-//EED         vtkDataArray     *da                     = pointdata->GetVectors();
-//EED         vtkDataArray *nda = vtkFloatArray::New();
-//EED         nda->DeepCopy(da);
-//       pointdata->RemoveArray( "GlyphVector" );
-//       bbGetInputIn()->GetPointData()->RemoveArray( "GlyphVector" );
-//EED         pointdata->AddArray( nda );
-//EED         bbGetInputIn()->GetPointData()->AddArray( nda );
-//EED2         _pdm->ScalarVisibilityOn();
-
-=======
        data->GetArray(i)->Print(std::cout);
 }
 
->>>>>>> master
        _pdm->ScalarVisibilityOn();
        _pdm->SetColorModeToMapScalars();
        //_pdm->SetColorModeToDefault();