BUG

[creaMaracasVisu.git] / lib / maracasVisuLib / src / interface / wxWindows / widgets / manualContour / manualView3VContour.cpp

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualView3VContour.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualView3VContour.cpp
index c7a1d75526058b14f4dc0b965eb8537354f961e2..f8fadfff0d94b7b258a286b7b5466c6c39507e23 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualView3VContour.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualView3VContour.cpp
@@ -62,6 +62,17 @@ void manualView3VContour::RefreshContour()  // virtula
 {
        manualViewContour::RefreshContour();
        int i;
+       
+       //EED 27 Juin 2012
+    //Boundaring box   
+       _minX=99999;
+       _minY=99999;
+       _minZ=99999;
+       _maxX=-99999;
+       _maxY=-99999;
+       _maxZ=-99999;
+       
+       
        double pp[3];
 // JSTG 25-02-08 ----------------------------------------
        //int nps = GetNumberOfPointsSpline();
@@ -74,7 +85,18 @@ void manualView3VContour::RefreshContour()  // virtula
 
 //EED 27 sep 2006
                _pts->SetPoint( i, pp[0] , pp[1] ,pp[2] );
-       }
+               
+               
+               //EED 27 Juin 2012
+               //Boundaring box
+               if (pp[0] < _minX) { _minX = pp[0]; }
+               if (pp[1] < _minY) { _minY = pp[1]; }
+               if (pp[2] < _minZ) { _minZ = pp[2]; }
+               if (pp[0] > _maxX) { _maxX = pp[0]; }
+               if (pp[1] > _maxY) { _maxY = pp[1]; }           
+               if (pp[2] > _maxZ) { _maxY = pp[2]; }           
+               
+       }// for
 
 }
 
@@ -122,28 +144,30 @@ bool manualView3VContour::ifTouchContour(int x,int y,int z){ // virtual
        yy = yy * _spc[1];
        zz = zz * _spc[2];
 
-    unsigned int i, nps,nps_t;
-    nps          = _sizePointsContour;
-       if (this->_manContModel->IfCloseContour()==true)
-       {
-               nps_t = nps;
-       } else {
-               nps_t = nps-1;
-       }
-       FilterCordinateXYZ(xx,yy,zz);
-
-    for( i = 0; i < nps_t; i++ ) {
-               _pts->GetPoint(i%nps, ppA);
-               _pts->GetPoint((i+1)%nps, ppB);
-               FilterCordinateXYZ(ppA[0],ppA[1],ppA[2]);
-               FilterCordinateXYZ(ppB[0],ppB[1],ppB[2]);
-               d1= sqrt( (ppA[0]-xx)*(ppA[0]-xx) + (ppA[1]-yy)*(ppA[1]-yy) + (ppA[2]-zz)*(ppA[2]-zz));
-               d2= sqrt( (ppB[0]-xx)*(ppB[0]-xx) + (ppB[1]-yy)*(ppB[1]-yy) + (ppB[2]-zz)*(ppB[2]-zz));
-               d3= sqrt( (ppB[0]-ppA[0])*(ppB[0]-ppA[0]) + (ppB[1]-ppA[1])*(ppB[1]-ppA[1]) + (ppB[2]-ppA[2])*(ppB[2]-ppA[2]));
-               if (  ((d1+d2)>=d3) &&  ((d1+d2)<=d3*1.3) ) {
-                       result=true;
-                       i=nps;
+       if ( (xx>=_minX) &&  (yy>=_minY) && (xx<=_maxX) && (yy<=_maxY)) {  //  boundaring box   
+               unsigned int i, nps,nps_t;
+               nps       = _sizePointsContour;
+               if (this->_manContModel->IfCloseContour()==true)
+               {
+                       nps_t = nps;
+               } else {
+                       nps_t = nps-1;
                }
-       }
+               FilterCordinateXYZ(xx,yy,zz);
+
+               for( i = 0; i < nps_t; i++ ) {
+                       _pts->GetPoint(i%nps, ppA);
+                       _pts->GetPoint((i+1)%nps, ppB);
+                       FilterCordinateXYZ(ppA[0],ppA[1],ppA[2]);
+                       FilterCordinateXYZ(ppB[0],ppB[1],ppB[2]);
+                       d1= sqrt( (ppA[0]-xx)*(ppA[0]-xx) + (ppA[1]-yy)*(ppA[1]-yy) + (ppA[2]-zz)*(ppA[2]-zz));
+                       d2= sqrt( (ppB[0]-xx)*(ppB[0]-xx) + (ppB[1]-yy)*(ppB[1]-yy) + (ppB[2]-zz)*(ppB[2]-zz));
+                       d3= sqrt( (ppB[0]-ppA[0])*(ppB[0]-ppA[0]) + (ppB[1]-ppA[1])*(ppB[1]-ppA[1]) + (ppB[2]-ppA[2])*(ppB[2]-ppA[2]));
+                       if (  ((d1+d2)>=d3) &&  ((d1+d2)<=d3*1.3) ) {
+                               result=true;
+                               i=nps;
+                       } // if d1 d2 d3
+               }// for i
+       } // boundaring box
        return result;
 }