X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestMakeIcon.cxx;h=e78c37f158858e8d0f414613d20b4e13a57ff7ef;hb=33601bb8697e2e1cb2e914aa0864d4cff8cf689f;hp=0e31543f10d3a8dc57d66810d48b329423c03349;hpb=ab0656f216518d796419d84eb7c7cec7fa2c1d69;p=gdcm.git

diff --git a/Testing/TestMakeIcon.cxx b/Testing/TestMakeIcon.cxx
index 0e31543f..e78c37f1 100644
--- a/Testing/TestMakeIcon.cxx
+++ b/Testing/TestMakeIcon.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestMakeIcon.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/11 13:12:05 $
-  Version:   $Revision: 1.3 $
+  Date:      $Date: 2005/07/21 14:05:09 $
+  Version:   $Revision: 1.8 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -30,8 +30,13 @@
 int TestMakeIcon (int argc, char *argv[])
 {
    // hard coded small image name
-   std::string input = "LIBIDO-8-ACR_NEMA-Lena_128_128.acr";
-   std::string output = "test.dcm";
+   std::string input = GDCM_DATA_ROOT;
+   input += "/"; 
+   input += "LIBIDO-8-ACR_NEMA-Lena_128_128.acr";
+
+   std::string output = "testIcon.dcm";
+
+   gdcm::Debug::DebugOn();
 
    if ( argc == 3 )
    {
@@ -44,24 +49,28 @@ int TestMakeIcon (int argc, char *argv[])
                 << " input filename.dcm output Filename.dcm" << std::endl;
    }
 
-   gdcm::File *f1 = new gdcm::File(input);
+   gdcm::File *f = new gdcm::File( );
+   f->SetFileName( input );
+   f->Load( );
 
-   if (f1 == 0)
+   if ( ! f->IsReadable() )
    {
-      std::cout << " failed to open file" << std::endl;
+      std::cout << " Failed to Open/Parse file" << input << std::endl;
+      delete f;
       return 1;
    }  
-   gdcm::FileHelper *fh1 = new gdcm::FileHelper(f1); 
-   uint8_t *pixels = fh1->GetImageData();
-   uint32_t lgth = fh1->GetImageDataSize();
+   gdcm::FileHelper *fh = new gdcm::FileHelper(f); 
+   uint8_t *pixels = fh->GetImageData();
+   uint32_t lgth   = fh->GetImageDataSize();
 
-   gdcm::SeqEntry *icon = f1->InsertSeqEntry(0x0088, 0x0200);
+   gdcm::SeqEntry *icon = f->InsertSeqEntry(0x0088, 0x0200);
    gdcm::SQItem *sqi = new gdcm::SQItem(1);
    icon->AddSQItem(sqi, 1);
 
    // icone is just define like the image
    // The purpose is NOT to imagine an icon, 
    // just check the stuff works
+
    uint16_t binVal[3]={0x52f7,0xf358,0xad9b};
  
    sqi->InsertValEntry( "MONOCHROME2", 0x0028,0x0004);
@@ -75,42 +84,58 @@ int TestMakeIcon (int argc, char *argv[])
    // just to see if it's stored a the right place
    sqi->InsertValEntry( "128", 0x0028,0x0011);
     
-   fh1->WriteDcmExplVR(output);
+   fh->WriteDcmExplVR(output);
 
-   delete f1;
+   delete f;
 
-   f1 = new gdcm::File(output);
-   f1->Print();
+   f = new gdcm::File();
+   f->SetFileName(output);
+   f->Load();
+   f->Print();
+   std::cout << "End of Print" << std::endl;
 
-   icon = f1->GetSeqEntry(0x0088, 0x0200);
+   icon = f->GetSeqEntry(0x0088, 0x0200);
+   if (!icon)
+   {
+      std::cout << "Sequence 0088|0200 not found" << std::endl
+                << "   ... Failed" << std::endl;
+      delete fh;
+      delete f;
+      return 1;
+   }
+   std::cout << "Sequence 0088|0200 found" << std::endl;
+   
    sqi = icon->GetFirstSQItem();
 
    if ( !sqi )
    {
-      std::cout << "Sequence 0088|0200 not found" << std::endl
+      std::cout << "Sequence 0088|0200 has no SQItem" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      delete fh;
+      delete f;
       return 1;
    }
 
+   std::cout << "First Item found" << std::endl;
+
    // Test for entry 0028|0010
    if ( !sqi->GetValEntry(0x0028,0x0010) )
    {
       std::cout << "ValEntry 0028|0010 not found" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      delete fh;
+      delete f;
       return 1;
    }
+   std::cout << "First Item ->ValEntry 0028|0010 found" << std::endl;
    if ( sqi->GetValEntry(0x0028,0x0010)->GetValue() != "128" )
    {
       std::cout << "Value 0028|0010 don't match" << std::endl
                 << "Read : " << sqi->GetValEntry(0x0028,0x0010)->GetValue()
                 << " - Expected : 128" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      delete fh;
+      delete f;
       return 1;
    }
 
@@ -119,18 +144,19 @@ int TestMakeIcon (int argc, char *argv[])
    {
       std::cout << "ValEntry 0028|0011 not found" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      delete fh;
+      delete f;
       return 1;
    }
+   std::cout << "First Item ->ValEntry 0028|0011 found" << std::endl;
    if ( sqi->GetValEntry(0x0028,0x0011)->GetValue() != "128" )
    {
       std::cout << "Value 0028|0011 don't match" << std::endl
                 << "Read : " << sqi->GetValEntry(0x0028,0x0011)->GetValue()
                 << " - Expected : 128" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      delete fh;
+      delete f;
       return 1;
    }
 
@@ -139,18 +165,19 @@ int TestMakeIcon (int argc, char *argv[])
    {
       std::cout << "ValEntry 0028|0100 not found" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      delete fh;
+      delete f;
       return 1;
    }
+   std::cout << "First Item ->ValEntry 0028|0100 found" << std::endl;
    if ( sqi->GetValEntry(0x0028,0x0100)->GetValue() != "8" )
    {
       std::cout << "Value 0028|0100 don't match" << std::endl
                 << "Read : " << sqi->GetValEntry(0x0028,0x0100)->GetValue()
                 << " - Expected : 8" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      delete fh;
+      delete f;
       return 1;
    }
 
@@ -159,18 +186,19 @@ int TestMakeIcon (int argc, char *argv[])
    {
       std::cout << "ValEntry 0028|0101 not found" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      delete fh;
+      delete f;
       return 1;
    }
+   std::cout << "First Item ->ValEntry 0028|0101 found" << std::endl;
    if ( sqi->GetValEntry(0x0028,0x0101)->GetValue() != "8" )
    {
       std::cout << "Value 0028|0101 don't match" << std::endl
                 << "Read : " << sqi->GetValEntry(0x0028,0x0101)->GetValue()
                 << " - Expected : 8" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      delete fh;
+      delete f;
       return 1;
    }
 
@@ -179,18 +207,19 @@ int TestMakeIcon (int argc, char *argv[])
    {
       std::cout << "ValEntry 0028|0102 not found" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      delete fh;
+      delete f;
       return 1;
    }
+   std::cout << "First Item ->ValEntry 0028|0102 found" << std::endl;
    if ( sqi->GetValEntry(0x0028,0x0102)->GetValue() != "7" )
    {
       std::cout << "Value 0028|0102 don't match" << std::endl
                 << "Read : " << sqi->GetValEntry(0x0028,0x0102)->GetValue()
                 << " - Expected : 7" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      delete fh;
+      delete f;
       return 1;
    }
 
@@ -199,52 +228,57 @@ int TestMakeIcon (int argc, char *argv[])
    {
       std::cout << "ValEntry 0028|0010 not found" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      delete fh;
+      delete f;
       return 1;
    }
+   std::cout << "First Item ->ValEntry 0028|0103 found" << std::endl;
    if ( sqi->GetValEntry(0x0028,0x0103)->GetValue() != "0" )
    {
       std::cout << "Value 0028|0103 don't match" << std::endl
                 << "Read : " << sqi->GetValEntry(0x0028,0x0103)->GetValue()
                 << " - Expected : 0" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      delete fh;
+      delete f;
       return 1;
    }
 
    // Test for entry 0005|0010
-   if ( !sqi->GetValEntry(0x0028,0x0010) )
+   if ( !sqi->GetBinEntry(0x0005,0x0010) )
    {
       std::cout << "BinEntry 0005|0010 not found" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      delete fh;
+      delete f;
       return 1;
    }
+   std::cout << "First Item ->BinEntry 0005|0010 found" << std::endl;
    if( sqi->GetBinEntry(0x0005,0x0010)->GetLength() != 6 )
    {
       std::cout << "BinEntry size 0005|0010 don't match" << std::endl
                 << "Read : " << sqi->GetValEntry(0x0005,0x0010)->GetLength()
                 << " - Expected : 6" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      delete fh;
+      delete f;
       return 1;
    }
 
+   std::cout << "Length BinEntry 0005|0010 OK" << std::endl;
+
    if( memcmp(sqi->GetBinEntry(0x0005,0x0010)->GetBinArea(),binVal,6)!=0 )
    {
       std::cout << "Value 0005|0010 don't match (BinEntry)" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      delete fh;
+      delete f;
       return 1;
    }
+   std::cout << "Value BinEntry 0005|0010 OK" << std::endl;
 
-   delete fh1;
-   delete f1;
+   delete fh;
+   delete f;
    std::cout << "   ... OK" << std::endl;
 
    return 0;