#3093 creaMaracasVisu Feature New Normal - Contour Information in pixels and image...

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

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoints.cpp b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoints.cpp
index 45696c3097b78b564e0d3b1d53fc27d3321c067a..bba59fa26145fa87848e6806ff60865cf47e9c4c 100644 (file)
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoints.cpp
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualContour/manualViewPoints.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 "manualViewPoints.h"
 
 // ----------------------------------------------------------------------------
@@ -9,7 +34,8 @@ manualViewPoints::manualViewPoints()
 manualViewPoints::~manualViewPoints()
 {
        int i,size=_copyViewPoints.size();
-       for (i=0;i<size; i++){
+       for (i=0;i<size; i++)
+       {
                delete _copyViewPoints[i];
        }
        _copyViewPoints.clear();
@@ -54,7 +80,8 @@ bool manualViewPoints::ifTouchContour(int x,int y,int z) //VIRTUAL
 
        int id = _manContModel->GetIdPoint(xx,yy,zz,_range,2);
 
-       if(id!=-1){
+       if(id!=-1)
+       {
                result = true;
        }
        
@@ -75,7 +102,8 @@ void manualViewPoints::RefreshContour()  // VIRTUAL
        int np = GetNumberOfPoints();
        int copynp= _copyViewPoints.size();
 
-       while(copynp!=np){
+       while(copynp!=np)
+       {
 
                if(copynp<np)
                {
@@ -102,7 +130,12 @@ void manualViewPoints::RefreshContour()  // VIRTUAL
        {
                double xx = _manContModel->GetManualPoint(i)->GetX();
                double yy = _manContModel->GetManualPoint(i)->GetY();
-               double zz = 900; // RaC REVISAR !!
+               
+               
+//EED 21 mars 2012  FLIP probleme  ..PLOP..
+//             double zz = 900; // RaC REVISAR !!
+               
+               double zz = -900; // RaC REVISAR !!
 
                manualViewPoint *mv = _copyViewPoints[i];