X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=2064640f10f4b4d6af75d68d432c2a966664767c;hb=544e9b239eea5ec46a1e637a58e9cbe86afdc08a;hp=f3b9da41aad9ae5526feac02a9e4be7375317a8b;hpb=124a85e1eb04cf5a874f06c7dc937ee9609f67b7;p=gdcm.git

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index f3b9da41..2064640f 100644
--- a/Example/PrintFile.cxx
+++ b/Example/PrintFile.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: PrintFile.cxx,v $
   Language:  C++
-  Date:      $Date: 2006/01/19 11:43:48 $
-  Version:   $Revision: 1.78 $
+  Date:      $Date: 2006/03/29 16:15:01 $
+  Version:   $Revision: 1.80 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -126,10 +126,11 @@ int main(int argc, char *argv[])
    " Display the header of a ACR-NEMA/PAPYRUS/DICOM File                      ",
    " usage: PrintFile {filein=inputFileName|dirin=inputDirectoryName}[level=n]",
    "                       [forceload=listOfElementsToForceLoad]              ",
-   "                       [dict= privateDirectory]                           ",
+   "                       [4DLoc= ][dict= privateDirectory]                  ",
    "                       [ { [noshadowseq] | [noshadow][noseq] } ]          ",
    "                       [debug] [warning]                                  ",
    "      level = 0,1,2 : depending on the amount of details user wants to see",
+   "      4DLoc: group-elem(in hexa, no space) of the DataEntry holdind 4thDim",
    "      listOfElementsToForceLoad : group-elem,g2-e2,... (in hexa, no space)",
    "                                of Elements to load whatever their length ",
    "      privateDirectory : source file full path name of Shadow Group elems ",
@@ -151,8 +152,8 @@ int main(int argc, char *argv[])
       return 1;
    }
 
-   char *fileName = am->ArgMgrGetString("filein",(char *)0);
-   char *dirName  = am->ArgMgrGetString("dirin",(char *)0);
+   const char *fileName = am->ArgMgrGetString("filein");
+   const char *dirName  = am->ArgMgrGetString("dirin");
 
    if ( (fileName == 0 && dirName == 0) ||
         (fileName != 0 && dirName != 0) )
@@ -187,15 +188,29 @@ int main(int argc, char *argv[])
    int forceLoadNb;
    uint16_t *elemsToForceLoad 
                            = am->ArgMgrGetXInt16Enum("forceload", &forceLoadNb);
+   
+   int nbP;
+   uint16_t *FourthDimLoc;
+   if ( am->ArgMgrDefined("4DLoc") )
+   {
+      FourthDimLoc = am->ArgMgrGetXInt16Enum("4DLoc", &nbP);
+   
+      if (nbP != 1) 
+      {   
+         std::cout << "4DLoc must have 2 and only 2 components!" << std::endl;
+         delete am;
+         return 1;      
+      }
+   }
 
    bool showlut = ( 0 != am->ArgMgrDefined("SHOWLUT") );
 
    bool ddict = am->ArgMgrDefined("dict") ? true : false;
-   char *dict = 0;
+   const char *dict = 0;
 
    if (ddict)
    {
-     dict = am->ArgMgrGetString("dict",(char *)0);
+     dict = am->ArgMgrGetString("dict",0);
    }
 
    /* if unused Param we give up */
@@ -250,6 +265,8 @@ errno = 0;
          f->Delete();
          return 0;
       }
+      if (nbP == 1)
+         f->SetFourthDimensionLocation(FourthDimLoc[0],FourthDimLoc[1]);
 
       gdcm::FileHelper *fh = gdcm::FileHelper::New(f);
       fh->SetPrintLevel( level );
@@ -262,12 +279,14 @@ errno = 0;
       std::cout <<" dataSize    " << fh->GetImageDataSize()    << std::endl;
       std::cout <<" dataSizeRaw " << fh->GetImageDataRawSize() << std::endl;
 
-      int nX,nY,nZ,sPP,planarConfig;
+      int nX,nY,nZ,nT,sPP,planarConfig;
       std::string pixelType;
       nX=f->GetXSize();
       nY=f->GetYSize();
       nZ=f->GetZSize();
-      std::cout << " DIMX=" << nX << " DIMY=" << nY << " DIMZ=" << nZ 
+      nT=f->GetTSize();
+      std::cout << " DIMX=" << nX << " DIMY=" << nY 
+                << " DIMZ=" << nZ << " DIMT=" << nT
                 << std::endl;
 
       pixelType    = f->GetPixelType();