X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmOrientation.cxx;h=397fbff0cdbe726aa8cac9bed26215d47f6ad90e;hb=3f244b54d3cff8a8ccbb2f8586ba992618075b41;hp=47fed19256c29d7dd09c21a4fd3f8f8583335ebe;hpb=6b4aa7387613d98b62ee41d18aba2dbe0306b4ba;p=gdcm.git diff --git a/src/gdcmOrientation.cxx b/src/gdcmOrientation.cxx index 47fed192..397fbff0 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/11/25 13:56:32 $ - Version: $Revision: 1.20 $ + Date: $Date: 2006/01/19 11:46:46 $ + Version: $Revision: 1.23 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -84,7 +84,7 @@ const char* Orientation::GetOrientationTypeString(OrientationType const o) /// (Axial, Coronal, Sagital, ...) of the image OrientationType Orientation::GetOrientationType( File *f ) { - double iop[6]; + float iop[6]; bool succ = f->GetImageOrientationPatient( iop ); if ( !succ ) { @@ -276,6 +276,7 @@ have multiple letters in as described under "refinements" in C.7.6.1.1.1): /** * \brief Computes the Patient Orientation relative to the image plane * from the 'Image Orientation (Patient)' + * - or from 0020 0035Image Orientation (RET) - * - The first entry is the direction of the rows, given by the * direction of the last pixel in the first row from the first * pixel in that row. @@ -288,11 +289,11 @@ have multiple letters in as described under "refinements" in C.7.6.1.1.1): * - Refinements in the orientation descriptions are designated * by one or two additional letters in each value. * Use it when "Patient Orientation" (0020,0020) is not found - * @return orientation string as "rawOrientation\columnsOrientation" + * @return orientation string as "rowsOrientation\columnsOrientation" */ std::string Orientation::GetOrientation ( File *f ) { - double iop[6]; + float iop[6]; if ( !f->GetImageOrientationPatient( iop ) ) return GDCM_UNFOUND; @@ -304,7 +305,7 @@ std::string Orientation::GetOrientation ( File *f ) } -std::string Orientation::GetSingleOrientation ( double *iop) +std::string Orientation::GetSingleOrientation ( float *iop) { std::string orientation;