X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmOrientation.cxx;h=0800e7b144d60d65de547ea4702f41e01b079872;hb=44d34727b676570bf3b4a7cab6076210f159d192;hp=236899b9e0c8a37b36f67a48f6ba6c3d3d6c04f4;hpb=da1e01950ef7dec245c16f73902d614ca2e40a71;p=gdcm.git diff --git a/src/gdcmOrientation.cxx b/src/gdcmOrientation.cxx index 236899b9..0800e7b1 100644 --- a/src/gdcmOrientation.cxx +++ b/src/gdcmOrientation.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmOrientation.cxx,v $ Language: C++ - Date: $Date: 2005/07/24 02:49:25 $ - Version: $Revision: 1.2 $ + Date: $Date: 2005/07/29 15:07:56 $ + Version: $Revision: 1.4 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -19,6 +19,7 @@ #include "gdcmOrientation.h" #include "gdcmFile.h" #include "gdcmDebug.h" +#include // for sqrt namespace gdcm { @@ -36,7 +37,7 @@ namespace gdcm * \note Should be run on the first gdcm::File of a 'coherent' Serie * @return orientation code * # 0 : Not Applicable (neither 0020,0037 Image Orientation Patient - * # nor 0020,0032Image Position found ) + * # nor 0020,0032 Image Position found ) * # 1 : Axial * # -1 : Axial invert * # 2 : Coronal @@ -108,11 +109,10 @@ double Orientation::TypeOrientation( File *f ) // res=self.VerfCriterion( -i , self.CalculLikelyhood2Vec(refB,refA,ori1,ori2) , res ) // return res[0] */ - } Res -Orientation::VerfCriterion(int typeCriterion, double criterionNew, Res const & in) +Orientation::VerfCriterion(int typeCriterion, double criterionNew, Res const &in) { Res res; double criterion = in.second; @@ -133,7 +133,7 @@ Orientation::VerfCriterion(int typeCriterion, double criterionNew, Res const & i return res; } -inline double square_dist(vector3D const &v1, vector3D const & v2) +inline double square_dist(vector3D const &v1, vector3D const &v2) { double res; res = (v1.x - v2.x)*(v1.x - v2.x) + @@ -159,8 +159,8 @@ inline double square_dist(vector3D const &v1, vector3D const & v2) //------------------------- Other : ------------------------------------- // The calculus is based with vectors normalice double -Orientation::CalculLikelyhood2Vec(vector3D const & refA, vector3D const & refB, - vector3D const & ori1, vector3D const & ori2 ) +Orientation::CalculLikelyhood2Vec(vector3D const &refA, vector3D const &refB, + vector3D const &ori1, vector3D const &ori2 ) { vector3D ori3 = ProductVectorial(ori1,ori2);