X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Fkernel%2FPlanesOperations.cxx;h=a87830acf664837290cc268f1b654c38797f02cb;hb=a3bf4fd2420496a16c98c8490101f54d25eeb7d3;hp=001f2722e1f6a0f1c1422dcb910f5cf94e60915e;hpb=e42ecf415793e6f85e5de98b41385fe53b6d00e0;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/kernel/PlanesOperations.cxx b/lib/maracasVisuLib/src/kernel/PlanesOperations.cxx
index 001f272..a87830a 100644
--- a/lib/maracasVisuLib/src/kernel/PlanesOperations.cxx
+++ b/lib/maracasVisuLib/src/kernel/PlanesOperations.cxx
@@ -5,16 +5,21 @@
 ** Start of data viewmanagerData
 *********************************************************************************************/
 
-PlanesOperations::PlanesOperations(){	
+using namespace std;
+
+PlanesOperations::PlanesOperations()
+{	
 }
 
 
-PlanesOperations::~PlanesOperations(){
+PlanesOperations::~PlanesOperations()
+{
 
 }
 
 
-double* PlanesOperations::getCrossProduct(double* vect0,double* vect1){
+double* PlanesOperations::getCrossProduct(double* vect0,double* vect1)
+{
 	double* vectCross;
 	vectCross = new double[3];
 	vectCross[0] = vect0[1]*vect1[2]-(vect0[2]*vect1[1]);
@@ -26,29 +31,28 @@ double* PlanesOperations::getCrossProduct(double* vect0,double* vect1){
 /**
 **	Returns the magnitud of the given vector
 **/
-double PlanesOperations::getMagnitud(double* vect){
-
+double PlanesOperations::getMagnitud(double* vect)
+{
 	double mag;
 
 	mag = sqrt(pow(vect[0],2) + pow(vect[1],2) + pow(vect[2],2));
 
-	std::cout<<"mag "<<mag <<std::endl;
+	//std::cout<<"mag "<<mag <<std::endl;
 
 	return mag;
-
 }
 /**
 **	returns the unitary vector of the given vector
 **	u = 1/|vect| . vect
 **/
-double* PlanesOperations::getNormal(double* vect){
+double* PlanesOperations::getNormal(double* vect)
+{
 
 	double* vectnorm;
 	double mag = getMagnitud(vect);
 
 	vectnorm = new double[3];
 	
-
 	if(mag!=0){
 		vectnorm[0] = vect[0]/mag;
 		vectnorm[1] = vect[1]/mag;
@@ -58,13 +62,11 @@ double* PlanesOperations::getNormal(double* vect){
 		vectnorm[1] = 0;
 		vectnorm[2] = 0;
 	}
-
 	return vectnorm;
-
-
 }
 
-double* PlanesOperations::makeVector(double podouble0[3], double podouble1[3]){
+double* PlanesOperations::makeVector(double *podouble0, double *podouble1)
+{
 	double *vect;
 	vect = new double[3];
 
@@ -73,5 +75,136 @@ double* PlanesOperations::makeVector(double podouble0[3], double podouble1[3]){
 	vect[2]= podouble1[2]-podouble0[2];
 
 	return vect;
+}
+
+void PlanesOperations::getCrossProduct(double* vect0,double* vect1, double* vectres){
+    vectres[0] = vect0[1]*vect1[2]-(vect0[2]*vect1[1]);
+    vectres[1] = -(vect0[0]*vect1[2]-(vect0[2]*vect1[0]));
+    vectres[2] = vect0[0]*vect1[1]-(vect0[1]*vect1[0]);
+}
+
+void PlanesOperations::getNormal(double* vect, double* vectnorm){
+
+    double mag = getMagnitud(vect);
+
+    if(mag!=0){
+            vectnorm[0] = vect[0]/mag;
+            vectnorm[1] = vect[1]/mag;
+            vectnorm[2] = vect[2]/mag;
+    }else{
+            vectnorm[0] = 0;
+            vectnorm[1] = 0;
+            vectnorm[2] = 0;
+    }
+}
+
+void PlanesOperations::makeVector(double* podouble0, double* podouble1, double* vectres){
+    vectres[0] = podouble1[0] - podouble0[0];
+    vectres[1] = podouble1[1] - podouble0[1];
+    vectres[2] = podouble1[2] - podouble0[2];
+}
+
+double PlanesOperations::getDotProduct(double* vect0,double* vect1){
+	return vect0[0]*vect1[0] + vect0[1]*vect1[1] + vect0[2]*vect1[2];
+}
+
+void PlanesOperations::addVectors(double* vect0, double* vect1, double*vectres){
+
+    vectres[0]= vect0[0] + vect1[0];
+    vectres[1]= vect0[1] + vect1[1];
+    vectres[2]= vect0[2] + vect1[2];
+}
+
+void PlanesOperations::scalarVector(double* vect0, double scalar, double*vectres){
+
+    vectres[0]= vect0[0]*scalar;
+    vectres[1]= vect0[1]*scalar;
+    vectres[2]= vect0[2]*scalar;
+}
+
+vector<double> PlanesOperations::getCrossProduct(vector<double> vect0,vector<double> vect1){
+  
+	vector<double> vectCross;
+	
+	for(unsigned i = 0; i < vect0.size(); i++){
+	  
+	  unsigned ii = (i + 1 == vect0.size())? 0: i + 1;
+	  unsigned iii = (ii + 1 == vect0.size())? 0: ii + 1;
+	  
+	  vectCross.push_back( vect0[ii]*vect1[iii]- vect0[iii]*vect1[ii] );
+	  
+	}
+	return vectCross;
+  
+}
+double  PlanesOperations::getDotProduct(vector<double> vect0,vector<double> vect1){
+  
+  double sum = 0;
+  
+  for(unsigned i = 0; i < vect0.size(); i++) sum += vect0[i]*vect1[i];
+  
+  return sum;
+}
+vector<double> PlanesOperations::getNormal(vector<double> vect){
+	vector<double> vectnorm;
+	double mag = getMagnitud(vect);	
+	
+	for(unsigned i = 0; i < vect.size(); i++){
+	  
+	  if(mag != 0){
+	    vectnorm.push_back(vect[i]/mag);
+	  }else{
+	    vectnorm.push_back(0);
+	  }
+	}
+	return vectnorm;
+}
+double  PlanesOperations::getMagnitud(vector<double> vect){
+  double mag = 0;
+  
+  for(unsigned i = 0; i < vect.size(); i++) mag += pow(vect[i], 2);
+  
+  mag = sqrt(mag);
+
+  //std::cout<<"mag "<<mag <<std::endl;
+
+  return mag;
+}
+vector<double> PlanesOperations::makeVector(vector<double> podouble0, vector<double> podouble1){
+  
+  vector<double> vector;
+  
+  for(unsigned i = 0; i < podouble0.size(); i++){    
+    vector.push_back(podouble1[i] - podouble0[i]);    
+  }
+  return vector;
+}
+
+/**
+*    Adds to vectors, the result is in vectres;
+*@param double* vect0, the first vector
+*@param double* vect1, the second vector
+*@param double* vectres, the resulting vector
+*/
+vector<double> PlanesOperations::addVectors(vector<double> vect0, vector<double> vect1){
+    vector<double> vectres;
+    for(unsigned i = 0; i < vect0.size(); i++){
+        vectres.push_back(vect0[i] + vect1[i]);
+    }
+    return vectres;
+}
+
+/**
+*    multiply a vector with a given scalar
+*@param double* vect0, the vector
+*@param double scalar, the scalar value
+*@param double* vectres, the resulting vector
+*/
+vector<double> PlanesOperations::scalarVector(vector<double> vect0, double scalar){
+    vector<double> vectres;
+    for(unsigned i = 0; i < vect0.size(); i++){
+        vectres.push_back(vect0[i]*scalar);
+    }
+    return vectres;
+}
 
-}
\ No newline at end of file