Unify both codes

diff --git a/Example/exExtractOverlaysACR.cxx b/Example/exExtractOverlaysACR.cxx
index b3615af12c8b9a9ef143937f9cd9c42551b7f60e..0fd4be510f4da1080e48bb2c24168482c437dd7d 100644 (file)
--- a/Example/exExtractOverlaysACR.cxx
+++ b/Example/exExtractOverlaysACR.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: exExtractOverlaysACR.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/10/19 15:06:08 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2007/10/30 09:15:57 $
+  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
@@ -60,12 +60,14 @@ int main(int argc, char *argv[])
    START_USAGE(usage)
    " \n exExtractOverlaysACR :\n                                              ",
    " Extract ACR-NEMA style overlays from an image                            ",
-   " usage: exExtractOverlaysACR filein=inputFileName  [debug]                ",
+   "         Resulting image name(s) are postpended with .ovly.dcm            ",
+   " usage: exExtractOverlaysACR filein=inputFileName  [debug] [warning]      ",
+   "        warning  : user wants to run the program in 'warning mode'        ",
    "        debug    : developper wants to run the program in 'debug mode'    ",
    FINISH_USAGE
 
    // ----- Initialize Arguments Manager ------
-   
+
    GDCM_NAME_SPACE::ArgMgr *am = new GDCM_NAME_SPACE::ArgMgr(argc, argv);
 
    if (argc == 1 || am->ArgMgrDefined("usage"))
@@ -79,10 +81,10 @@ int main(int argc, char *argv[])
 
    if (am->ArgMgrDefined("debug"))
       GDCM_NAME_SPACE::Debug::DebugOn();
-      
+
    if (am->ArgMgrDefined("warning"))
       GDCM_NAME_SPACE::Debug::WarningOn();
-      
+
    // if unused Param we give up
    if ( am->ArgMgrPrintUnusedLabels() )
    {
@@ -93,7 +95,7 @@ int main(int argc, char *argv[])
 
    delete am;  // we don't need Argument Manager any longer
 
-   // ========================== Now, we can do the job! ================ 
+   // ========================== Now, we can do the job! ================
 
    GDCM_NAME_SPACE::File *f;
 
@@ -105,8 +107,7 @@ int main(int argc, char *argv[])
 
    f->SetLoadMode(GDCM_NAME_SPACE::LD_NOSEQ | GDCM_NAME_SPACE::LD_NOSHADOW);
    f->SetFileName( fileName );
-   bool res = f->Load();  
-
+   bool res = f->Load();
 
    if (!res) {
        std::cout << "Sorry, " << fileName <<"  not a gdcm-readable "
@@ -137,7 +138,7 @@ int main(int argc, char *argv[])
    }
    std::cout << fileName << " is read! " << std::endl;
 
-   
+
 // ============================================================
 //   Load the pixels in memory.
 // ============================================================
@@ -156,7 +157,7 @@ int main(int argc, char *argv[])
 
    unsigned int nx = f->GetXSize();
    unsigned int ny = f->GetYSize();
-   unsigned int nxy=nx*ny;   
+   unsigned int nxy=nx*ny;
    uint16_t currentOvlGroup;
    int i;
 

diff --git a/Example/exExtractOverlaysDCM.cxx b/Example/exExtractOverlaysDCM.cxx
index caebfe65c107ab98abbd7d0af5b8196064ec2dc4..306bb8c2a83be44e721eeb5d41517a0a517d8b85 100755 (executable)
--- a/Example/exExtractOverlaysDCM.cxx
+++ b/Example/exExtractOverlaysDCM.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: exExtractOverlaysDCM.cxx,v $
   Language:  C++
-  Date:      $Date: 2007/10/25 07:55:02 $
-  Version:   $Revision: 1.4 $
+  Date:      $Date: 2007/10/30 09:15:58 $
+  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
@@ -25,16 +25,17 @@
 
 #include <iostream>
 
-// Each BIT of Overlay Data (0x6000,0x3000) corresponds 
+// Each BIT of Overlay Data (0x60xx,0x3000) corresponds
 // to a BYTE of overlay image.
-void explodeByte(unsigned char byte, unsigned char* result) 
+
+void explodeByte(unsigned char byte, unsigned char* result)
 {
    unsigned char mask = 1;
-   for (int i=0;i<8;i++) 
+   for (int i=0;i<8;i++)
    {
-      if ((byte & mask)==0) 
+      if ((byte & mask)==0)
          result[i]=0;
-      else 
+      else
          result[i]=1;
       mask<<=1;
    }
@@ -44,14 +45,16 @@ void explodeByte(unsigned char byte, unsigned char* result)
 int main(int argc, char *argv[])
 {
    START_USAGE(usage)
-   " \n ExtractOverlays :\n                                                   ",
+   " \n exExtractOverlaysDCM :\n                                              ",
    " Extract DICOM style overlays from an image                               ",
-   " usage: exExtractOverlaysDCM filein=inputFileName  [debug]                ",
+   "         Resulting image name(s) are postpended with .ovly.dcm            ",
+   " usage: exExtractOverlaysDCM filein=inputFileName  [debug] [warning]      ",
+   "        warning  : user wants to run the program in 'warning mode'        ",
    "        debug    : developper wants to run the program in 'debug mode'    ",
    FINISH_USAGE
 
    // ----- Initialize Arguments Manager ------
-   
+
    GDCM_NAME_SPACE::ArgMgr *am = new GDCM_NAME_SPACE::ArgMgr(argc, argv);
 
    if (argc == 1 || am->ArgMgrDefined("usage"))
@@ -65,10 +68,10 @@ int main(int argc, char *argv[])
 
    if (am->ArgMgrDefined("debug"))
       GDCM_NAME_SPACE::Debug::DebugOn();
-      
+
    if (am->ArgMgrDefined("warning"))
       GDCM_NAME_SPACE::Debug::WarningOn();
-      
+
    // if unused Param we give up
    if ( am->ArgMgrPrintUnusedLabels() )
    {
@@ -79,7 +82,7 @@ int main(int argc, char *argv[])
 
    delete am;  // we don't need Argument Manager any longer
 
-   // ========================== Now, we can do the job! ================ 
+   // ========================== Now, we can do the job! ================
 
    GDCM_NAME_SPACE::File *f;
 
@@ -88,7 +91,7 @@ int main(int argc, char *argv[])
 // ============================================================
 
    f = GDCM_NAME_SPACE::File::New( );
-   
+
    f->AddForceLoadElement(0x6000,0x3000);  // Overlay Data
    f->AddForceLoadElement(0x6002,0x3000); 
    f->AddForceLoadElement(0x6004,0x3000); 
@@ -125,7 +128,7 @@ int main(int argc, char *argv[])
 
    unsigned int nx = f->GetXSize();
    unsigned int ny = f->GetYSize();
-   unsigned int nxy=nx*ny;   
+   unsigned int nxy=nx*ny;
    uint16_t currentOvlGroup;
    int i;
 
@@ -137,7 +140,7 @@ int main(int argc, char *argv[])
    GDCM_NAME_SPACE::FileHelper *fh = 0;
 
 // ============================================================
-//   Get each overlay 
+//   Get each overlay group into the image header
 // ============================================================
    for(i=0, currentOvlGroup=0x6000; i<32; i+=2 ,currentOvlGroup+=2)
    {