Fix mistypings

[gdcm.git] / Testing / TestImageSet.cxx

diff --git a/Testing/TestImageSet.cxx b/Testing/TestImageSet.cxx
index 05e6c66f7f95bdfb51635d446d534cfc7036ef16..24168671cce4468302b5e43852b6a5b20e7dbedd 100644 (file)
--- a/Testing/TestImageSet.cxx
+++ b/Testing/TestImageSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: TestImageSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/10/18 08:35:46 $
-  Version:   $Revision: 1.5 $
+  Date:      $Date: 2007/05/23 14:18:06 $
+  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
@@ -32,17 +32,17 @@
 #include <sstream>
 #include <list>
 
-typedef std::list<gdcm::File *> FileList;
+typedef std::list<GDCM_NAME_SPACE::File *> FileList;
 
 // If there is sameSerie, sameStudy is set to true
 int CompareImages(FileList &list, bool sameSerie, bool sameStudy)
 {
-   gdcm::Debug::DebugOn();
+   GDCM_NAME_SPACE::Debug::DebugOn();
 
    if( sameSerie )
       sameStudy = true;
 
-   gdcm::DataEntry *entry;
+   GDCM_NAME_SPACE::DataEntry *entry;
    std::map<std::string, int> instUID;
    std::map<std::string, int> mediaUID;
    std::map<std::string, int> serieUID;
@@ -141,30 +141,30 @@ void ClearList(FileList &list)
    FileList::iterator it;
    for(it=list.begin();it!=list.end();++it)
    {
-      delete (*it);
+      (*it)->Delete();
    }
    list.clear();
 }
 
-gdcm::File *WriteImage(gdcm::File *file, const std::string &fileName)
+GDCM_NAME_SPACE::File *WriteImage(GDCM_NAME_SPACE::File *file, const std::string &fileName)
 {
    // Create a 256x256x1 image 8 bits, unsigned 
    std::ostringstream str;
 
    // Set the image size
-   file->InsertEntryString("256",0x0028,0x0011); // Columns
-   file->InsertEntryString("256",0x0028,0x0010); // Rows
+   file->InsertEntryString("256",0x0028,0x0011,"US"); // Columns
+   file->InsertEntryString("256",0x0028,0x0010,"US"); // Rows
 
    // Set the pixel type
-   file->InsertEntryString("8",0x0028,0x0100); // Bits Allocated
-   file->InsertEntryString("8",0x0028,0x0101); // Bits Stored
-   file->InsertEntryString("7",0x0028,0x0102); // High Bit
+   file->InsertEntryString("8",0x0028,0x0100,"US"); // Bits Allocated
+   file->InsertEntryString("8",0x0028,0x0101,"US"); // Bits Stored
+   file->InsertEntryString("7",0x0028,0x0102,"US"); // High Bit
 
    // Set the pixel representation
-   file->InsertEntryString("0",0x0028,0x0103); // Pixel Representation
+   file->InsertEntryString("0",0x0028,0x0103,"US"); // Pixel Representation
 
    // Set the samples per pixel
-   file->InsertEntryString("1",0x0028,0x0002); // Samples per Pixel
+   file->InsertEntryString("1",0x0028,0x0002,"US"); // Samples per Pixel
 
    // The so called 'prepared image', built ex nihilo just before,
    // has NO Pixel Element yet.
@@ -182,7 +182,7 @@ gdcm::File *WriteImage(gdcm::File *file, const std::string &fileName)
    memset(imageData,0,size);
 
 // Write the image
-   gdcm::FileHelper *hlp = new gdcm::FileHelper(file);
+   GDCM_NAME_SPACE::FileHelper *hlp = GDCM_NAME_SPACE::FileHelper::New(file);
    hlp->SetImageData(imageData,size);
    hlp->SetWriteTypeToDcmExplVR();
    if( !hlp->Write(fileName) )
@@ -190,22 +190,22 @@ gdcm::File *WriteImage(gdcm::File *file, const std::string &fileName)
       std::cout << "Failed\n"
                 << "        File in unwrittable\n";
 
-      delete hlp;
+      hlp->Delete();
       delete[] imageData;
       return NULL;
    }
    delete[] imageData;
-   delete hlp;
+   hlp->Delete();
 
 // Read the written image
-   gdcm::File *reread = new gdcm::File(  );
+   GDCM_NAME_SPACE::File *reread = GDCM_NAME_SPACE::File::New(  );
    reread->SetFileName( fileName );
    reread->Load();
    if( !reread->IsReadable() )
    {
      std::cerr << "Failed" << std::endl
                << "        Could not reread written image :" << fileName << std::endl;
-     delete reread;
+     reread->Delete();
      return NULL;
    }
 
@@ -233,8 +233,8 @@ int TestImageSet(int argc, char *argv[])
              << "           to different Series within the same Study" << std::endl;
    std::cout << std::endl << std::endl;
 
-   gdcm::File *file;
-   gdcm::File *newFile;
+   GDCM_NAME_SPACE::File *file;
+   GDCM_NAME_SPACE::File *newFile;
    FileList fileList;
    int i;
 
@@ -248,25 +248,25 @@ int TestImageSet(int argc, char *argv[])
    {
       std::ostringstream fileName;
       fileName << "FileSeq" << i << ".dcm";
-      file = new gdcm::File();
+      file = GDCM_NAME_SPACE::File::New();
       // It's up to the user to initialize Serie UID and Study UID
       // Study Instance UID
-      studyUID = gdcm::Util::CreateUniqueUID();
-      file->InsertEntryString(studyUID, 0x0020, 0x000d);
+      studyUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
+      file->InsertEntryString(studyUID, 0x0020, 0x000d, "UI");
       // Series Instance UID
-      serieUID = gdcm::Util::CreateUniqueUID();
-      file->InsertEntryString(serieUID, 0x0020, 0x000e);
+      serieUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
+      file->InsertEntryString(serieUID, 0x0020, 0x000e, "UI");
 
       newFile = WriteImage(file, fileName.str());
       if( !newFile )
       {
-         delete file;
+         file->Delete();
          return 1;
       }
       else
          fileList.push_back(newFile);
 
-      delete file;
+      file->Delete();
    }
 
    if( CompareImages(fileList, false, false) )
@@ -280,26 +280,26 @@ int TestImageSet(int argc, char *argv[])
 
    // Step 2 : Same Serie & Study
    fileList.clear();
-   studyUID = gdcm::Util::CreateUniqueUID();
-   serieUID = gdcm::Util::CreateUniqueUID();
+   studyUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
+   serieUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
    for(i = 0;i < 4;i++)
    {
       std::ostringstream fileName;
       fileName << "FileSeq" << i << ".dcm";
-      file = new gdcm::File();
-      file->InsertEntryString(studyUID, 0x0020, 0x000d);
-      file->InsertEntryString(serieUID, 0x0020, 0x000e);
+      file = GDCM_NAME_SPACE::File::New();
+      file->InsertEntryString(studyUID, 0x0020, 0x000d, "UI");
+      file->InsertEntryString(serieUID, 0x0020, 0x000e, "UI");
 
       newFile = WriteImage(file, fileName.str());
       if( !newFile )
       {
-         delete file;
+         file->Delete();
          return(1);
       }
       else
          fileList.push_back(newFile);
 
-      delete file;
+      file->Delete();
    }
 
    if( CompareImages(fileList, true, true) )
@@ -313,25 +313,25 @@ int TestImageSet(int argc, char *argv[])
 
    // Step 3 : Same Study
    fileList.clear();
-   serieUID = gdcm::Util::CreateUniqueUID();
+   serieUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
    for(i = 0;i < 4;i++)
    {
       std::ostringstream fileName;
       fileName << "FileSeq" << i << ".dcm";
-      file = new gdcm::File();
-      file->InsertEntryString(studyUID, 0x0020, 0x000d);
-      serieUID = gdcm::Util::CreateUniqueUID();
-      file->InsertEntryString(serieUID, 0x0020, 0x000e);
+      file = GDCM_NAME_SPACE::File::New();
+      file->InsertEntryString(studyUID, 0x0020, 0x000d, "UI");
+      serieUID = GDCM_NAME_SPACE::Util::CreateUniqueUID();
+      file->InsertEntryString(serieUID, 0x0020, 0x000e, "UI");
       newFile = WriteImage(file, fileName.str());
       if( !newFile )
       {
-         delete file;
+         file->Delete();
          return(1);
       }
       else
          fileList.push_back(newFile);
 
-      delete file;
+      file->Delete();
    }
 
    if( CompareImages(fileList, false, true) )