2108 Bug Volume Rendering widget options are not stable

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
index 3a42953780d0d587a8bc5700e20fd53914b3fc60..8cc853cb0b28244b5806e3ce307a42528d60d980 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewContour.cpp
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #include "manualViewContour.h"
 
 // ----------------------------------------------------------------------------
@@ -78,6 +103,8 @@ void manualViewContour::RefreshContour() // virtual
     nps = _manContModel->GetNumberOfPointsSpline();
        //delta=( double ) ( np  ) / ( double ) ( nps-1  );             //JSTG 25-02-08
 
+       //EED 27 Juin 2012
+    //Boundaring box   
        _minX=99999;
        _minY=99999;
        _maxX=-99999;
@@ -101,7 +128,8 @@ void manualViewContour::RefreshContour() // virtual
                                zz=z*_spc[2];
                                _pts->SetPoint(i,xx,yy,zz );
 
-//EED 27 Juin 2012
+                //EED 27 Juin 2012
+                               //Boundaring box
                                if (xx < _minX) { _minX = xx; }
                                if (yy < _minY) { _minY = yy; }
                                if (xx > _maxX) { _maxX = xx; }
@@ -210,7 +238,7 @@ bool manualViewContour::ifTouchContour(int x,int y,int z)
        yy = yy * _spc[1];
        zz = zz * _spc[2];
 
-       if ( (xx>=_minX) &&  (yy>=_minY) && (xx<=_maxX) && (yy<=_maxY)) {
+       if ( (xx>=_minX) &&  (yy>=_minY) && (xx<=_maxX) && (yy<=_maxY)) {  // inside the boundaring box
        
                unsigned int i, nps,nps_t;
                nps       = _sizePointsContour;
@@ -222,11 +250,10 @@ bool manualViewContour::ifTouchContour(int x,int y,int z)
                nps_t = nps-1;
                } // if close
 
-               printf("EED  manualViewContour::ifTouchContour \n");
+printf("EED  Warning manualViewContour::ifTouchContour \n");
 
                for( i = 0; i < nps_t; i++ ) 
                {
-printf("%d ", i);
                        _pts->GetPoint(i%nps, ppA);
                        _pts->GetPoint((i+1)%nps, ppB);
                        d1 = sqrt( (ppA[0]-xx)*(ppA[0]-xx) + (ppA[1]-yy)*(ppA[1]-yy) + (ppA[2]-zz)*(ppA[2]-zz));