X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmOrientation.h;h=407f69a4ae8be59b562c1e3b0159af2fa1548fe0;hb=35ee8ee8af32946514713d271177df8bb2298eb2;hp=f247fc5e241c2aa1f386fac5f718132e447118cf;hpb=537296b51244f066e7f72dd68e7a108e4da13d7f;p=gdcm.git

diff --git a/src/gdcmOrientation.h b/src/gdcmOrientation.h
index f247fc5e..407f69a4 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/10/03 16:09:27 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2008/08/18 12:27:10 $
+  Version:   $Revision: 1.21 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -16,13 +16,13 @@
                                                                                 
 =========================================================================*/
 
-#ifndef GDCMORIENTATION_H
-#define GDCMORIENTATION_H
+#ifndef _GDCMORIENTATION_H_
+#define _GDCMORIENTATION_H_
 
-#include "gdcmBase.h"
+#include "gdcmRefCounter.h"
 #include <map>
 
-namespace gdcm 
+namespace GDCM_NAME_SPACE 
 {
 typedef struct
 {
@@ -34,16 +34,34 @@ typedef struct
 typedef std::pair<double, double> Res;
 class File;
 
+typedef enum {
+   NotApplicable = 0,
+   Axial = 1,
+   AxialInvert = -1,
+   Coronal = 2,
+   CoronalInvert = -2,
+   Sagittal = 3,
+   SagittalInvert = -3,
+   HeartAxial = 4,
+   HeartAxialInvert = -4,
+   HeartCoronal = 5,
+   HeartCoronalInvert = -5,
+   HeartSagittal = 6,
+   HeartSagittalInvert = -6
+} OrientationType;
+
 //-----------------------------------------------------------------------------
 /**
  * \brief Orientation class for dealing with DICOM image orientation
+ *
  * A gentle reminder for non-medical user:
  * PatientPosition (0x0010,0x5100) tells us the way the patient was introduced in the imager
  *  - HFS : Head First Supine
  *  - FFS : Feet First Supine
  *  - HFP : Head First Prone
  *  - FFP : Feet First Prone
- * Note: HFP and FFP are not very common values, since the position must be pretty unconfortable for the Patient -the patient is lying on his belly; but, if he has handcuffs there is no other way ...-
+ * Note: HFP and FFP are not very common values, since the position must
+ *        be pretty unconfortable for the Patient -the patient is lying on his belly; but, if he has handcuffs there is no other way ...-
  *
  * ImageOrientationPatient (0x0020,0x0037) gives 6 cosines (2 for each plane)
  * Patient Orientation (as found in the optional 0x0020,0x0020, or computed by
@@ -57,7 +75,7 @@ class File;
  *
  * Example #1:
  * Imagine the patient, in "HFS" position.
- * Full body sagital images are requested.
+ * Full body sagittal images are requested.
  * All the cosines will be -1, 0, or +1;
  * "Patient Orientation" (deduced) will be "A/F".
  * Positive X axis is oriented 'towards patient's nose
@@ -65,44 +83,35 @@ class File;
  *
  * Example #2:
  * Imagine now that patient has a stiffneck and his head is *turned* 30 degrees towards the left.
- * Head sagital images are requested.
+ * Head sagittal images are requested.
  * One of the cosines will be almost 0.5
  * Deduced "Patient Orientation" will be "AL\F"
  * (main X axis orientation is towards patient's nose, and a little bit towards the left)
- * but the image looks *perfectly* sagital (for the head, not for the patient) !
+ * but the image looks *perfectly* sagittal (for the head, not for the patient) !
  *
  * Imagine the patient's stiffneck causes head to be *bended* 30 degrees towards the left AND *turned* left.
- * Sagital images are requested...
- * You'll probabely have 3 letters for X axis and  Y axis, and the image remains *perfectly* sagital !
+ * Sagittal images are requested...
+ * You'll probabely have 3 letters for X axis and  Y axis, and the image remains *perfectly* sagittal !
  * The values are given within the 'Patient referential', *not* within the 'Organ referential' ...
  */
-typedef enum {
-   NotApplicable = 0,
-   Axial = 1,
-   AxialInvert = -1,
-   Coronal = 2,
-   CoronalInvert = -2,
-   Sagital = 3,
-   SagitalInvert = -3,
-   HeartAxial = 4,
-   HeartAxialInvert = -4,
-   HeartCoronal = 5,
-   HeartCoronalInvert = -5,
-   HeartSagital = 6,
-   HeartSagitalInvert = -6
-} OrientationType;
 
-class GDCM_EXPORT Orientation : public Base
+class GDCM_EXPORT Orientation : public RefCounter
 {
+   gdcmTypeMacro(Orientation);
 public:
-  Orientation() {}
-  ~Orientation() {}
+/// \brief Constructs a gdcm::Orientation with a RefCounter
+   static Orientation *New() {return new Orientation();}
 
   OrientationType GetOrientationType( File *file );
   std::string GetOrientation ( File *file );  
   
   static const char* GetOrientationTypeString(OrientationType const o);
 
+protected:
+/// \brief Constructor
+  Orientation() {}
+/// \brief Canonical Destructor
+  ~Orientation() {}
 private:
    Res VerfCriterion(int typeCriterion, double criterionNew, Res const &res);
    double CalculLikelyhood2Vec(vector3D const &refA, vector3D const &refB,