FIX: VC++ warning about return type in main

[gdcm.git] / src / gdcmHeaderHelper.h

diff --git a/src/gdcmHeaderHelper.h b/src/gdcmHeaderHelper.h
index a0fc9494c60ff33e3b7245db1de8713051d0605e..06455a49d9cd88856c1c20c5c878a67acd1ebe1b 100644 (file)
--- a/src/gdcmHeaderHelper.h
+++ b/src/gdcmHeaderHelper.h
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/src/Attic/gdcmHeaderHelper.h,v 1.2 2003/09/09 08:46:32 malaterre Exp $
+// $Header: /cvs/public/gdcm/src/Attic/gdcmHeaderHelper.h,v 1.4 2003/10/03 14:26:11 jpr Exp $
 
 #ifndef GDCMHEADERHELPER_H
 #define GDCMHEADERHELPER_H
@@ -8,15 +8,51 @@
 #include <string>
 #include <vector>
 
+   // Dicom Part 3.3 Compliant
    enum ModalityType {
       Unknow,
-      CR,
-      CT,
-      MR,
-      NM,
-      OT,
-      US,
-      XA };
+      AU,       // Voice Audio
+      AS,       // Angioscopy
+      BI,       // Biomagnetic Imaging
+      CF,       // Cinefluorography
+      CP,       // Culposcopy
+      CR,       // Computed Radiography
+      CS,       // Cystoscopy
+      CT,       // Computed Tomography
+      DD,       // Duplex Dopler
+      DF,       // Digital Fluoroscopy
+      DG,       // Diaphanography
+      DM,       // Digital Microscopy
+      DS,       // Digital Substraction Angiography
+      DX,       // Digital Radiography
+      ECG,      // Echocardiography
+      EPS,      // Basic Cardiac EP
+      ES,       // Endoscopy
+      FA,       // Fluorescein Angiography
+      FS,       // Fundoscopy
+      HC,       // Hard Copy
+      HD,       // Hemodynamic
+      LP,       // Laparoscopy
+      LS,       // Laser Surface Scan
+      MA,       // Magnetic Resonance Angiography
+      MR,       // Magnetic Resonance
+      NM,       // Nuclear Medicine
+      OT,       // Other
+      PT,       // Positron Emission Tomography
+      RF,       // Radio Fluoroscopy
+      RG,       // Radiographic Imaging
+      RTDOSE,   // Radiotherapy Dose
+      RTIMAGE,  // Radiotherapy Image
+      RTPLAN,   // Radiotherapy Plan
+      RTSTRUCT, // Radiotherapy Structure Set
+      SM,       // Microscopic Imaging
+      ST,       // Single-photon Emission Computed Tomography
+      TG,       // Thermography
+      US,       // Ultrasound
+      VF,       // Videofluorography
+      XA,       // X-Ray Angiography
+      XC        // Photographic Imaging
+    };
       
 /**
   This class is meant to *interpret* data given from gdcmHeader
@@ -40,7 +76,9 @@ public:
    float GetXSpacing();
    float GetYSpacing();
    float GetZSpacing();
-   
+
+   int GetNumberOfScalarComponents();
+
    std::string GetStudyUID();
    std::string GetSeriesUID();
    std::string GetClassUID();
@@ -60,6 +98,7 @@ public:
    ModalityType GetModality();
    
    void GetImageOrientationPatient( float* iop );
+  
 
 };