X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk_creaVtk_PKG%2Fsrc%2FbbcreaVtkHeartAngles.cxx;h=fc496d08768fb74c82d5611f1dc9da366ecbf8e3;hb=37c4761e82cf635a719484f2b80f1e207cc03d02;hp=c8ddd49a4f72fce8567c1337bf2e08e1457f1eaa;hpb=ebac11ff6732523c5d24859e67cec41210e6fc2f;p=creaVtk.git

diff --git a/bbtk_creaVtk_PKG/src/bbcreaVtkHeartAngles.cxx b/bbtk_creaVtk_PKG/src/bbcreaVtkHeartAngles.cxx
index c8ddd49..fc496d0 100644
--- a/bbtk_creaVtk_PKG/src/bbcreaVtkHeartAngles.cxx
+++ b/bbtk_creaVtk_PKG/src/bbcreaVtkHeartAngles.cxx
@@ -15,10 +15,27 @@ BBTK_BLACK_BOX_IMPLEMENTATION(HeartAngles,bbtk::AtomicBlackBox);
 //===== 
 void HeartAngles::Process()
 {
+	std::cout << "CFT HeartAngles::Process() Start"<<std::endl;
 	creaVtkHeartAngles ha;
-	ha.calculateImages (bbGetInputImage(), bbGetInputPx(), bbGetInputPy(), bbGetInputPz(), bbGetInputVx(), bbGetInputVy(), bbGetInputVz(), bbGetInputNx(), bbGetInputNy(), bbGetInputNz(), bbGetInputp2x(), bbGetInputp2y(), bbGetInputp2z());
+	
+	//ha.calculateImages (bbGetInputImage(), bbGetInputPlanePoint()[0], bbGetInputPlanePoint()[1], bbGetInputPlanePoint()[2], bbGetInputVector()[0], bbGetInputVector()[1], bbGetInputVector()[2], bbGetInputNormal()[0], bbGetInputNormal()[1], bbGetInputNormal()[2], bbGetInputPoint2()[0], bbGetInputPoint2()[1], bbGetInputPoint2()[2]);
+//	bbSetOutputAlphaImage(ha.getAlphaImage());
+	double p2x = bbGetInputNormal()[0]+ bbGetInputPlanePoint()[0];
+	double p2y = bbGetInputNormal()[1]+ bbGetInputPlanePoint()[1];
+	double p2z = bbGetInputNormal()[2]+ bbGetInputPlanePoint()[2];
+
+	double Nx = bbGetInputNormal()[0];
+	double Ny = bbGetInputNormal()[1];
+	double Nz = bbGetInputNormal()[2];
+
+	double Px = bbGetInputPlanePoint()[0];
+	double Py = bbGetInputPlanePoint()[1];
+	double Pz = bbGetInputPlanePoint()[2];
+
+	ha.calculateImages (bbGetInputImage(), Px, Py, Pz, Nx, Ny, Nz, p2x, p2y, p2z);
 	bbSetOutputAlphaImage(ha.getAlphaImage());
 	bbSetOutputBetaImage(ha.getBetaImage());
+	std::cout << "CFT HeartAngles::Process() End"<<std::endl;
 }
 //===== 
 // Before editing this file, make sure it's a file of your own (i.e.: it wasn't generated from xml description; if so : your modifications will be lost)