X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FPrintFile.cxx;h=7cc42f70e5b51bff1f90015f12b11e94b9c7aac7;hb=8afcac16f1406492a512a14845b6234bc9fee5ed;hp=810712a490e634a21f211b7663062f0fa0dff0cf;hpb=cba27e8db47fefa11652b98dd81d782c13eb9a80;p=gdcm.git

diff --git a/Example/PrintFile.cxx b/Example/PrintFile.cxx
index 810712a4..7cc42f70 100644
--- a/Example/PrintFile.cxx
+++ b/Example/PrintFile.cxx
@@ -1,52 +1,55 @@
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: PrintFile.cxx,v $
+  Language:  C++
+  Date:      $Date: 2004/11/25 10:24:33 $
+  Version:   $Revision: 1.14 $
+                                                                                
+  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"
 
-#include "gdcmException.h"
-#include "gdcmCommon.h"
-
-#include "gdcmDictEntry.h"
-#include "gdcmDict.h"
-#include "gdcmDictSet.h"
-#include "gdcmHeader.h"
-#include "gdcmUtil.h"
-#include "gdcmBinEntry.h"  
-#include "gdcmDocEntry.h" 
-#include "gdcmDocEntrySet.h"           
-#include "gdcmDocument.h"          
-#include "gdcmElementSet.h"        
-#include "gdcmSeqEntry.h" 
-#include "gdcmSQItem.h" 
-#include "gdcmValEntry.h" 
-#include "gdcmFile.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(),false, true);
-
-   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();
@@ -59,7 +62,7 @@ int main(int argc, char* argv[])
    planarConfig = e1->GetPlanarConfiguration();
    
    std::cout << " pixelType="           << pixelType 
-             << " SampleserPixel="      << sPP
+             << " SamplesPerPixel="     << sPP
              << " PlanarConfiguration=" << planarConfig 
              << std::endl 
              << " PhotometricInterpretation=" 
@@ -67,8 +70,19 @@ 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;
    
@@ -77,13 +91,13 @@ int main(int argc, char* argv[])
       && transferSyntaxName != "Deflated Explicit VR - Little Endian"      
       && transferSyntaxName != "Explicit VR - Big Endian"
       && transferSyntaxName != "Uncompressed ACR-NEMA"     )
-  {
+   {
       std::cout << std::endl << "==========================================="
                   << std::endl; 
-         f1->ParsePixelData();  // gdcmFile Method :-(
+         f1->GetPixelConverter()->Print();
       std::cout << std::endl << "==========================================="
                   << std::endl; 
-   }      
+   }
    
    if(e1->IsReadable())
       std::cout <<std::endl<<fileName<<" is Readable"<<std::endl;