X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fvtk%2Fsrc%2FbbvtkPolyDataToActor.cxx;h=fefe8eb5887febd3cfed5989061091eaf8c4a70e;hb=dfcd0b84f01eb96e43c2180a35d626cc123a7231;hp=1ec9ff2cd7c62fa3cb42c76e7607a2ad88479175;hpb=9e8c95c96acaea8851733d20090bf6de7eed1269;p=bbtk.git

diff --git a/packages/vtk/src/bbvtkPolyDataToActor.cxx b/packages/vtk/src/bbvtkPolyDataToActor.cxx
index 1ec9ff2..fefe8eb 100644
--- a/packages/vtk/src/bbvtkPolyDataToActor.cxx
+++ b/packages/vtk/src/bbvtkPolyDataToActor.cxx
@@ -46,6 +46,12 @@
 #include "vtkCleanPolyData.h"
 #include "vtkFieldData.h"
 
+//--
+#include <vtkGlyph3D.h>
+#include <vtkArrowSource.h>
+#include <vtkPolyDataNormals.h>
+//--
+
 #include "bbvtkPolyDataToActor.h"
 #include "bbvtkPackage.h"
 
@@ -77,6 +83,7 @@ namespace bbvtk
 	   
 	   bbSetInputScalarVisibilityOn_LookupTable(NULL);
 	   bbSetInputScalarVisibilityOn_NameColorArray("");
+       bbSetInputIn(NULL);
    }
 
 
@@ -157,105 +164,127 @@ er<vtkLookupTable>::New();
 
 void PolyDataToActor::DoProcess()
 {
-		if (bbGetInputRenderer()==NULL)
-		{
-			printf("EED Warnning! PolyDataToActor::DoProcess  missing Renderer.\n");
-		}
-
-
-		if (bbGetInputActive()==true)
-		{
-
-
+    bool ok_removeActor=false;
+    if (bbGetInputRenderer()==NULL)
+    {
+        printf("EED Warnning! PolyDataToActor::DoProcess  missing Renderer.\n");
+    }
+    if (bbGetInputActive()==true)
+    {
+        if (bbGetInputIn()!=NULL)
+        {
 //EED 2017-01-01 Migration VTK7
 #if VTK_MAJOR_VERSION <= 5
-			 polydatamapper->SetInput( bbGetInputIn() );
+             polydatamapper->SetInput( bbGetInputIn() );
 #else
-			 polydatamapper->SetInputData( bbGetInputIn() );  
+             polydatamapper->SetInputData( bbGetInputIn() );
 #endif
-
-			 vtkactor->GetProperty()->SetRepresentation( bbGetInputRepresentation() );
-
-			if (bbGetInputRepresentation()==0)
-			{
-				 vtkactor->GetProperty()->SetAmbient(1);
-				 vtkactor->GetProperty()->SetDiffuse(1);
-				 vtkactor->GetProperty()->SetSpecular(0);
+             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],  
-							bbGetInputColour()[1], 
-							bbGetInputColour()[2] );
-				  
-			 vtkactor->GetProperty()->SetOpacity( bbGetInputOpacity() );
-
-			 
-			 if ( bbGetInputTransform()!=NULL )
-			 {
-				vtkactor->SetUserTransform( bbGetInputTransform() );
-			 }
-
-			 bbSetOutputOut( vtkactor );
-
-			 // Interface Update
-			 if ((actorAdded==false) && (bbGetInputRenderer()!=NULL ))
-			 {
-			   actorAdded=true;
-			   bbGetInputRenderer()->AddActor( vtkactor );
-			 }  // actorAdded
-
-			 if (bbGetInputScalarVisibility()==true )
-			 {
-				polydatamapper->ScalarVisibilityOn();				 	
-				if (bbGetInputScalarVisibilityOn_LookupTable()!=NULL) 
-				{
+            } 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],
+                            bbGetInputColour()[1],
+                            bbGetInputColour()[2] );
+             vtkactor->GetProperty()->SetOpacity( bbGetInputOpacity() );
+             if ( bbGetInputTransform()!=NULL )
+             {
+                vtkactor->SetUserTransform( bbGetInputTransform() );
+             }
+             bbSetOutputOut( vtkactor );
+            
+            
+/*  /  >>>>
+ AAAAA
+            vtkArrowSource *arrow = vtkArrowSource::New();
+            vtkPolyDataNormals *normals = vtkPolyDataNormals::New();
+            normals->SetInputData( bbGetInputIn() );
+            vtkGlyph3D *glyph = vtkGlyph3D::New();
+            glyph->SetInputData(normals->GetOutput() );
+            glyph->SetSourceData(arrow->GetOutput() );
+            glyph->SetVectorModeToUseNormal();
+            glyph->SetScaleModeToScaleByVector();
+            glyph->SetScaleFactor(10);
+            vtkPolyDataMapper *mapper2 = vtkPolyDataMapper::New();
+            mapper2->SetInputData( glyph->GetOutput() );
+            vtkActor *actor2 = vtkActor::New();
+            actor2->SetMapper(mapper2);
+            actor2->GetProperty()->SetColor(1, 0, 0);
+*/
+
+            
+            
+             // Interface Update
+             if ((actorAdded==false) && (bbGetInputRenderer()!=NULL ))
+             {
+               actorAdded=true;
+               bbGetInputRenderer()->AddActor( vtkactor );
+//--
+//                 bbGetInputRenderer()->AddActor( actor2 );
+//--
+                 
+                 
+             }  // actorAdded
+             if (bbGetInputScalarVisibility()==true )
+             {
+                polydatamapper->ScalarVisibilityOn();
+                if (bbGetInputScalarVisibilityOn_LookupTable()!=NULL)
+                {
 //					polydatamapper->SetScalarModeToDefault();
-//					polydatamapper->SetScalarModeToUseCellData();	
-//					polydatamapper->SetScalarModeToUseCellFieldData();	
+//					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
-		} else {
-			 // Interface Update
-			 if ((actorAdded==true) && (bbGetInputRenderer()!=NULL ))
-			 {
-			   actorAdded=false;
-			   bbGetInputRenderer()->RemoveActor( vtkactor );
-			 }  // actorAdded
-		} // Active
+                    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
+        } else {
+            ok_removeActor=true;
+//            printf("EED Warnning! PolyDataToActor::DoProcess   In (PolyData) not defined. \n"  );
+        }// if In !=NULL
+    } else {
+         ok_removeActor=true;
+    } // Active
+    
+    if (ok_removeActor==true)
+    {
+        // Interface Update
+        if ((actorAdded==true) && (bbGetInputRenderer()!=NULL ))
+        {
+          actorAdded=false;
+          bbGetInputRenderer()->RemoveActor( vtkactor );
+        }  // actorAdded
+    } // if ok_removeActor
+    
 }
 
-
-
 } // EO namespace bbtk
 
 #endif //_USE_VTK_