* src/gdcmBinEntry.cxx, gdcmSeqEntry.cxx, gdcmSQItem.cxx, gdcmValEntry.cxx :

[gdcm.git] / Example / PrintFile.cxx

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 48bc00a031d62b0068615334ddef4d6b1a956042..4b02c55b78d009275ce3ec574fed5d6c7396b587 100644 (file)
--- a/Example/PrintFile.cxx
+++ b/Example/PrintFile.cxx
@@ -1,3 +1,20 @@
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: PrintFile.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/11/24 16:39:17 $
+  Version:   $Revision: 1.13 $
+                                                                                
+  Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
+  l'Image). All rights reserved. See Doc/License.txt or
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
 #include <iostream>
 #include "gdcm.h"
 
@@ -29,7 +46,9 @@ int main(int argc, char* argv[])
    std::cout << "\n\n" << std::endl; 
 
    int dataSize = f1->GetImageDataSize();
-   std::cout <<std::endl <<" dataSize " << dataSize << std::endl;
+   std::cout <<std::endl;
+   std::cout <<" dataSize " << dataSize << std::endl;
+   std::cout <<" dataSizeRaw " << f1->GetImageDataSizeRaw() << std::endl;
    int nX,nY,nZ,sPP,planarConfig;
    std::string pixelType;
    nX=e1->GetXSize();
@@ -42,7 +61,7 @@ int main(int argc, char* argv[])
    planarConfig = e1->GetPlanarConfiguration();
    
    std::cout << " pixelType="           << pixelType 
-             << " SampleserPixel="      << sPP
+             << " SamplesPerPixel="     << sPP
              << " PlanarConfiguration=" << planarConfig 
              << std::endl 
              << " PhotometricInterpretation=" 
@@ -50,10 +69,12 @@ int main(int argc, char* argv[])
              << std::endl;
 
    int numberOfScalarComponents=e1->GetNumberOfScalarComponents();
-   std::cout << " NumberOfScalarComponents " << numberOfScalarComponents <<std::endl;
+   std::cout << " NumberOfScalarComponents " << numberOfScalarComponents <<std::endl
+             << " LUT=" << (e1->HasLUT() ? "TRUE" : "FALSE")
+             << std::endl;
 
   
-  if ( e1->GetEntryByNumber(0x0002,0x0010) == GDCM_NOTLOADED ) {
+  if ( e1->GetEntryByNumber(0x0002,0x0010) == gdcm::GDCM_NOTLOADED ) {
      std::cout << "Transfert Syntax not loaded. " << std::endl
                << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE"
                << std::endl;
@@ -71,7 +92,7 @@ int main(int argc, char* argv[])
   {
       std::cout << std::endl << "==========================================="
                   << std::endl; 
-         f1->ParsePixelData();
+         f1->GetPixelConverter()->Print();
       std::cout << std::endl << "==========================================="
                   << std::endl; 
    }