X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaVtk%2FvtkVectorsVisu.cpp;h=184bd0f2a0e24dbbba38b29090e5e36d8261a84c;hb=79a0adc7590431ebc6044df732b0a40e0b39ba78;hp=43df474428cfa2e3e5c0701424a4b178ad4da08d;hpb=41a74698bb0203749248628baa1503144e1f12f7;p=creaVtk.git

diff --git a/lib/creaVtk/vtkVectorsVisu.cpp b/lib/creaVtk/vtkVectorsVisu.cpp
index 43df474..184bd0f 100644
--- a/lib/creaVtk/vtkVectorsVisu.cpp
+++ b/lib/creaVtk/vtkVectorsVisu.cpp
@@ -29,40 +29,79 @@
 
 #include "vtkProperty.h"
 
+//Borrame
+#include "vtkPointData.h"
+
+
 //------------------------------------------------------------------------------
 vtkVectorsVisu::vtkVectorsVisu()
   :vtkVectorsTensorsVisuBase()
 {
-	_vtkarrowsource	= vtkArrowSource::New();
-	_vtkglyph	= vtkGlyph3D::New();
+	_vtkarrowsource		= vtkArrowSource::New();
+	_vtklinesource		= vtkLineSource::New();
+	_vtkglyph			= vtkGlyph3D::New();
 }
 
-
 //------------------------------------------------------------------------------
 vtkVectorsVisu::~vtkVectorsVisu()
 {
 }
 
+
 //------------------------------------------------------------------------------
 void vtkVectorsVisu::Process()
 {
-printf("EED vtkVectorsVisu::Process()  start\n");
+
      if(_active==true)
      {
-printf("EED vtkVectorsVisu::Process()  1\n");
+#if VTK_MAJOR_VERSION <= 5
          _vtkglyph->SetInput( GetDataObject() );  
-printf("EED vtkVectorsVisu::Process()  2\n");
-         _vtkglyph->SetSource( _vtkarrowsource->GetOutput() );
-printf("EED vtkVectorsVisu::Process()  3\n");
+#else
+         _vtkglyph->SetInputData( GetDataObject() );  
+#endif
+
+			if(GetTypeForm()==1)								// source Arrow
+			{
+#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() );
-printf("EED vtkVectorsVisu::Process()  4\n");
-         _vtkglyph->Update();
-printf("EED vtkVectorsVisu::Process()  5\n");
 
+		_vtkglyph->Update();
+
+#if VTK_MAJOR_VERSION <= 5
          _pdm->SetInput( _vtkglyph->GetOutput());
-printf("EED vtkVectorsVisu::Process()  5.1\n");
+#else
+         _pdm->SetInputData( _vtkglyph->GetOutput());
+#endif
+
+vtkPointData 	*data	= _vtkglyph->GetOutput()->GetPointData();
+//printf("EED -------------------------------------------\n");
+//_vtkglyph->GetOutput()->Print(std::cout);
+//printf("EED -------------------------------------------\n");
+//data->Print(std::cout);
+printf("EED -------------------------------------------\n");			
+int i,sizeDa = data->GetNumberOfArrays();
+printf("EED vtkVectorsVisu::Process  sizeDa %d \n", sizeDa );
+for (i=0;i<sizeDa;i++)
+{
+	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();
@@ -74,29 +113,34 @@ printf("EED vtkVectorsVisu::Process()  5.1\n");
 //EED         pointdata->AddArray( nda );
 //EED         bbGetInputIn()->GetPointData()->AddArray( nda );
 //EED2         _pdm->ScalarVisibilityOn();
-printf("EED vtkVectorsVisu::Process()  6\n");
-         _pdm->SetScalarModeToUsePointFieldData();
 
+	_pdm->ScalarVisibilityOn();
+	_pdm->SetColorModeToMapScalars();
+	//_pdm->SetColorModeToDefault();
+	// _pdm->SetColorModeToDirectScalars();  // NOT compile
+	_pdm->SetScalarModeToUsePointFieldData();
+	_pdm->ImmediateModeRenderingOn();
+
+  	_LutEED->SetVectorModeToComponent();
+	//_LutEED->SetVectorModeToRGBColors();
+	//_LutEED->SetVectorModeToMagnitud();
+
+//         _pdm->SetScalarModeToUsePointFieldData();
          _pdm->SetLookupTable( _LutEED );
-printf("EED vtkVectorsVisu::Process()  7\n");
          _pdm->SelectColorArray( "GlyphVector" );
 
 //       vSliceMapperVec->SetLookupTable( vGreenToRedLut );
 //       vSliceMapperVec->SetColorModeToMapScalars();
 
+#if VTK_MAJOR_VERSION <= 5
+		// ..
+#else
+         _pdm->Update();
+#endif
          _actor->SetMapper( _pdm );
-printf("EED vtkVectorsVisu::Process()  8\n");
          _actor->GetProperty()->SetOpacity( GetOpacity() );
-printf ("EED vtkVectorsVisu::Process opacity:%f\n",GetOpacity()  ); 
     }// if _active
 
-printf("EED vtkVectorsVisu::Process()  9\n");
     VisibilityActor(); 
-printf("EED vtkVectorsVisu::Process()  end\n");
 }
-	
-
-
-
-