X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkPolyDataToActor.cxx;h=0002d6c097da8fa273ae7dbd89099e41b5fa8359;hb=ab91e25f4ca81c10788da1fdd681a87f1f17641e;hp=58852e83ed9df71d7b01f60835d83c4e7aff505b;hpb=427d8c0ac838ab789a57b28f62a7f9ff243e7b60;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkPolyDataToActor.cxx b/packages/vtk/src/bbvtkPolyDataToActor.cxx
index 58852e8..0002d6c 100644
--- a/packages/vtk/src/bbvtkPolyDataToActor.cxx
+++ b/packages/vtk/src/bbvtkPolyDataToActor.cxx
@@ -43,10 +43,14 @@
 
 #include "vtkProperty.h"
 #include "vtkLinearTransform.h"
+#include "vtkCleanPolyData.h"
+#include "vtkFieldData.h"
 
 #include "bbvtkPolyDataToActor.h"
 #include "bbvtkPackage.h"
 
+#include "vtkRenderWindow.h"
+
 namespace bbvtk
 {
    BBTK_ADD_BLACK_BOX_TO_PACKAGE(vtk,PolyDataToActor)
@@ -60,7 +64,6 @@ namespace bbvtk
 	   colour.push_back(1.0);
 	   colour.push_back(0.5);
 	   bbSetInputColour(colour);
-
 	   bbSetInputActive(true);
 	   bbSetInputIn(NULL);
 	   bbSetInputRenderer(NULL);
@@ -69,9 +72,11 @@ namespace bbvtk
 	   bbSetInputRepresentation(2);
 	   bbSetInputLineWidth(1);
 	   bbSetInputScalarVisibility(false);
-
 	   polydatamapper = NULL;
 	   vtkactor       = NULL;
+	   
+	   bbSetInputScalarVisibilityOn_LookupTable(NULL);
+	   bbSetInputScalarVisibilityOn_NameColorArray("");
    }
 
 
@@ -84,7 +89,7 @@ namespace bbvtk
 //     polydatamapper->SetInput(marchingcubes->GetOutput());
      vtkactor->SetMapper(polydatamapper);
 
-     polydatamapper->ImmediateModeRenderingOn();
+//     polydatamapper->ImmediateModeRenderingOn();
    }
 
 	//---------------------------------------------------------------------
@@ -103,15 +108,92 @@ namespace bbvtk
 	}
 	
 	
+	
+	
+/*
+
+-----------------------------------------------
+
+https://vtk.org/Wiki/VTK/Examples/Cxx/Visualization/ScalarBarActor
+https://vtk.org/Wiki/VTK/Examples/Cxx/VisualizationAlgorithms/TubesFromSplines
+https://vtk.org/Wiki/VTK/Examples/Cxx/Visualization/ElevationBandsWithGlyphs
+
+vtkSmartPointer<vtkFloatArray> scalars = vtkSmartPointer<vtkFloatArray>::New();
+  scalars  set value ....
+poly->GetPointData()->SetScalars(scalars);  or   poly->GetPointData()->SetActiveScalars("<NameArray>");
+
+vtkSmartPointer<vtkLookupTable> hueLut =    vtkSmartPoint      |                                                 ^~
+er<vtkLookupTable>::New();  
+  hueLut Build ....
+ 
+  mapper->SetInputData(poly);
+  mapper->ScalarVisibilityOn();
+   	mapper->SetScalarModeToUsePointData();   Point of Cell ...
+  	  
+    default: mapper->SetColorModeToDirectScalars() Busca scalars  3 componentes [R,G,B]  float  0..1  or  integer 0..255
+    else:
+      mapper->SetColorModeToMapScalars()  El vector scalar solo tiene un componente
+      mapper->SetLookupTable( hueLut );  
+	  
+	  	To change Array
+	  	mapper->SelectColorArray("<NameVector>");   
+   
+	mapper->SetUseLookupTableScalarRange( true/false )    true:Para compartir lookuptable con otros mappers 
+		si false then
+		mapper->SetScalarRange( min, max);    Range especifico este mapper
+	    mapper->SetScalarRange( tubePolyData->GetScalarRange() );
+
+------------------------------------------
+   
+     mapper->ScalarVisibilityOff();      ->  SetScalarModeToDefault()
+        Utiliza el color del actor
+  
+----------------------------------------
+
+*/	
+	
+	
 //---------------------------------------------------------------------
 
-	void PolyDataToActor::DoProcess()
-   	{
+void PolyDataToActor::DoProcess()
+{
+		if (bbGetInputRenderer()==NULL)
+		{
+			printf("EED Warnning! PolyDataToActor::DoProcess  missing Renderer.\n");
+		}
+
 
 		if (bbGetInputActive()==true)
 		{
+
+
+//EED 2017-01-01 Migration VTK7
+#if VTK_MAJOR_VERSION <= 5
 			 polydatamapper->SetInput( bbGetInputIn() );
+#else
+			 polydatamapper->SetInputData( bbGetInputIn() );  
+#endif
+
 			 vtkactor->GetProperty()->SetRepresentation( bbGetInputRepresentation() );
+
+			if (bbGetInputRepresentation()==0)
+			{
+				 vtkactor->GetProperty()->SetAmbient(1);
+				 vtkactor->GetProperty()->SetDiffuse(1);
+				 vtkactor->GetProperty()->SetSpecular(0);
+printf("EED WARNNING!  PolyDataToActor::DoProcess  which is the default values of Ambient, Diffuse, Specular for points option? \n");
+			} else if (bbGetInputRepresentation()==1)
+			{
+				 vtkactor->GetProperty()->SetAmbient(1);
+				 vtkactor->GetProperty()->SetDiffuse(1);
+				 vtkactor->GetProperty()->SetSpecular(0);
+			} else if (bbGetInputRepresentation()==2)
+			{
+				 vtkactor->GetProperty()->SetAmbient(0);
+				 vtkactor->GetProperty()->SetDiffuse(1);
+				 vtkactor->GetProperty()->SetSpecular(0);
+			}
+
 			 vtkactor->GetProperty()->SetLineWidth( bbGetInputLineWidth() );
 			   
 			 vtkactor->GetProperty()->SetColor( bbGetInputColour()[0],  
@@ -119,6 +201,7 @@ namespace bbvtk
 							bbGetInputColour()[2] );
 				  
 			 vtkactor->GetProperty()->SetOpacity( bbGetInputOpacity() );
+
 			 
 			 if ( bbGetInputTransform()!=NULL )
 			 {
@@ -136,7 +219,28 @@ namespace bbvtk
 
 			 if (bbGetInputScalarVisibility()==true )
 			 {
-				 polydatamapper->ScalarVisibilityOn();
+				polydatamapper->ScalarVisibilityOn();				 	
+				if (bbGetInputScalarVisibilityOn_LookupTable()!=NULL) 
+				{
+//					polydatamapper->SetScalarModeToDefault();
+//					polydatamapper->SetScalarModeToUseCellData();	
+//					polydatamapper->SetScalarModeToUseCellFieldData();	
+//					polydatamapper->SetScalarModeToUseFieldData();    //    1/2  	hausdorff->SetTargetDistanceMethodToPointToCell();
+//					polydatamapper->SetScalarModeToUsePointData();	 // *
+					polydatamapper->SetScalarModeToUsePointFieldData();
+					
+					polydatamapper->SetColorModeToMapScalars();
+					polydatamapper->SetLookupTable( bbGetInputScalarVisibilityOn_LookupTable() );
+					if (bbGetInputScalarVisibilityOn_NameColorArray()!="") 
+					{
+						polydatamapper->SelectColorArray( bbGetInputScalarVisibilityOn_NameColorArray().c_str() );
+					}
+					if (bbGetInputScalarVisibilityOn_ScalarRange().size()==2)
+					{
+						polydatamapper->SetScalarRange(  bbGetInputScalarVisibilityOn_ScalarRange()[0] , bbGetInputScalarVisibilityOn_ScalarRange()[1]   ); 
+					}
+					
+				 } // if ScalarVisibilityOn_LookupTable
 			 } else {
 				 polydatamapper->ScalarVisibilityOff();
 			 } // ScalarVisibility
@@ -148,7 +252,7 @@ namespace bbvtk
 			   bbGetInputRenderer()->RemoveActor( vtkactor );
 			 }  // actorAdded
 		} // Active
-	}
+}