X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaVtk%2FvtkVectorsVisu.cpp;h=51392f7300698a6dac591902cc216c62060a409c;hb=8480ddec6027339a7b6ca2291390eb51b755858d;hp=c29dace97f7f3ddbccc12d64f61bc51ba4331aa1;hpb=05400a294e401b74b2e7a3058f6a4ee3decfc62d;p=creaVtk.git

diff --git a/lib/creaVtk/vtkVectorsVisu.cpp b/lib/creaVtk/vtkVectorsVisu.cpp
index c29dace..51392f7 100644
--- a/lib/creaVtk/vtkVectorsVisu.cpp
+++ b/lib/creaVtk/vtkVectorsVisu.cpp
@@ -35,25 +35,62 @@
 #include "vtkDataObject.h"
 #include <vtkPointData.h>
 
+#include <vtkAppendPolyData.h>
+
 //------------------------------------------------------------------------------
 vtkVectorsVisu::vtkVectorsVisu()
   :vtkVectorsTensorsVisuBase()
 {
-	_vtkarrowsource		= vtkArrowSource::New();
-	_vtkglyph			= NULL;
-	_vtklinesource		= vtkLineSource	::New();
-	_trans				= vtkTransform	::New();
+					_vtkarrowsource			= vtkArrowSource::New();
+					_vtkglyph				= NULL;
+					_vtklineGlyphPolyData	= NULL;
+					_trans					= vtkTransform	::New();
 
+			double	sizeCross				= 0.05;	
+	
 	double point1[3];
 	double point2[3];
-	point1[0]=1;
-	point1[1]=0;
-	point1[2]=0;
-	point2[0]=-1;
-	point2[1]=0;
-	point2[2]=0;
-	_vtklinesource->SetPoint1( point1 );
-	_vtklinesource->SetPoint2( point2 );
+
+	point1[0] = 1;
+	point1[1] = 0;
+	point1[2] = 0;
+	point2[0] = -1;
+	point2[1] = 0;
+	point2[2] = 0;
+	vtkLineSource 	*vtklinesource1			= vtkLineSource	::New();
+	vtklinesource1->SetPoint1( point1 );
+	vtklinesource1->SetPoint2( point2 );
+	vtklinesource1->Update();
+
+	point1[0] = 0;
+	point1[1] = sizeCross;
+	point1[2] = 0;
+	point2[0] = 0;
+	point2[1] = -sizeCross;
+	point2[2] = 0;
+	vtkLineSource 	*vtklinesource2			= vtkLineSource	::New();
+	vtklinesource2->SetPoint1( point1 );
+	vtklinesource2->SetPoint2( point2 );
+	vtklinesource2->Update();
+
+	point1[0] = 0;
+	point1[1] = 0;
+	point1[2] = sizeCross;
+	point2[0] = 0;
+	point2[1] = 0;
+	point2[2] = -sizeCross;
+	vtkLineSource 	*vtklinesource3			= vtkLineSource	::New();
+	vtklinesource3->SetPoint1( point1 );
+	vtklinesource3->SetPoint2( point2 );
+	vtklinesource3->Update();
+	
+	
+	vtkAppendPolyData *appendPolyData = vtkAppendPolyData::New();
+	appendPolyData->AddInputData( vtklinesource1->GetOutput() );
+	appendPolyData->AddInputData( vtklinesource2->GetOutput() );
+	appendPolyData->AddInputData( vtklinesource3->GetOutput() );
+	appendPolyData->Update();
+	_vtklineGlyphPolyData = appendPolyData->GetOutput();
 }
 
 //------------------------------------------------------------------------------
@@ -65,127 +102,184 @@ vtkVectorsVisu::~vtkVectorsVisu()
 //------------------------------------------------------------------------------
 void vtkVectorsVisu::Process()
 {
+	if (_vtkglyph==NULL) 
+	{
+	 	if (GetOrientation()==-1) 
+		{
+			_vtkglyph = vtkGlyph3D::New(); 
+		} // _orientation			
+	 	if ((GetOrientation()>=0) && (GetOrientation()<=2))
+		{
+			_vtkglyph = vtkGlyph3D::New(); 
+//				_vtkglyph = vtkGlyph2D::New(); 
+		} // _orientation			
+	} // _vtkglyph NULL
+
+
      if(_active==true)
      {
-		if (_vtkglyph==NULL) 
+
+		if (GetDataObject()!=NULL) 
 		{
-		 	if (GetOrientation()==-1) 
-			{
-				_vtkglyph = vtkGlyph3D::New(); 
-			} // _orientation			
-		 	if ((GetOrientation()>=0) && (GetOrientation()<=2))
+	#if VTK_MAJOR_VERSION <= 5
+		     _vtkglyph->SetInput( GetDataObject() );  
+	#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( _vtklineGlyphPolyData );   	
+	#else
+					_vtkglyph->SetSourceData( _vtklineGlyphPolyData );   	
+	#endif
+				}
+		     _vtkglyph->SetScaleModeToScaleByVector();
+
+
+			if (_externalLut==NULL)
 			{
-				_vtkglyph = vtkGlyph3D::New(); 
-//				_vtkglyph = vtkGlyph2D::New(); 
-			} // _orientation			
-		} // _vtkglyph NULL
+		     	_vtkglyph->SetColorModeToColorByVector();   
+			} else {
+				_vtkglyph->SetColorModeToColorByScalar();   
+			} // if _externalLut
 
+		     _vtkglyph->SetScaleFactor( GetScaleFactor() );
+			_vtkglyph->Update();
 
-#if VTK_MAJOR_VERSION <= 5
-         _vtkglyph->SetInput( GetDataObject() );  
-#else
-         _vtkglyph->SetInputData( GetDataObject() );  
-#endif
-			if(GetTypeForm()==1)								// source Arrow
+	#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);
+	//int i,sizeDa = data->GetNumberOfArrays();
+	//for (i=0;i<sizeDa;i++)
+	//{
+	//	data->GetArray(i)->Print(std::cout);
+	//}
+
+			if (_externalLut==NULL)
 			{
-#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();
+				_pdm->ScalarVisibilityOn();
+				_pdm->SetColorModeToMapScalars();
+			//	_pdm->SetColorModeToDefault();
+				// _pdm->SetColorModeToDirectScalars();  // NOT compile
+				_pdm->SetScalarModeToUsePointFieldData();
+			//	_pdm->ImmediateModeRenderingOn();   // obsolete
+			  	_LutEED->SetVectorModeToComponent();
+				//_LutEED->SetVectorModeToRGBColors();
+				//_LutEED->SetVectorModeToMagnitud();
+			//         _pdm->SetScalarModeToUsePointFieldData();
+		     _pdm->SetLookupTable( _LutEED );
+		     _pdm->SelectColorArray( "GlyphVector" );
+			} else {
+				data->SetActiveScalars("angle");
 
+				_pdm->ScalarVisibilityOn(); 
+				double scalarRange[2];
+				scalarRange[0]=0;
+				scalarRange[1]=40;
+	printf("EED warnnning  .....  vtkVectorsVisu::Process   clean scalar Range ......\n");
+	printf("EED warnnning  .....  vtkVectorsVisu::Process   clean scalar Range ......\n");
+	printf("EED warnnning  .....  vtkVectorsVisu::Process   clean scalar Range ......\n");
+	printf("EED warnnning  .....  vtkVectorsVisu::Process   clean scalar Range ......\n");
+	printf("EED warnnning  .....  vtkVectorsVisu::Process   clean scalar Range ......\n");
+				_pdm->SetScalarRange(scalarRange);
+				_pdm->SetColorModeToMapScalars();
+	//			_pdm->SetColorModeToDefault();
+	//			 _pdm->SetColorModeToDirectScalars();  // NOT compile
+	//			_pdm->SetScalarModeToUsePointFieldData();
+//				_pdm->ImmediateModeRenderingOn();   // obsolete
+			     _pdm->SetLookupTable( _externalLut );
+			     _pdm->SelectColorArray( "angle" );
+			}  // if _externalLut
 
-		if (_externalLut==NULL)
-		{
-         	_vtkglyph->SetColorModeToColorByVector();   
-		} else {
-			_vtkglyph->SetColorModeToColorByScalar();   
-		} // if _externalLut
+	printf("EED warnnning  .....  vtkVectorsVisu::Process   Clean angle ......\n");
+	printf("EED warnnning  .....  vtkVectorsVisu::Process   Clean angle ......\n");
+	printf("EED warnnning  .....  vtkVectorsVisu::Process   Clean angle ......\n");
+	printf("EED warnnning  .....  vtkVectorsVisu::Process   Clean angle ......\n");
+	printf("EED warnnning  .....  vtkVectorsVisu::Process   Clean angle ......\n");
 
-         _vtkglyph->SetScaleFactor( GetScaleFactor() );
-		_vtkglyph->Update();
+	/*
+	_vtkglyph->Update();
+	vtkPointData *pointdata=_vtkglyph->GetOutput()->GetPointData();
+	int i,size=pointdata->GetNumberOfArrays();
+	for (i=0;i<size;i++)
+	{
+		vtkDataArray *array=pointdata->GetArray(i);
+		printf(" vtkVectorsVisu::Process array name %d:<%s>  size:%d\n", i, array->GetName(), array->GetSize() );
+	}
+	*/
 
-#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);
-//int i,sizeDa = data->GetNumberOfArrays();
-//for (i=0;i<sizeDa;i++)
-//{
-//	data->GetArray(i)->Print(std::cout);
-//}
+	//       vSliceMapperVec->SetLookupTable( vGreenToRedLut );
+	//       vSliceMapperVec->SetColorModeToMapScalars();
 
+	#if VTK_MAJOR_VERSION <= 5
+			// ..
+	#else
+		     _pdm->Update();
+	#endif
 
-		if (_externalLut==NULL)
-		{
-			_pdm->ScalarVisibilityOn();
-			_pdm->SetColorModeToMapScalars();
-		//	_pdm->SetColorModeToDefault();
-			// _pdm->SetColorModeToDirectScalars();  // NOT compile
-			_pdm->SetScalarModeToUsePointFieldData();
-		//	_pdm->ImmediateModeRenderingOn();   // obsolete
-		  	_LutEED->SetVectorModeToComponent();
-			//_LutEED->SetVectorModeToRGBColors();
-			//_LutEED->SetVectorModeToMagnitud();
-		//         _pdm->SetScalarModeToUsePointFieldData();
-         _pdm->SetLookupTable( _LutEED );
-         _pdm->SelectColorArray( "GlyphVector" );
+			// Orientation -1 3D 	 OK
+	 
+			// Orientation 0 2D yz 
+			if (GetOrientation()==0) 
+			{
+				_trans->Identity();
+				_trans->Translate(900,0,0);
+				_actor->SetUserTransform(_trans);
+			}
+			// Orientation 1 2D xz  
+			if (GetOrientation()==1) 
+			{
+				_trans->Identity();
+				_trans->Translate(0,-900,0);
+				_actor->SetUserTransform(_trans);
+			}
+			// Orientation 2 2D xy  
+			if (GetOrientation()==2) 
+			{
+				_trans->Identity();
+				_trans->Translate(0,0,-900);
+				_actor->SetUserTransform(_trans);
+			}
+
+		    _actor->SetMapper( _pdm );
+		    _actor->GetProperty()->SetOpacity( GetOpacity() );
 		} else {
-			data->SetActiveScalars("angle");
-
-			_pdm->ScalarVisibilityOn(); 
-			double scalarRange[2];
-			scalarRange[0]=0;
-			scalarRange[1]=40;
-printf("EED warnnning  .....  vtkVectorsVisu::Process   clean scalar Range ......\n");
-printf("EED warnnning  .....  vtkVectorsVisu::Process   clean scalar Range ......\n");
-printf("EED warnnning  .....  vtkVectorsVisu::Process   clean scalar Range ......\n");
-printf("EED warnnning  .....  vtkVectorsVisu::Process   clean scalar Range ......\n");
-printf("EED warnnning  .....  vtkVectorsVisu::Process   clean scalar Range ......\n");
-		    _pdm->SetScalarRange(scalarRange);
-			_pdm->SetColorModeToMapScalars();
-//			_pdm->SetColorModeToDefault();
-//			 _pdm->SetColorModeToDirectScalars();  // NOT compile
-//			_pdm->SetScalarModeToUsePointFieldData();
-			_pdm->ImmediateModeRenderingOn();   // obsolete
-	         _pdm->SetLookupTable( _externalLut );
-	         _pdm->SelectColorArray( "angle" );
-		}  // if _externalLut
-
-printf("EED warnnning  .....  vtkVectorsVisu::Process   Clean angle ......\n");
-printf("EED warnnning  .....  vtkVectorsVisu::Process   Clean angle ......\n");
-printf("EED warnnning  .....  vtkVectorsVisu::Process   Clean angle ......\n");
-printf("EED warnnning  .....  vtkVectorsVisu::Process   Clean angle ......\n");
-printf("EED warnnning  .....  vtkVectorsVisu::Process   Clean angle ......\n");
+			printf("EED Warnning! vtkVectorsVisu::Process   GetDataObject()  is EMPTY\n");
+		}// if GetDataObject()!=NULL
 
-/*
-_vtkglyph->Update();
-vtkPointData *pointdata=_vtkglyph->GetOutput()->GetPointData();
-int i,size=pointdata->GetNumberOfArrays();
-for (i=0;i<size;i++)
-{
-	vtkDataArray *array=pointdata->GetArray(i);
-	printf(" vtkVectorsVisu::Process array name %d:<%s>  size:%d\n", i, array->GetName(), array->GetSize() );
-}
-*/
+	_pdm->ScalarVisibilityOn();
+	_pdm->SetColorModeToMapScalars();
+	//_pdm->SetColorModeToDefault();
+	// _pdm->SetColorModeToDirectScalars();  // NOT compile
+	_pdm->SetScalarModeToUsePointFieldData();
+
+//EED2021-09-03 Deprecated. Removed in vtk 8.1
+//	_pdm->ImmediateModeRenderingOn();
 
+  	_LutEED->SetVectorModeToComponent();
+	//_LutEED->SetVectorModeToRGBColors();
+	//_LutEED->SetVectorModeToMagnitud();
+
+//         _pdm->SetScalarModeToUsePointFieldData();
+         _pdm->SetLookupTable( _LutEED );
+         _pdm->SelectColorArray( "GlyphVector" );
 
 //       vSliceMapperVec->SetLookupTable( vGreenToRedLut );
 //       vSliceMapperVec->SetColorModeToMapScalars();
@@ -195,37 +289,12 @@ for (i=0;i<size;i++)
 #else
          _pdm->Update();
 #endif
-
-		// Orientation -1 3D 	 OK
- 
-		// Orientation 0 2D yz 
-		if (GetOrientation()==0) 
-		{
-			_trans->Identity();
-			_trans->Translate(900,0,0);
-			_actor->SetUserTransform(_trans);
-		}
-
-
-		// Orientation 1 2D xz  
-		if (GetOrientation()==1) 
-		{
-			_trans->Identity();
-			_trans->Translate(0,-900,0);
-			_actor->SetUserTransform(_trans);
-		}
-
-		// Orientation 2 2D xy  
-		if (GetOrientation()==2) 
-		{
-			_trans->Identity();
-			_trans->Translate(0,0,-900);
-			_actor->SetUserTransform(_trans);
-		}
-
          _actor->SetMapper( _pdm );
          _actor->GetProperty()->SetOpacity( GetOpacity() );
-    }// if _active
+    } else {
+		_vtkglyph->SetInputData( NULL );  
+		_vtkglyph->Update();
+	}// if _active
 
     VisibilityActor(); 
 }