X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FcreaVtk%2FvtkVectorsVisu.cpp;h=92c3df40293c4ceac6970204482ccad1dbd404da;hb=71174bb44a65806fe33fe736faba98d8bf8d89e5;hp=c8045e55f601799252ba875a691b48bda8573bb6;hpb=8eab35636049813a6ce1b8f0e2d99e62dd280e0e;p=creaVtk.git

diff --git a/lib/creaVtk/vtkVectorsVisu.cpp b/lib/creaVtk/vtkVectorsVisu.cpp
index c8045e5..92c3df4 100644
--- a/lib/creaVtk/vtkVectorsVisu.cpp
+++ b/lib/creaVtk/vtkVectorsVisu.cpp
@@ -38,6 +38,7 @@ vtkVectorsVisu::vtkVectorsVisu()
   :vtkVectorsTensorsVisuBase()
 {
 	_vtkarrowsource	= vtkArrowSource::New();
+	_vtklinesource		= vtkLineSource::New();
 	_vtkglyph			= vtkGlyph3D::New();
 }
 
@@ -50,23 +51,45 @@ vtkVectorsVisu::~vtkVectorsVisu()
 //------------------------------------------------------------------------------
 void vtkVectorsVisu::Process()
 {
-printf("EED vtkVectorsVisu::Process()  start\n");
      if(_active==true)
      {
+#if VTK_MAJOR_VERSION <= 5
          _vtkglyph->SetInput( GetDataObject() );  
-         _vtkglyph->SetSource( _vtkarrowsource->GetOutput() );
+#else
+         _vtkglyph->SetInputData( GetDataObject() );  
+#endif
+
+			if(GetTypeForm()==1)								// source Arrow
+			{
+#if VTK_MAJOR_VERSION <= 5
+	         _vtkglyph->SetSource( _vtkarrowsource->GetOutput() );
+#else
+	         _vtkglyph->SetSourceData( _vtkarrowsource->GetOutput() );
+#endif
+			} else {												// source Line
+#if VTK_MAJOR_VERSION <= 5
+				_vtkglyph->SetSource( _vtklinesource->GetOutput() );   	
+#else
+				_vtkglyph->SetSourceData( _vtklinesource->GetOutput() );   	
+#endif
+			}
+
          _vtkglyph->SetScaleModeToScaleByVector();
          _vtkglyph->SetColorModeToColorByVector();
          _vtkglyph->SetScaleFactor( GetScaleFactor() );
          _vtkglyph->Update();
 
+#if VTK_MAJOR_VERSION <= 5
          _pdm->SetInput( _vtkglyph->GetOutput());
+#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");
+//_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 );
@@ -88,7 +111,25 @@ for (i=0;i<sizeDa;i++)
 //EED         pointdata->AddArray( nda );
 //EED         bbGetInputIn()->GetPointData()->AddArray( nda );
 //EED2         _pdm->ScalarVisibilityOn();
-         _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 );
          _pdm->SelectColorArray( "GlyphVector" );
 
@@ -100,7 +141,6 @@ for (i=0;i<sizeDa;i++)
     }// if _active
 
     VisibilityActor(); 
-printf("EED vtkVectorsVisu::Process()  end\n");
 }