Deal with any type on input + cosmetics

[gdcm.git] / Example / RawToDicomStack.cxx

diff --git a/Example/RawToDicomStack.cxx b/Example/RawToDicomStack.cxx
index 667589a5594594b26c01628c5f94ee46e96273d0..5c9976c43ffd956d6d009404caebac4ac71e212c 100755 (executable)
--- a/Example/RawToDicomStack.cxx
+++ b/Example/RawToDicomStack.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: RawToDicomStack.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/01/14 12:32:35 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2009/01/19 17:05:13 $
+  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
@@ -36,12 +36,15 @@ typedef short int          * PS16;
 typedef unsigned short int * PU16;
 typedef int                * PS32;
 typedef unsigned int       * PU32;
-
-#define CRR(t1,t2)     { for(int i=0;i<nY;i++)                   \
-                           for(int j=0;j<nX;j++)                 \
-                             for(int k=0;k<samplesPerPixel;k++)  \
-                                 *((t2)planePixelsOut + i*nX +j+k) = *(((t1)pixels)+ nbPlanes*nX*nY + i*nX +j+k);\
-                       }
+typedef float              * PF32;
+typedef double             * PD64;
+
+#define CRR(t1,t2)   { for(int i=0;i<nY;i++)                   \
+                         for(int j=0;j<nX;j++)                 \
+                           for(int k=0;k<samplesPerPixel;k++)  {\
+                               *((t2)planePixelsOut + i*nX +j+k) = *(((t1)pixels)+ nbPlanes*nX*nY + i*nX +j+k);\
+                           }                                                                                  \
+                     }
     
 #define CFR(PPt)  switch ( pixelTypeOutCode ) {     \
           case -8   : CRR(PPt,PS8);  break;         \
@@ -50,6 +53,8 @@ typedef unsigned int       * PU32;
           case 16   : CRR(PPt,PU16); break;         \
           case -32  : CRR(PPt,PS32); break;         \
           case 32   : CRR(PPt,PU32); break;         \
+          case 33   : CRR(PPt,PF32); break;         \
+          case 64   : CRR(PPt,PD64); break;         \
           }
 
 
@@ -64,7 +69,7 @@ void ConvertSwapZone(int pixelSize, void *Raw, size_t RawSize)
       for( i = 0; i < RawSize / 2; i++ )
       {
          im16[i]= (im16[i] >> 8) | (im16[i] << 8 );
-      }     
+      }
    }
    else if ( pixelSize == 4 )
    {
@@ -94,15 +99,15 @@ int main(int argc, char *argv[])
    "                   rows=nb of Rows                                        ",
    "                   lines=nb of Lines,                                     ",
    "                   [frames = nb of Frames] //defaulted to 1               ",
-   "                   pixeltype={8U|8S|16U|16S|32U|32S}                      ",
-   "                   pixeltypeout={8U|8S|16U|16S|32U|32S}                   ",   
+   "                   pixeltype={8U|8S|16U|16S|32U|32S|32F|64D}              ",
+   "                   pixeltypeout={8U|8S|16U|16S|32U|32S}                   ",
    "                   [{b|l}] b:BigEndian,l:LittleEndian default : l         ",
    "                   [samples = {1|3}}       //(1:Gray,3:RGB) defaulted to 1",
    "                   [monochrome1]                                          ",
    "                   [studyid = ] [patientname = Patient's name]            ",
    "                   [debug]                                                ",
    "                                                                          ",
-   "  monochrome1 = user wants MONOCHROME1 photom. interp. (0=white)          ", 
+   "  monochrome1 = user wants MONOCHROME1 photom. interp. (0=white)          ",
    "  studyUID   : *aware* user wants to add the serie                        ",
    "                                             to an already existing study ",
    "  debug      : developper wants to run the program in 'debug mode'        ",
@@ -133,7 +138,6 @@ int main(int argc, char *argv[])
    int l = am->ArgMgrDefined("l");
       
    char *pixelType = am->ArgMgrWantString("pixeltype", usage);
-  
    const char *pixelTypeOut = am->ArgMgrGetString("pixeltypeout", pixelType);   
 
    bool monochrome1 = ( 0 != am->ArgMgrDefined("monochrome1") );
@@ -165,16 +169,16 @@ int main(int argc, char *argv[])
    // ----------- End Arguments Manager ---------
    
  /// \TODO Deal with all the images of a directory
-  
- // Read the Raw file  
+
+ // Read the Raw file
    std::ifstream *Fp = new std::ifstream(inputFileName, std::ios::in | std::ios::binary);
    if ( ! *Fp )
-   {   
+   {
       std::cout << "Cannot open file: " << inputFileName;
       delete Fp;
       Fp = 0;
       return 0;
-   }  
+   }
 
    bool bigEndian = GDCM_NAME_SPACE::Util::IsCurrentProcessorBigEndian();
 
@@ -193,7 +197,7 @@ int main(int argc, char *argv[])
    {
       pixelSize = 1;
       pixelSign = 0;
-      pixelTypeCode = 8;      
+      pixelTypeCode = 8;
    }
    else if (strPixelType == "16S")
    {
@@ -211,13 +215,26 @@ int main(int argc, char *argv[])
    {
       pixelSize = 4;
       pixelSign = 1;
-      pixelTypeCode = -32;      
+      pixelTypeCode = -32;
    }   
    else if (strPixelType == "32U")
    {
       pixelSize = 4;
       pixelSign = 0;
-      pixelTypeCode = 32;       
+      pixelTypeCode = 32;
+   }
+   else if (strPixelType == "32F")
+   {
+      pixelSize = 4;
+      pixelSign = 0;
+      pixelTypeCode = 33;
+   }
+
+   else if (strPixelType == "64D")
+   {
+      pixelSize = 8;
+      pixelSign = 0;
+      pixelTypeCode = 64;
    }
    else
    {
@@ -271,7 +288,7 @@ int main(int argc, char *argv[])
       std::cout << "Wrong 'pixeltypeout' (" << strPixelTypeOut << ")" << std::endl;
       return 1;
    }
- 
+
    std::string strStudyUID;
    std::string strSerieUID;
 
@@ -288,22 +305,22 @@ int main(int argc, char *argv[])
    // Read the pixels
 
    int singlePlaneDataSize =  nX*nY*samplesPerPixel*pixelSizeOut;
-   int dataSize            =  singlePlaneDataSize*nZ;
+   int dataSizeIn          =  nX*nY*samplesPerPixel*pixelSize*nZ;
 
-   uint8_t *pixels      = new uint8_t[dataSize];
-   uint8_t *planePixelsOut = new uint8_t[singlePlaneDataSize];   
-   
-   Fp->read((char*)pixels, (size_t)dataSize);
+   uint8_t *pixels         = new uint8_t[dataSizeIn];
+   uint8_t *planePixelsOut = new uint8_t[singlePlaneDataSize];
+
+   Fp->read((char*)pixels, (size_t)dataSizeIn);
 
    if ( pixelSize !=1 && ( (l && bigEndian) || (b && ! bigEndian) ) )
    {  
-      ConvertSwapZone(pixelSize, pixels, dataSize);   
+      ConvertSwapZone(pixelSize, pixels, dataSizeIn);
    }
 
 // iterate on the planes.
 
    char outputFileName[200];
-   
+
    for(int nbPlanes=0; nbPlanes<nZ; nbPlanes++)
    {
 
@@ -311,7 +328,7 @@ int main(int argc, char *argv[])
 
 // Copy (and convert) pixels of a single plane
 
-     switch ( pixelTypeCode ) 
+     switch ( pixelTypeCode )
      {
        case 8    : CFR(PU8);  break;
        case -8   : CFR(PS8);  break;
@@ -319,6 +336,8 @@ int main(int argc, char *argv[])
        case 16   : CFR(PS16); break;
        case -32  : CFR(PS32); break;
        case 32   : CFR(PU32); break;
+       case 33   : CFR(PF32); break;
+       case 64   : CFR(PD64); break;
      }
 
 // Create an empty FileHelper
@@ -371,7 +390,7 @@ int main(int argc, char *argv[])
    str.str("");
    str << pixelSign;
    fileToBuild->InsertEntryString(str.str(),0x0028,0x0103, "US"); // Pixel Representation
-   
+
 // If you deal with a Serie of images, as slices of a volume,
 // it up to you to tell gdcm, for each image, what are the values of :
 // 
@@ -379,7 +398,7 @@ int main(int argc, char *argv[])
 // 0020 0037 DS 6 Image Orientation (Patient)
 
    str.str("");
-   str << "0.0 \\ 0.0 \\" <<  nbPlanes;   
+   str << "0.0 \\ 0.0 \\" <<  nbPlanes;
    fileToBuild->InsertEntryString(str.str(),0x0020,0x0032, "DS");
 
    str.str("");