X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2FContour%2FPropagation.cxx;h=d0790cb09e5f9465334e699bb8eaf549fdfdf80b;hb=a906c7009b5c3c2ef5263f4d84ba13be7d4549ff;hp=c6d2365481a9baa3806792f72baad6afc0ce0fb3;hpb=4443a8fe2b4992b6abee8531917fd0803018fc12;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.cxx b/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.cxx index c6d2365..d0790cb 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/Contour/Propagation.cxx @@ -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 "Propagation.h" //------------------------------------------------------------------------------------------------------------------------------------------ @@ -762,8 +787,8 @@ int PropContour::VectorDirection(std::vector*InX, std::vector*In { ax = (*InX)[i]-SumX; ay = (*InY)[i]-SumY; - bx = (*InX)[i+1]-SumX; - by = (*InY)[i+1]-SumY; + bx = (*InX)[(i+1)%size]-SumX; + by = (*InY)[(i+1)%size]-SumY; axb = (ax*by) - (bx*ay); if(axb > 0) { @@ -1096,7 +1121,7 @@ void PropContour::SetKeyContours(std::vector*InX, std::vector*In okFind=true; i=sizeKeyContour; } - if ( (_KeyContourZ[i-1] != _KeyContourZ[i]) ) + if ( (i