X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Testing%2FTestMakeIcon.cxx;h=e7aa034ce6b626b8019674b3548714d621cd8154;hb=4552d4ee18f3234af4e037e77abf0622c2702004;hp=1efc44e4c5ea8e429499d471d8df0da9392c6f77;hpb=4978dd66554aafb749fed4b2fb7887b307795920;p=gdcm.git

diff --git a/Testing/TestMakeIcon.cxx b/Testing/TestMakeIcon.cxx
index 1efc44e4..e7aa034c 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/04/25 14:35:21 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2007/08/29 15:56:41 $
+  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
@@ -20,10 +20,9 @@
 #include "gdcmCommon.h"
 #include "gdcmFile.h"
 #include "gdcmFileHelper.h"
+#include "gdcmDataEntry.h"
 #include "gdcmSeqEntry.h"
 #include "gdcmSQItem.h"
-#include "gdcmValEntry.h"
-#include "gdcmBinEntry.h"
 
 // 0088 0200 SQ 1 Icon Image Sequence 
 
@@ -36,7 +35,7 @@ int TestMakeIcon (int argc, char *argv[])
 
    std::string output = "testIcon.dcm";
 
-   gdcm::Debug::DebugOn();
+   GDCM_NAME_SPACE::Debug::DebugOn();
 
    if ( argc == 3 )
    {
@@ -49,53 +48,59 @@ int TestMakeIcon (int argc, char *argv[])
                 << " input filename.dcm output Filename.dcm" << std::endl;
    }
 
-   gdcm::File *f1 = new gdcm::File(input);
+   GDCM_NAME_SPACE::File *f = GDCM_NAME_SPACE::File::New( );
+   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;
+      f->Delete();
       return 1;
    }  
-   gdcm::FileHelper *fh1 = new gdcm::FileHelper(f1); 
-   uint8_t *pixels = fh1->GetImageData();
-   uint32_t lgth = fh1->GetImageDataSize();
+   GDCM_NAME_SPACE::FileHelper *fh = GDCM_NAME_SPACE::FileHelper::New(f); 
+   uint8_t *pixels = fh->GetImageData();
+   uint32_t lgth   = fh->GetImageDataSize();
 
-   gdcm::SeqEntry *icon = f1->InsertSeqEntry(0x0088, 0x0200);
-   gdcm::SQItem *sqi = new gdcm::SQItem(1);
+   GDCM_NAME_SPACE::SeqEntry *icon = f->InsertSeqEntry(0x0088, 0x0200);
+   GDCM_NAME_SPACE::SQItem *sqi = GDCM_NAME_SPACE::SQItem::New(1);
    icon->AddSQItem(sqi, 1);
+   sqi->Delete();
 
-   // icone is just define like the image
+   // icone is just defined 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);
-   sqi->InsertValEntry( "128", 0x0028,0x0010);
-   sqi->InsertValEntry( "8",   0x0028,0x0100);
-   sqi->InsertValEntry( "8",   0x0028,0x0101);
-   sqi->InsertValEntry( "7",   0x0028,0x0102);
-   sqi->InsertValEntry( "0",   0x0028,0x0103);
-   sqi->InsertBinEntry(  (uint8_t *)binVal, 3*2, 0x0005,0x0010,"OW");
-   sqi->InsertBinEntry(  pixels, lgth, 0x7fe0,0x0010);
+   sqi->InsertEntryString( "MONOCHROME2", 0x0028,0x0004, "CS");
+   sqi->InsertEntryString( "128", 0x0028,0x0010, "US");
+   sqi->InsertEntryString( "8",   0x0028,0x0100, "US");
+   sqi->InsertEntryString( "8",   0x0028,0x0101, "US");
+   sqi->InsertEntryString( "7",   0x0028,0x0102, "US");
+   sqi->InsertEntryString( "0",   0x0028,0x0103, "US");
+   sqi->InsertEntryBinArea(  (uint8_t *)binVal, 3*2, 0x0005,0x0010,"OB");
+   sqi->InsertEntryBinArea(  pixels, lgth, 0x7fe0,0x0010,"OB");
    // just to see if it's stored a the right place
-   sqi->InsertValEntry( "128", 0x0028,0x0011);
+   sqi->InsertEntryString( "128", 0x0028,0x0011, "US");
     
-   fh1->WriteDcmExplVR(output);
+   fh->WriteDcmExplVR(output);
 
-   delete f1;
+   f->Delete();
+   fh->Delete();
 
-   f1 = new gdcm::File(output);
-   f1->Print();
+   f = GDCM_NAME_SPACE::File::New();
+   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 fh1;
-      delete f1;
+      f->Delete();
       return 1;
    }
    std::cout << "Sequence 0088|0200 found" << std::endl;
@@ -106,174 +111,157 @@ int TestMakeIcon (int argc, char *argv[])
    {
       std::cout << "Sequence 0088|0200 has no SQItem" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      f->Delete();
       return 1;
    }
 
    std::cout << "First Item found" << std::endl;
 
    // Test for entry 0028|0010
-   if ( !sqi->GetValEntry(0x0028,0x0010) )
+   if ( !sqi->GetDataEntry(0x0028,0x0010) )
    {
-      std::cout << "ValEntry 0028|0010 not found" << std::endl
+      std::cout << "GetDataEntry 0028|0010 not found" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      f->Delete();
       return 1;
    }
-   std::cout << "First Item ->ValEntry 0028|0010 found" << std::endl;
-   if ( sqi->GetValEntry(0x0028,0x0010)->GetValue() != "128" )
+   std::cout << "First Item ->DataEntry 0028|0010 found" << std::endl;
+   if ( sqi->GetDataEntry(0x0028,0x0010)->GetString() != "128" )
    {
       std::cout << "Value 0028|0010 don't match" << std::endl
-                << "Read : " << sqi->GetValEntry(0x0028,0x0010)->GetValue()
+                << "Read : " << sqi->GetDataEntry(0x0028,0x0010)->GetString()
                 << " - Expected : 128" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      f->Delete();
       return 1;
    }
 
    // Test for entry 0028|0011
-   if ( !sqi->GetValEntry(0x0028,0x0011) )
+   if ( !sqi->GetDataEntry(0x0028,0x0011) )
    {
-      std::cout << "ValEntry 0028|0011 not found" << std::endl
+      std::cout << "GetDataEntry 0028|0011 not found" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      f->Delete();
       return 1;
    }
-   std::cout << "First Item ->ValEntry 0028|0011 found" << std::endl;
-   if ( sqi->GetValEntry(0x0028,0x0011)->GetValue() != "128" )
+   std::cout << "First Item ->DataEntry 0028|0011 found" << std::endl;
+   if ( sqi->GetDataEntry(0x0028,0x0011)->GetString() != "128" )
    {
       std::cout << "Value 0028|0011 don't match" << std::endl
-                << "Read : " << sqi->GetValEntry(0x0028,0x0011)->GetValue()
+                << "Read : " << sqi->GetDataEntry(0x0028,0x0011)->GetString()
                 << " - Expected : 128" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      f->Delete();
       return 1;
    }
 
    // Test for entry 0028|0100
-   if ( !sqi->GetValEntry(0x0028,0x0100) )
+   if ( !sqi->GetDataEntry(0x0028,0x0100) )
    {
-      std::cout << "ValEntry 0028|0100 not found" << std::endl
+      std::cout << "GetDataEntry 0028|0100 not found" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      f->Delete();
       return 1;
    }
-   std::cout << "First Item ->ValEntry 0028|0100 found" << std::endl;
-   if ( sqi->GetValEntry(0x0028,0x0100)->GetValue() != "8" )
+   std::cout << "First Item ->DataEntry 0028|0100 found" << std::endl;
+   if ( sqi->GetDataEntry(0x0028,0x0100)->GetString() != "8" )
    {
       std::cout << "Value 0028|0100 don't match" << std::endl
-                << "Read : " << sqi->GetValEntry(0x0028,0x0100)->GetValue()
+                << "Read : " << sqi->GetDataEntry(0x0028,0x0100)->GetString()
                 << " - Expected : 8" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      f->Delete();
       return 1;
    }
 
    // Test for entry 0028|0101
-   if ( !sqi->GetValEntry(0x0028,0x0101) )
+   if ( !sqi->GetDataEntry(0x0028,0x0101) )
    {
-      std::cout << "ValEntry 0028|0101 not found" << std::endl
+      std::cout << "GetDataEntry 0028|0101 not found" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      f->Delete();
       return 1;
    }
-   std::cout << "First Item ->ValEntry 0028|0101 found" << std::endl;
-   if ( sqi->GetValEntry(0x0028,0x0101)->GetValue() != "8" )
+   std::cout << "First Item ->DataEntry 0028|0101 found" << std::endl;
+   if ( sqi->GetDataEntry(0x0028,0x0101)->GetString() != "8" )
    {
       std::cout << "Value 0028|0101 don't match" << std::endl
-                << "Read : " << sqi->GetValEntry(0x0028,0x0101)->GetValue()
+                << "Read : " << sqi->GetDataEntry(0x0028,0x0101)->GetString()
                 << " - Expected : 8" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      f->Delete();
       return 1;
    }
 
    // Test for entry 0028|0102
-   if ( !sqi->GetValEntry(0x0028,0x0102) )
+   if ( !sqi->GetDataEntry(0x0028,0x0102) )
    {
-      std::cout << "ValEntry 0028|0102 not found" << std::endl
+      std::cout << "DataEntry 0028|0102 not found" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      f->Delete();
       return 1;
    }
-   std::cout << "First Item ->ValEntry 0028|0102 found" << std::endl;
-   if ( sqi->GetValEntry(0x0028,0x0102)->GetValue() != "7" )
+   std::cout << "First Item ->DataEntry 0028|0102 found" << std::endl;
+   if ( sqi->GetDataEntry(0x0028,0x0102)->GetString() != "7" )
    {
       std::cout << "Value 0028|0102 don't match" << std::endl
-                << "Read : " << sqi->GetValEntry(0x0028,0x0102)->GetValue()
+                << "Read : " << sqi->GetDataEntry(0x0028,0x0102)->GetString()
                 << " - Expected : 7" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      f->Delete();
       return 1;
    }
 
    // Test for entry 0028|0103
-   if ( !sqi->GetValEntry(0x0028,0x0103) )
+   if ( !sqi->GetDataEntry(0x0028,0x0103) )
    {
-      std::cout << "ValEntry 0028|0010 not found" << std::endl
+      std::cout << "GetDataEntry 0028|0010 not found" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      f->Delete();
       return 1;
    }
-   std::cout << "First Item ->ValEntry 0028|0103 found" << std::endl;
-   if ( sqi->GetValEntry(0x0028,0x0103)->GetValue() != "0" )
+   std::cout << "First Item ->DataEntry 0028|0103 found" << std::endl;
+   if ( sqi->GetDataEntry(0x0028,0x0103)->GetString() != "0" )
    {
       std::cout << "Value 0028|0103 don't match" << std::endl
-                << "Read : " << sqi->GetValEntry(0x0028,0x0103)->GetValue()
+                << "Read : " << sqi->GetDataEntry(0x0028,0x0103)->GetString()
                 << " - Expected : 0" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      f->Delete();
       return 1;
    }
 
    // Test for entry 0005|0010
-   if ( !sqi->GetBinEntry(0x0005,0x0010) )
+   if ( !sqi->GetDataEntry(0x0005,0x0010) )
    {
-      std::cout << "BinEntry 0005|0010 not found" << std::endl
+      std::cout << "GetDataEntry 0005|0010 not found" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      f->Delete();
       return 1;
    }
-   std::cout << "First Item ->BinEntry 0005|0010 found" << std::endl;
-   if( sqi->GetBinEntry(0x0005,0x0010)->GetLength() != 6 )
+   std::cout << "First Item ->GetDataEntry 0005|0010 found" << std::endl;
+   if( sqi->GetDataEntry(0x0005,0x0010)->GetLength() != 6 )
    {
-      std::cout << "BinEntry size 0005|0010 don't match" << std::endl
-                << "Read : " << sqi->GetValEntry(0x0005,0x0010)->GetLength()
+      std::cout << "GetDataEntry size 0005|0010 don't match" << std::endl
+                << "Read : " << sqi->GetDataEntry(0x0005,0x0010)->GetLength()
                 << " - Expected : 6" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      f->Delete();
       return 1;
    }
 
-   std::cout << "Length BinEntry 0005|0010 OK" << std::endl;
+   std::cout << "Length GetDataEntry 0005|0010 OK" << std::endl;
 
-   if( memcmp(sqi->GetBinEntry(0x0005,0x0010)->GetBinArea(),binVal,6)!=0 )
+   if( memcmp(sqi->GetDataEntry(0x0005,0x0010)->GetBinArea(),binVal,6)!=0 )
    {
-      std::cout << "Value 0005|0010 don't match (BinEntry)" << std::endl
+      std::cout << "Value 0005|0010 don't match (DataEntry)" << std::endl
                 << "   ... Failed" << std::endl;
-      delete fh1;
-      delete f1;
+      f->Delete();
       return 1;
    }
-   std::cout << "Value BinEntry 0005|0010 OK" << std::endl;
+   std::cout << "Value DataEntry 0005|0010 OK" << std::endl;
 
-   delete fh1;
-   delete f1;
+   f->Delete();
    std::cout << "   ... OK" << std::endl;
 
    return 0;