From 060c223316b9f66ff6d088922ba0872a7f772292 Mon Sep 17 00:00:00 2001 From: jpr Date: Mon, 5 Sep 2005 08:25:01 +0000 Subject: [PATCH] Coding style --- src/gdcmOrientation.cxx | 52 ++++++++++++++++++++--------------------- src/gdcmOrientation.h | 14 +++++------ 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/gdcmOrientation.cxx b/src/gdcmOrientation.cxx index 0800e7b1..cdac91f8 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/29 15:07:56 $ - Version: $Revision: 1.4 $ + Date: $Date: 2005/09/05 08:25:01 $ + Version: $Revision: 1.5 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -36,20 +36,20 @@ namespace gdcm * (Axial, Coronal, Sagital) of the image * \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,0032 Image Position found ) - * # 1 : Axial - * # -1 : Axial invert - * # 2 : Coronal - * # -2 : Coronal invert - * # 3 : Sagital - * # -3 : Sagital invert - * # 4 : Heart Axial - * # -4 : Heart Axial invert - * # 5 : Heart Coronal - * # -5 : Heart Coronal invert - * # 6 : Heart Sagital - * # -6 : Heart Sagital invert + * # 0 : Not Applicable (neither 0020,0037 Image Orientation Patient + * # nor 0020,0032 Image Position found) + * # 1 : Axial + * # -1 : Axial invert + * # 2 : Coronal + * # -2 : Coronal invert + * # 3 : Sagital + * # -3 : Sagital invert + * # 4 : Heart Axial + * # -4 : Heart Axial invert + * # 5 : Heart Coronal + * # -5 : Heart Coronal invert + * # 6 : Heart Sagital + * # -6 : Heart Sagital invert */ double Orientation::TypeOrientation( File *f ) { @@ -57,7 +57,7 @@ double Orientation::TypeOrientation( File *f ) bool succ = f->GetImageOrientationPatient( iop ); if ( !succ ) { - gdcmErrorMacro( "No Image Orientation (0020,0037) was found in the file, cannot proceed." ) + gdcmErrorMacro( "No Image Orientation (0020,0037) found in the file, cannot proceed." ) return 0; } @@ -99,15 +99,15 @@ double Orientation::TypeOrientation( File *f ) } return res.first; /* -// i=0 -// res=[0,99999] ## [ , ] -// for plane in dicPlane: -// i=i+1 -// refA=plane[0] -// refB=plane[1] -// res=self.VerfCriterion( i , self.CalculLikelyhood2Vec(refA,refB,ori1,ori2) , res ) -// res=self.VerfCriterion( -i , self.CalculLikelyhood2Vec(refB,refA,ori1,ori2) , res ) -// return res[0] +// i=0 +// res=[0,99999] ## [ , ] +// for plane in dicPlane: +// i=i+1 +// refA=plane[0] +// refB=plane[1] +// res=self.VerfCriterion( i , self.CalculLikelyhood2Vec(refA,refB,ori1,ori2) , res ) +// res=self.VerfCriterion( -i , self.CalculLikelyhood2Vec(refB,refA,ori1,ori2) , res ) +// return res[0] */ } diff --git a/src/gdcmOrientation.h b/src/gdcmOrientation.h index cbe498ca..3ff59156 100644 --- a/src/gdcmOrientation.h +++ b/src/gdcmOrientation.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmOrientation.h,v $ Language: C++ - Date: $Date: 2005/09/02 07:10:03 $ - Version: $Revision: 1.5 $ + Date: $Date: 2005/09/05 08:25:01 $ + Version: $Revision: 1.6 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -44,13 +44,13 @@ public: Orientation() {} ~Orientation() {} - double TypeOrientation( File* file ); + double TypeOrientation( File *file ); private: - Res VerfCriterion(int typeCriterion, double criterionNew, Res const & res); - double CalculLikelyhood2Vec(vector3D const & refA, vector3D const & refB, - vector3D const & ori1, vector3D const & ori2); - vector3D ProductVectorial(vector3D const & vec1, vector3D const & vec2); + Res VerfCriterion(int typeCriterion, double criterionNew, Res const &res); + double CalculLikelyhood2Vec(vector3D const &refA, vector3D const &refB, + vector3D const &ori1, vector3D const &ori2); + vector3D ProductVectorial(vector3D const &vec1, vector3D const &vec2); }; } // end namespace gdcm //----------------------------------------------------------------------------- -- 2.48.1