X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaVtk%2FvtkVectorsTensorsVisuBase.cpp;h=094eebc40db7d2390744ac416cef2de54b65458e;hb=33a2fbec2921c504fd037bdcfd4f156cca8ee118;hp=405d741b32294ff3a936cb7bcc29967d591e31ed;hpb=08174c39ec53c37ea8ea7d6c97cf9f7af13659da;p=creaVtk.git

diff --git a/lib/creaVtk/vtkVectorsTensorsVisuBase.cpp b/lib/creaVtk/vtkVectorsTensorsVisuBase.cpp
index 405d741..094eebc 100644
--- a/lib/creaVtk/vtkVectorsTensorsVisuBase.cpp
+++ b/lib/creaVtk/vtkVectorsTensorsVisuBase.cpp
@@ -26,13 +26,8 @@
 */
 
 #include "vtkVectorsTensorsVisuBase.h"
-
-
 #include "vtkObjectFactory.h"
 
-
-
-
 vtkStandardNewMacro(vtkLookupTableDirectionVector);
 
 // Construct with range=(0,1); and hsv ranges set up for rainbow color table 
@@ -48,14 +43,11 @@ vtkLookupTableDirectionVector::~vtkLookupTableDirectionVector()
 {
 }
 
-
-
 unsigned char *vtkLookupTableDirectionVector::MapValue(double v)
 {
 	
 	//int idx = this->GetIndex(v);
-	//return (this->Table->GetPointer(0) + 4*idx);
-	
+	//return (this->Table->GetPointer(0) + 4*idx);	
 	return 0;
 }
 
@@ -118,6 +110,7 @@ void vtkLookupTableMapDirVectorEED(vtkLookupTableDirectionVector *self, T *input
 	double dirx,diry,dirz;
 	
 	
+inIncr=3;
 	printf("EED length %d  %p\n", length,input);
 //	mag = new double[length];
 	for (i = 0; i < length; ++i)
@@ -125,13 +118,13 @@ void vtkLookupTableMapDirVectorEED(vtkLookupTableDirectionVector *self, T *input
 		dirx	= 0;
 		diry	= 0;
 		dirz	= 0;
-		sum		= 0;
+		sum	= 0;
 		for (j = 0; j < inIncr; ++j)
 		{
-			if (j==0) dirx= static_cast<double>(*input);  
-			if (j==1) diry= static_cast<double>(*input);  
-			if (j==2) dirz= static_cast<double>(*input);  
-			tmp = static_cast<double>(*input);  
+			if (j==0) dirx= static_cast<T>(*input);  
+			if (j==1) diry= static_cast<T>(*input);  
+			if (j==2) dirz= static_cast<T>(*input);  
+			tmp = static_cast<T>(*input);  
 			sum += (tmp * tmp);
 			++input;
 		}
@@ -141,6 +134,7 @@ void vtkLookupTableMapDirVectorEED(vtkLookupTableDirectionVector *self, T *input
 		*output++ = (unsigned char) abs( (255*dirz/sum) );
 		*output++ = 255;
 //		printf("%d %d %d   ",(int)(255*dirx/sum),(int)(255*diry/sum),(int)(255*dirz/sum));
+//		printf(" C     %d        %f %f %f   \n",inIncr,dirx,diry,dirz);
     }
 	
 //	vtkLookupTableMapData(self, mag, output, length, 1, outFormat);
@@ -149,7 +143,6 @@ void vtkLookupTableMapDirVectorEED(vtkLookupTableDirectionVector *self, T *input
 }
 
 
-
 //----------------------------------------------------------------------------
 void vtkLookupTableDirectionVector::MapScalarsThroughTable2(void *input, 
                                              unsigned char *output,
@@ -192,22 +185,15 @@ void vtkLookupTableDirectionVector::PrintSelf(ostream& os, vtkIndent indent)
 //----------------------------------
 //----------------------------------
 
-
-
-
-
-
-
-
 vtkVectorsTensorsVisuBase::vtkVectorsTensorsVisuBase()
 {
-        _firsttime	= true;
-   	_active		= false;
+     _firsttime		= true;
+   	_active			= false;
    	_scalefactor	= 1;
-   	_opacity	= 1;
-   	_dataobject	= NULL;
-   	_renderer	= NULL;
-	_typeForm	= 0;
+   	_opacity		= 1;
+   	_dataobject		= NULL;
+   	_renderer		= NULL;
+	_typeForm		= 0;
 
 	_LutEED 	= vtkLookupTableDirectionVector::New();
 //	_LutEED->SetVectorMode(0);
@@ -215,11 +201,9 @@ vtkVectorsTensorsVisuBase::vtkVectorsTensorsVisuBase()
 //_LutEED->SetVectorModeToComponent();
 _LutEED->SetVectorModeToRGBColors();
 
-
-
-	_pdm 		= vtkPolyDataMapper::New();
-	_actor 		= vtkActor::New();
-	_actorAdded	= false;
+	_pdm 			= vtkPolyDataMapper::New();
+	_actor 			= vtkActor::New();
+	_actorAdded		= false;
 }
 
 vtkVectorsTensorsVisuBase::~vtkVectorsTensorsVisuBase()
@@ -312,8 +296,6 @@ void vtkVectorsTensorsVisuBase::Process()    // virtual
 {
 }
 
-
-
 //------------------------------------------------------------------------------
 void vtkVectorsTensorsVisuBase::VisibilityActor()
 {
@@ -321,20 +303,39 @@ void vtkVectorsTensorsVisuBase::VisibilityActor()
 	if ( (_active==true) && (_actorAdded==false) ){
 		if (GetRenderer()!=NULL)
 		{
-	           GetRenderer()->AddActor(_actor);
+	      GetRenderer()->AddActor(_actor);
 		   _actorAdded=true;
-       		 } // if Renderer
+       } // if Renderer
 	} // if _active==true 
 
 	if ( (_active==false) && (_actorAdded==true) ){
 		if (GetRenderer()!=NULL)
 		{
-	           GetRenderer()->RemoveActor(_actor);
+	      GetRenderer()->RemoveActor(_actor);
 		   _actorAdded=false;
-       		 } // if Renderer
+      } // if Renderer
 	} // if _active==false  
 }
 
+//------------------------------------------------------------------------------
+void vtkVectorsTensorsVisuBase::SetColorLaw(int colorlaw)
+{
+	_colorlaw = colorlaw;
+}
 
+//------------------------------------------------------------------------------
+void vtkVectorsTensorsVisuBase::SetColor(std::vector<double> rgb)
+{
+	if (rgb.size()==3)
+	{
+		_colorR=rgb[0];
+		_colorG=rgb[1];
+		_colorB=rgb[2];
+	} else {
+		_colorR=1;
+		_colorG=1;
+		_colorB=1;
+	}
+}