X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk_creaVtk_PKG%2Fsrc%2FbbcreaVtkVectorsExtraction.cxx;h=38f2ffb1e9c8f34d1712daf04c3578bad6a550a8;hb=deba2ca0e15d275b9c2e80000697d5068ef3efa9;hp=eae8d6767875548d4c35c5c1bc5f99e049598359;hpb=a4ea6666ebd55839aef25e255d3337340c088284;p=creaVtk.git

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkVectorsExtraction.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkVectorsExtraction.cxx
index eae8d67..38f2ffb 100644
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkVectorsExtraction.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkVectorsExtraction.cxx
@@ -45,6 +45,7 @@ void VectorsExtraction::Process()
 
       double ang1 = 0;//Angle 1
       double ang2 = 0;//ANgle 2
+      double comp = 0;//Component x + y
 
       //Find coordinate into the image      
       m_idType = m_VectorImage->FindPoint(coord[0],coord[1],coord[2]);
@@ -65,14 +66,25 @@ void VectorsExtraction::Process()
 
 
       //Miss calcule of angles -----
+      comp = sqrt((vec[0]*vec[0])+(vec[1]*vec[1]));
+      
+      ang1 = atan2(vec[2],comp) * 180 / PI;
 
-      ang1 = vec[0]*80;
-   	ang2 = vec[1]*10;
+
+      ang2 = atan2(vec[1],vec[0]) * 180 / PI;
+
+      
    		//m_VectorImage->Print(std::cout);
 
+      std::cout << "ang1: " << ang1 << std::endl;
+      std::cout << "ang2: " << ang2 << std::endl;
+
    	bbSetOutputAngle1(ang1);
    	bbSetOutputAngle2(ang2);
       bbSetOutputVector(vec);
+      bbSetOutputX(coord[0]);
+      bbSetOutputY(coord[1]);
+      bbSetOutputZ(coord[2]);
 
    	}// if image != NULL