X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcreaVtk%2FcreaVtkHeartAngles.h;h=a610d391e6b661e07c9900766e0a1d17305d68ec;hb=37c4761e82cf635a719484f2b80f1e207cc03d02;hp=f04c5128dd453cb7ed08d37ea1cfcb5652bf7d22;hpb=90c71e060662977373f6cd7254e6e492f85d3935;p=creaVtk.git

diff --git a/lib/creaVtk/creaVtkHeartAngles.h b/lib/creaVtk/creaVtkHeartAngles.h
index f04c512..a610d39 100644
--- a/lib/creaVtk/creaVtkHeartAngles.h
+++ b/lib/creaVtk/creaVtkHeartAngles.h
@@ -27,7 +27,7 @@
 
 #ifndef _CREAVTKHEARTANGLES_H_
 #define _CREAVTKHEARTANGLES_H_
-
+#include "vtkImageData.h"
 
 class creaVtkHeartAngles
 {
@@ -35,19 +35,24 @@ class creaVtkHeartAngles
 public :
   creaVtkHeartAngles();
   ~creaVtkHeartAngles();
+	vtkImageData* getAlphaImage ();
+	vtkImageData* getBetaImage ();
 	//Parametros: Punto P0, vector V, Vector V'(proyection de V)
 	double alpha (double P0a, double P0b,double P0c, double vx, double vy, double vz, double vxp, double vyp, double vzp);
-	//Parametros: Punto P0, Punto P3, Punto P4 (proyection de V)
-	double beta (double P0a, double P0b,double P0c, double P3x, double P3y, double P3z, double P4x, double P4y, double P4z);
-	//Parametros: punto del plano, normalPlano, vector V.
-	double * vectorProjection (double plx, double ply, double plz, double nx, double ny, double nz, double vx, double vy, double vz);
+	//Parametros: Punto P0, Punto P2, Punto P4 (proyection de V)
+	double beta (double P0a, double P0b,double P0c, double P2x, double P2y, double P2z, double P4x, double P4y, double P4z);
+	//Parametros: normalPlano, vector V.
+	double * vectorProjection (double nx, double ny, double nz, double vx, double vy, double vz);
 	//Parametros: Tres puntos del plano, dos puntos de la recta.
 	double *intersectionPlaneLine(double plx1, double ply1, double plz1, double plx2, double ply2, double plz2, double plx3, double ply3, double plz3, double px1, double py1, double pz1,double px2, double py2, double pz2);
-
+	//Parametros: Imagen 3D, Punto en el plano, Normal, p2.
+	void calculateImages (vtkImageData* image, double Px, double Py, double Pz, double Nx, double Ny, double Nz, double p2x, double p2y, double p2z);
+		
 protected:
 
 private:
-
+	vtkImageData* alphaImage;
+	vtkImageData* betaImage;
 };
 
 //-end of _CREAVTKHEARTANGLES_H_------------------------------------------------------