X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FmanualViewPerpPlaneContour.cxx;h=b07c9974d86fc9c5fe8d650ed41c9ff0d9fe85ae;hb=47d49bceea4f93ff4f57c40596960d042171abb4;hp=4c07bdf501122669a8950539c0db6b1bb725e501;hpb=a4ee3758aa0477f677fb981e2c4d6e29995e8db8;p=creaMaracasVisu.git diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualViewPerpPlaneContour.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualViewPerpPlaneContour.cxx index 4c07bdf..b07c997 100644 --- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualViewPerpPlaneContour.cxx +++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/manualViewPerpPlaneContour.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 "manualViewPerpPlaneContour.h" @@ -82,11 +107,11 @@ void manualViewPerpPlaneContour::FilterCordinateXYZ (double &x, double &y, doubl } // ---------------------------------------------------------------------------- -void manualViewPerpPlaneContour::TransfromeCoordViewWorld( double &X,double &Y,double &Z,int type ) +void manualViewPerpPlaneContour::TransfromCoordViewWorld( double &X,double &Y,double &Z,int type ) { Z = 0; vtkPlane2DView *vtkplane2Dview = (vtkPlane2DView*)( this->GetWxVtkBaseView() ); - vtkplane2Dview->TransfromeCoordViewWorld2(X,Y,Z); + vtkplane2Dview->TransfromCoordViewWorld2(X,Y,Z); } @@ -192,7 +217,8 @@ bool manualViewPerpPlaneContour::ifTouchContour( int x, int y, int z) double X=x; double Y=y; double Z=z; - vtkplane2Dview->TransfromeCoordScreenToWorld(X,Y,Z); + vtkplane2Dview->TransFromCoordScreenToWorld(X,Y,Z); + double ppA[3]; _pts->GetPoint(0, ppA); if (sqrt( (ppA[0]-X)*(ppA[0]-X) + (ppA[1]-Y)*(ppA[1]-Y) ) <=2) @@ -200,4 +226,5 @@ bool manualViewPerpPlaneContour::ifTouchContour( int x, int y, int z) ok = true; } return ok; -} \ No newline at end of file +} +