X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=bbtk%2Fsrc%2FbbcreaMaracasVisuManualContourModel_Box.cxx;h=8ad078e6d20b6ae2669f8a5a6975edc9ae60e0da;hb=4b2a99534d79424c7892e09160a1488604741064;hp=9a20b5f9946f5446ed7decb03e0cee07424f6f44;hpb=8d98be3be01708e837d47f63a4eb515aca1476dd;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx b/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx
index 9a20b5f..8ad078e 100644
--- a/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx
+++ b/bbtk/src/bbcreaMaracasVisuManualContourModel_Box.cxx
@@ -137,6 +137,107 @@ void ManualContourModel_Box::RedistributionPoints(	std::vector<double> *lstOutX,
 }
 
 
+void ManualContourModel_Box::ClockwisePoints(	std::vector<double> *lstInX,
+											std::vector<double> *lstInY, 
+											std::vector<double> *lstInZ,
+											std::vector<int> *lstIndexsIn )
+{
+	int 	iLstIndexIn,sizeLstIndexIn=lstIndexsIn->size();
+	int 	i,iGeneral=0;
+	int 	size,size2;
+	double 	cx,cy,cz;
+	double 	px,py,pz;
+	double 	backpx,backpy,backpz;
+	double 	ang;
+	char   	dir=-1;
+	bool 	dirx,diry,dirz;
+	int 	flagAng=0;
+	float 	backang;
+	double 	tmp;
+
+	// For each contour
+	for (iLstIndexIn=0;  iLstIndexIn<sizeLstIndexIn; iLstIndexIn++)
+	{
+		// Step 1. Find gravity center and direction
+		size  	= (*lstIndexsIn)[iLstIndexIn];
+		if (size>2)  // for contour with more than 2 points
+		{
+			cx		= 0;
+			cy		= 0;
+			cz		= 0;
+			dirx	= true;
+			diry	= true;
+			dirz	= true;
+			for ( i=0 ; i<size ; i++ )
+			{
+				px=(*lstInX)[iGeneral+i];
+				py=(*lstInY)[iGeneral+i];
+				pz=(*lstInZ)[iGeneral+i];
+				cx	= px + cx;
+				cy	= py + cy;
+				cz	= pz + cz;
+				if (i!=0) 
+				{ 
+					if (backpx!=px) { dirx=false; } 
+					if (backpy!=py) { diry=false; } 
+					if (backpz!=pz) { dirz=false; } 
+					backpx=px;
+					backpy=py;
+					backpz=pz;
+				} // if i!=0
+				backpx=px; 
+				backpy=py; 
+				backpz=pz; 
+			} // for i 
+			cx=cx/size;
+			cy=cy/size;
+			cz=cz/size;
+			if (dirx==true) { dir=1; }  // YZ 
+			if (diry==true) { dir=2; }  // XZ 
+			if (dirz==true) { dir=0; }  // XZ 
+			// Step 2. Find angle diference find 
+			flagAng=0;
+			for ( i=0 ; i<size ; i++ )
+			{
+				px = (*lstInX)[iGeneral+i]-cx;
+				py = (*lstInY)[iGeneral+i]-cy;
+				pz = (*lstInZ)[iGeneral+i]-cz;
+				if (dir==0) { ang=atan2( py , px ); } // XY
+				if (dir==1) { ang=atan2( pz , py ); } // YZ
+				if (dir==2) { ang=atan2( pz , px ); } // XZ
+				if (i>0) 
+				{ 
+					if (backang<ang) 
+					{
+						flagAng++;
+					} else {
+						flagAng--;
+					}// if backang<ang
+				} // if i
+				backang=ang; 
+			} // for i 
+
+			// Step 3. Invert order of points
+			if (flagAng<0)
+			{
+				size2 = size/2;
+				for ( i=0 ; i<size2 ; i++ )
+				{
+					tmp 							= (*lstInX)[iGeneral+i];
+					(*lstInX)[iGeneral+i]			= (*lstInX)[iGeneral+size-1-i];
+					(*lstInX)[iGeneral+size-1-i]	= tmp;
+					tmp 							= (*lstInY)[iGeneral+i];
+					(*lstInY)[iGeneral+i]			= (*lstInY)[iGeneral+size-1-i];
+					(*lstInY)[iGeneral+size-1-i]	= tmp;
+					tmp 							= (*lstInZ)[iGeneral+i];
+					(*lstInZ)[iGeneral+i]			= (*lstInZ)[iGeneral+size-1-i];
+					(*lstInZ)[iGeneral+size-1-i]	= tmp;
+				} // for i
+			} // flagAng
+		} // size>2
+		iGeneral = iGeneral+size;
+	} // for iLstIndexIn
+}
 
 void ManualContourModel_Box::ShiftValues(	std::vector<double> *lstInX,
 											std::vector<double> *lstInY, 
@@ -236,6 +337,7 @@ void ManualContourModel_Box::Process()
 	}
 	if (bbGetInputDoubleContour()==1)
 	{
+		ClockwisePoints( &lstInX , &lstInY , &lstInZ , &lstIndexsIn );
 		ShiftValues( &lstInX , &lstInY , &lstInZ , &lstIndexsIn );
 	} // DoubleContour
 	int i,size=lstIndexsIn.size();