X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaVtk%2FvtkVectorsTensorsVisuBase.cpp;h=c591a5f9beceaf7413a0cab2d0f1242756f1865d;hb=05400a294e401b74b2e7a3058f6a4ee3decfc62d;hp=3d7c20bba4595da8466fa35800fc7668c56c2e32;hpb=3582c0f9b8380fde739856aa6a188da3262cf03b;p=creaVtk.git

diff --git a/lib/creaVtk/vtkVectorsTensorsVisuBase.cpp b/lib/creaVtk/vtkVectorsTensorsVisuBase.cpp
index 3d7c20b..c591a5f 100644
--- a/lib/creaVtk/vtkVectorsTensorsVisuBase.cpp
+++ b/lib/creaVtk/vtkVectorsTensorsVisuBase.cpp
@@ -105,41 +105,24 @@ void vtkLookupTableMapDirVectorEED(vtkLookupTableDirectionVector *self, T *input
                           int inIncr, int outFormat)
 {
 	double tmp,sum;
-//	double *mag;
 	int i, j;
 	double dirx,diry,dirz;
-	
-	
-inIncr=3;
-	printf("EED length %d  %p\n", length,input);
-//	mag = new double[length];
+	double angle;
 	for (i = 0; i < length; ++i)
     {
-		dirx	= 0;
-		diry	= 0;
-		dirz	= 0;
-		sum	= 0;
-		for (j = 0; j < inIncr; ++j)
-		{
-			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;
-		}
-		sum=sqrt(sum);
-		*output++ = (unsigned char) abs( (255*dirx/sum) );
-		*output++ = (unsigned char) abs( (255*diry/sum) );
-		*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);
-	
-//	delete [] mag;
+			dirx	= static_cast<T>(input[0]);
+			diry	= static_cast<T>(input[1]);
+			dirz	= static_cast<T>(input[2]);
+			input	= input+inIncr;
+			sum		= sqrt( dirx*dirx + diry*diry + dirz*dirz );
+			*output++ = (unsigned char) abs( (255*dirx/sum) );
+			*output++ = (unsigned char) abs( (255*diry/sum) );
+			*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);
+
+	} // for
 }
 
 
@@ -151,7 +134,6 @@ void vtkLookupTableDirectionVector::MapScalarsThroughTable2(void *input,
                                              int inputIncrement,
                                              int outputFormat)
 {
-  printf("vtkLookupTableEED::MapScalarsThroughTable2 inputIncrement=%d   inputDataType=%d\n",inputIncrement,inputDataType);
 // if (this->UseMagnitude && inputIncrement > 1)
 // {
      switch (inputDataType)
@@ -194,8 +176,10 @@ vtkVectorsTensorsVisuBase::vtkVectorsTensorsVisuBase()
    	_dataobject		= NULL;
    	_renderer		= NULL;
 	_typeForm		= 0;
+	_orientation	= 0;
 
-	_LutEED 	= vtkLookupTableDirectionVector::New();
+	_LutEED 		= vtkLookupTableDirectionVector::New();
+	_externalLut 	= NULL;
 	//_LutEED->SetVectorMode(0);
 	//_LutEED->SetVectorModeToMagnitude();
 	//_LutEED->SetVectorModeToComponent();
@@ -338,4 +322,21 @@ void vtkVectorsTensorsVisuBase::SetColor(std::vector<double> rgb)
 	}
 }
 
+//------------------------------------------------------------------------------
+void vtkVectorsTensorsVisuBase::SetOrientation(int orientation)
+{
+	_orientation = orientation;
+}
+
+//------------------------------------------------------------------------------
+int vtkVectorsTensorsVisuBase::GetOrientation()
+{
+	return _orientation;
+}
+
+//------------------------------------------------------------------------------
+void vtkVectorsTensorsVisuBase::SetExternalLut(vtkScalarsToColors* lut)
+{
+	_externalLut=lut;
+}