X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=85275e2ea229c37b7f83f7609ebae99568fbd801;hb=1c35ba5e5bc72b0861b92698dd4ea29f0bab5f73;hp=ad890128ab1b86909b3487b072a98ad865fbab8b;hpb=ab62b1a706df8e2ab1fbf26fa5037d6c22293655;p=gdcm.git

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index ad890128..85275e2e 100644
--- a/Example/PrintFile.cxx
+++ b/Example/PrintFile.cxx
@@ -1,35 +1,57 @@
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: PrintFile.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/12/03 20:16:55 $
+  Version:   $Revision: 1.17 $
+                                                                                
+  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 "gdcmHeader.h"
+#include "gdcmFile.h"
+
 #include <iostream>
-#include "gdcm.h"
 
 int main(int argc, char* argv[])
 {
- 
-   gdcmHeader *e1;
-   gdcmFile   *f1;
+   gdcm::Header *e1;
+   gdcm::File   *f1;
    std::string fileName;   
-   if (argc != 2) {
+   if (argc != 2) 
+   {
       std::cout << " usage : PrintDocument fileName" << std::endl;
    }
 
-   if (argc > 1) {
+   if (argc > 1) 
+   {
       fileName=argv[1];
-   } else {
+   } 
+   else 
+   {
       fileName += GDCM_DATA_ROOT;
       fileName += "/test.acr";
    }
    
-   e1= new gdcmHeader( fileName.c_str() );
-
-   f1 = new gdcmFile(e1);
+   e1= new gdcm::Header( fileName.c_str() );
+   f1 = new gdcm::File(e1);
 
    e1->SetPrintLevel(2);
-   
    e1->Print();
-      
+
    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 " << f1->GetImageDataSize() << std::endl;
+   std::cout <<" dataSizeRaw " << f1->GetImageDataRawSize() << std::endl;
+
    int nX,nY,nZ,sPP,planarConfig;
    std::string pixelType;
    nX=e1->GetXSize();
@@ -42,7 +64,7 @@ int main(int argc, char* argv[])
    planarConfig = e1->GetPlanarConfiguration();
    
    std::cout << " pixelType="           << pixelType 
-             << " SampleserPixel="      << sPP
+             << " SamplesPerPixel="     << sPP
              << " PlanarConfiguration=" << planarConfig 
              << std::endl 
              << " PhotometricInterpretation=" 
@@ -50,23 +72,34 @@ 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::GDCM_NOTLOADED ) 
+   {
+      std::cout << "Transfert Syntax not loaded. " << std::endl
+                << "Better you increase MAX_SIZE_LOAD_ELEMENT_VALUE"
+                << std::endl;
+      return 0;
+   }
+  
    std::string transferSyntaxName = e1->GetTransfertSyntaxName();
    std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]" << std::endl;
    
-   if (  transferSyntaxName != "Implicit VR - Little Endian"
+/*   if (  transferSyntaxName != "Implicit VR - Little Endian"
       && transferSyntaxName != "Explicit VR - Little Endian"     
       && transferSyntaxName != "Deflated Explicit VR - Little Endian"      
       && transferSyntaxName != "Explicit VR - Big Endian"
       && transferSyntaxName != "Uncompressed ACR-NEMA"     )
-  {
+   {
       std::cout << std::endl << "==========================================="
                   << std::endl; 
-         f1->ParsePixelData();
+         f1->GetPixelReadConverter()->Print();
       std::cout << std::endl << "==========================================="
                   << std::endl; 
-   }      
+   }*/
    
    if(e1->IsReadable())
       std::cout <<std::endl<<fileName<<" is Readable"<<std::endl;