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

diff --git a/lib/creaVtk/vtkVectorsVisu.cpp b/lib/creaVtk/vtkVectorsVisu.cpp
index d95b454..eee31ee 100644
--- a/lib/creaVtk/vtkVectorsVisu.cpp
+++ b/lib/creaVtk/vtkVectorsVisu.cpp
@@ -37,52 +37,93 @@
 vtkVectorsVisu::vtkVectorsVisu()
   :vtkVectorsTensorsVisuBase()
 {
-	_vtkarrowsource	= vtkArrowSource::New();
+	_vtkarrowsource		= vtkArrowSource::New();
+<<<<<<< HEAD
 	_vtklinesource		= vtkLineSource::New();
+=======
+>>>>>>> master
 	_vtkglyph			= vtkGlyph3D::New();
-}
+	_vtklinesource		= vtkLineSource::New();
 
+	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 );
+}
 
 //------------------------------------------------------------------------------
 vtkVectorsVisu::~vtkVectorsVisu()
 {
 }
 
+
 //------------------------------------------------------------------------------
 void vtkVectorsVisu::Process()
 {
-printf("EED vtkVectorsVisu::Process()  start\n");
+<<<<<<< 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() );
-         _vtkglyph->Update();
+<<<<<<< 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);
 //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++)
 {
+<<<<<<< HEAD
 	printf("EED vtkVectorsVisu::Process-name %d, %s \n", i, data->GetArrayName(i) );
-	data->GetArray(i)->Print(std::cout);
-	printf("EED -------------------------------------------\n");
 }
 
 //EED         _pdm->SetScalarRange( range );
@@ -96,23 +137,39 @@ for (i=0;i<sizeDa;i++)
 //EED         pointdata->AddArray( nda );
 //EED         bbGetInputIn()->GetPointData()->AddArray( nda );
 //EED2         _pdm->ScalarVisibilityOn();
-         _pdm->SetScalarModeToUsePointFieldData();
+
+=======
+	data->GetArray(i)->Print(std::cout);
+}
+
+>>>>>>> master
+	_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" );
 
 //       vSliceMapperVec->SetLookupTable( vGreenToRedLut );
 //       vSliceMapperVec->SetColorModeToMapScalars();
 
+#if VTK_MAJOR_VERSION <= 5
+		// ..
+#else
+         _pdm->Update();
+#endif
          _actor->SetMapper( _pdm );
          _actor->GetProperty()->SetOpacity( GetOpacity() );
     }// if _active
 
     VisibilityActor(); 
-printf("EED vtkVectorsVisu::Process()  end\n");
 }
-	
-
-
-
-