X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualContour%2FmanualViewCircle.cpp;h=879d119773a885879c7af8bf39e56a9c002579e0;hb=65c158dc171f8d3114ee3544b2a94a1f41880df0;hp=c23415471e8e6d1176c242b6d18c17c53b45bea6;hpb=414da1a291ff4c9d9a946536d3d219e4b5f9e6c2;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewCircle.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewCircle.cpp
index c234154..879d119 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewCircle.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewCircle.cpp
@@ -34,46 +34,6 @@ void manualViewCircle::CopyAttributesTo( manualViewCircle * cloneObject)
 }
 
 
-// ----------------------------------------------------------------------------
-/*
-void manualViewCircle::RefreshContour(){ // virtual
-
-	manualPoint	*mpA,*mpB;
-    unsigned int i, np,nps;
-	double angle,radio;
-	double difX,difY;
-	double XX,YY,ZZ;
-    np	= GetNumberOfPoints( );
-	nps = _manContModel->GetNumberOfPointsSpline();
-	double deltaAngle=(3.14159265*2)/(nps-1);
-	if ( np > 0)
-	{
-		if (np==2)
-		{
-			mpA		= _manContModel->GetManualPoint(0);
-			mpB		= _manContModel->GetManualPoint(1);
-			difX	= mpA->GetX() - mpB->GetX();
-			difY	= mpA->GetY() - mpB->GetY();
-			radio	= sqrt( difX*difX + difY*difY );
-			manualContourModelCircle *manContModelCir = (manualContourModelCircle*)_manContModel;
-			manContModelCir->SetRadio(radio);
-
-			for( i = 0; i < nps; i++ ) {
-				manContModelCir->GetSpline_i_Point(i, &XX, &YY, &ZZ);
-//				angle = deltaAngle*i;
-//				XX = cos(angle)*radio+mpA->GetX();
-//				YY = sin(angle)*radio+mpA->GetY();
-				ZZ = mpA->GetZ();
-				_pts->SetPoint(i, XX*_spc[0] , YY*_spc[1] , ZZ*_spc[2] );
-			} //  rof
-		} else {
-				_pts->SetPoint(0, 0 , 0 , 0);
-				_pts->SetPoint(1, 0 , 0 , 0);
-		} // if
-	}
-}
-*/
-
 // ----------------------------------------------------------------------------
 int manualViewCircle::GetType() // virtual
 {
@@ -108,43 +68,6 @@ void manualViewCircle::GetMinMax(double &minX,double &minY, double &maxX, double
 	}
 }
 
-/*
-// ----------------------------------------------------------------------------
-bool manualViewCircle::ifTouchContour(int x,int y, int z) // virtual
-{
-	bool	result=false;
-	double	px1=99999,py1=99999,px2=-9999,py2=-99999;
-
-	GetMinMax(px1,py1, px2, py2);
-
-	double xx=x;
-	double yy=y;
-	double zz=z;
-	TransfromeCoordViewWorld(xx,yy,zz);
-
-	bool ok1=false;
-	bool ok2=false;
-	double ddx=GetRange();
-	double ddy=GetRange();
-
-	if ((xx>px1-ddx)&&(xx<px2+ddx) &&  (yy>py1-ddy)&&(yy<py2+ddy))
-	{
-		ok1=true;
-	}
-
-	if ((xx>px1+ddx)&&(xx<px2-ddx) &&  (yy>py1+ddy)&&(yy<py2-ddy))
-	{
-		ok2=true;
-	}
-
-	if ((ok1==true) && (ok2==false))
-	{
-		result=true;
-	}
-
-	return result;
-}
-*/
 
 // ----------------------------------------------------------------------------
 
@@ -154,7 +77,7 @@ void manualViewCircle::InitMove(int x, int y, int z)  // virtual
 	double XX=x;
 	double YY=y;
 	double ZZ=z;
-	TransfromeCoordViewWorld(XX,YY,ZZ);
+	TransfromCoordViewWorld(XX,YY,ZZ);
 
 	if (_manContModel->GetSizeLstPoints()==2){
 		mp = _manContModel->GetManualPoint(0);
@@ -188,7 +111,7 @@ void manualViewCircle::MoveContour(int x, int y, int z) // virtual
 	double XX=x;
 	double YY=y;
 	double ZZ=z;
-	TransfromeCoordViewWorld(XX,YY,ZZ);
+	TransfromCoordViewWorld(XX,YY,ZZ);
 
 	mp = _manContModel->GetManualPoint(0);
 	mp->SetPoint(_dp0[0]+XX,_dp0[1]+YY,_dp0[2]);