X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaVtk%2FvtkVectorsVisu.cpp;h=eee31ee946f37e4b0db21185288911eaaf46fc01;hb=3582c0f9b8380fde739856aa6a188da3262cf03b;hp=5b50b2ae0395e506e8e40c51243479be963eb3d8;hpb=b14773c04cfae41766a01441d155225c9fc4668f;p=creaVtk.git

diff --git a/lib/creaVtk/vtkVectorsVisu.cpp b/lib/creaVtk/vtkVectorsVisu.cpp
index 5b50b2a..eee31ee 100644
--- a/lib/creaVtk/vtkVectorsVisu.cpp
+++ b/lib/creaVtk/vtkVectorsVisu.cpp
@@ -38,6 +38,10 @@ vtkVectorsVisu::vtkVectorsVisu()
   :vtkVectorsTensorsVisuBase()
 {
 	_vtkarrowsource		= vtkArrowSource::New();
+<<<<<<< HEAD
+	_vtklinesource		= vtkLineSource::New();
+=======
+>>>>>>> master
 	_vtkglyph			= vtkGlyph3D::New();
 	_vtklinesource		= vtkLineSource::New();
 
@@ -53,29 +57,63 @@ vtkVectorsVisu::vtkVectorsVisu()
 	_vtklinesource->SetPoint2( point2 );
 }
 
-
 //------------------------------------------------------------------------------
 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
 			{
-	         _vtkglyph->SetSource( _vtkarrowsource->GetOutput() );
+#if VTK_MAJOR_VERSION <= 5
+	         	_vtkglyph->SetSource( _vtkarrowsource->GetOutput() );
+#else
+				_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
 			}
          _vtkglyph->SetScaleModeToScaleByVector();
          _vtkglyph->SetColorModeToColorByVector();
          _vtkglyph->SetScaleFactor( GetScaleFactor() );
+<<<<<<< HEAD
+
+		_vtkglyph->Update();
+
+#if VTK_MAJOR_VERSION <= 5
+         _pdm->SetInput( _vtkglyph->GetOutput());
+#else
+         _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);
@@ -84,9 +122,27 @@ 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();
@@ -98,8 +154,6 @@ for (i=0;i<sizeDa;i++)
 	//_LutEED->SetVectorModeToRGBColors();
 	//_LutEED->SetVectorModeToMagnitud();
 
-
-
 //         _pdm->SetScalarModeToUsePointFieldData();
          _pdm->SetLookupTable( _LutEED );
          _pdm->SelectColorArray( "GlyphVector" );
@@ -107,15 +161,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(); 
 }
-	
-
-
-
-