Program: gdcm
Module: $RCSfile: TestFileAccessors.cxx,v $
Language: C++
- Date: $Date: 2006/03/17 14:33:54 $
- Version: $Revision: 1.8 $
+ Date: $Date: 2006/04/07 10:58:51 $
+ Version: $Revision: 1.9 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
//Generated file:
#include "gdcmDataImages.h"
-#define TestMethodMacro(mode,obj,name) \
- try \
- { \
- std::cout << " " << #name << "() : " << mode << obj->name() << std::endl; \
- } \
- catch(...) \
- { \
- std::cout << " --> Can't access to the '" << #name << "' method !" << std::endl; \
- f->Delete(); \
- return 1; \
+#define TestMethodMacro(mode,obj,name) \
+ try \
+ { \
+ std::cout <<" "<< #name << "() : " \
+ << std::endl; \
+ std::cout << " " \
+ << mode << obj->name() << std::endl; \
+ } \
+ catch(...) \
+ { \
+ std::cout << " --> Can't access to the '" \
+ << #name << "' method !" << std::endl;\
+ f->Delete(); \
+ return 1; \
}
-
-int TestFileAccessors(int, char *[])
+int TestFileAccessors(int argc, char *argv[])
{
int i = 0;
float iop[6];
+ // gdcm::Debug::DebugOn();
+
while( gdcmDataImages[i] != 0 )
{
// if (gdcmDataImages[i] == "00191113.dcm" )
// gdcm::Debug::DebugOn();
// else
- gdcm::Debug::DebugOff();
+ // gdcm::Debug::DebugOff();
- std::string filename = GDCM_DATA_ROOT;
- filename += "/"; //doh!
- filename += gdcmDataImages[i];
+ std::string filename;
+ if (argc ==2)
+ {
+ filename = argv[1];
+ }
+ else
+ {
+ filename = GDCM_DATA_ROOT;
+ filename += "/"; //doh!
+ filename += gdcmDataImages[i];
+ }
- std::cout << "Begin with " << filename << std::endl;
+ std::cout << " ----------------------------------------------"
+ << "Begin with " << filename << std::endl;
+
gdcm::File *f= gdcm::File::New( );
f->SetFileName( filename );
f->Load( );
f->Delete();
return 1;
}
-
f->Delete();
- std::cout << "End with " << filename << std::endl;
+
+ if (argc ==2)
+ break; // user asked to check a single file.
+
i++;
}
return 0;
Program: gdcm
Module: $RCSfile: TestPrintAllDocument.cxx,v $
Language: C++
- Date: $Date: 2006/01/19 11:00:28 $
- Version: $Revision: 1.12 $
+ Date: $Date: 2006/04/07 10:58:51 $
+ Version: $Revision: 1.13 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
//Generated file:
#include "gdcmDataImages.h"
-int TestPrintAllDocument(int, char *[])
+int TestPrintAllDocument(int argc, char *argv[])
{
//std::ostringstream s;
int i = 0;
std::string pixelType, photomInterp;
int l;
l = strlen("PALETTE COLOR ");
+
+ //gdcm::Debug::DebugOn();
+
while( gdcmDataImages[i] != 0 )
{
- std::string filename = GDCM_DATA_ROOT;
- filename += "/"; //doh!
- filename += gdcmDataImages[i];
+ std::string filename;
+ if (argc ==2)
+ {
+ filename = argv[1];
+ }
+ else
+ {
+ filename = GDCM_DATA_ROOT;
+ filename += "/"; //doh!
+ filename += gdcmDataImages[i];
+ }
+
+ std::cout << " ----------------------------------------------"
+ << "Begin with " << filename << std::endl;
gdcm::File *f= gdcm::File::New( );
f->SetFileName( filename );
f->SetPrintLevel(2);
f->Print();
- // just to be able to grep the display result, for some usefull info
-
+
//s.setf(std::ios::left);
//s << std::setw(60-filename.length()) << " ";
//std::cout << s.str() << gdcmDataImages[i];
return 1;
}
f->Delete();
+
+ if (argc ==2)
+ break; // user asked to check a single file.
+
i++;
}
return 0;
Program: gdcm
Module: $RCSfile: TestWriteSimple.cxx,v $
Language: C++
- Date: $Date: 2005/10/28 13:16:48 $
- Version: $Revision: 1.46 $
+ Date: $Date: 2006/04/07 10:58:51 $
+ Version: $Revision: 1.47 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmFile.h"
#include "gdcmFileHelper.h"
#include "gdcmDebug.h"
+#include "gdcmGlobal.h"
+#include "gdcmDictSet.h"
#include <iostream>
#include <sstream>
} Image;
Image Images [] = {
-
{128, 128, 1, 1, 8, 8, 0, 'e'},
+ {256, 128, 1, 1, 8, 8, 0, 'a'},
+ {128, 128, 1, 1, 8, 8, 0, 'i'},
+
+ {128, 128, 1, 1, 8, 8, 0, 'a'},
+ {256, 128, 1, 1, 8, 8, 0, 'i'},
+
+
{256, 128, 1, 1, 8, 8, 0, 'e'},
{128, 128, 1, 1, 16, 16, 0, 'e'},
{128, 256, 1, 1, 16, 16, 0, 'e'},
-
- {128, 128, 1, 1, 8, 8, 0, 'i'},
- {256, 128, 1, 1, 8, 8, 0, 'i'},
- {256, 128, 1, 1, 8, 8, 0, 'a'},
- {128, 128, 1, 1, 8, 8, 0, 'a'},
{128, 256, 1, 1, 8, 8, 0, 'e'},
{128, 256, 1, 1, 8, 8, 0, 'i'},
{128, 256, 1, 1, 16, 16, 0, 'i'},
{128, 256, 1, 1, 16, 16, 0, 'i'},
{128, 256, 1, 1, 16, 16, 0, 'a'},
- {128, 256, 1, 1, 16, 16, 0, 'a'},
+ {128, 256, 1, 1, 16, 16, 0, 'a'},
{256, 128, 10, 1, 8, 8, 0, 'e'},
{256, 128, 10, 3, 8, 8, 0, 'e'},
int WriteSimple(Image &img)
{
+
+ std::cout << "======================= WriteSimple =========(begin of processing current image)" << std::endl;
std::ostringstream fileName;
fileName.str("");
fileName << "TestWriteSimple";
fileH->SetImageData(imageData,size);
// Step 4 : Set the writting mode and write the image
- std::cout << "4...";
fileH->SetWriteModeToRaw();
+ std::cout << "4'...";
switch (img.writeMode)
{
case 'a' : // Write an ACR file
return 1;
}
+ std::cout << std::endl;
+ fileToBuild->Print();
+
if( !fileH->Write(fileName.str()) )
{
std::cout << "Failed for [" << fileName.str() << "]\n"
- << " File is unwrittable\n";
+ << " File is unwrittable" << std::endl;
fileH->Delete();
}
// Step 5 : Read the written image
- std::cout << "5...";
+ std::cout << "5..." << std::endl;
// old form.
//gdcm::FileHelper *reread = new gdcm::FileHelper( fileName.str() );
// Better use :
- gdcm::FileHelper *reread = gdcm::FileHelper::New( );
- reread->SetFileName( fileName.str() );
- reread->SetLoadMode(gdcm::LD_ALL); // Load everything
+ gdcm::File *f = gdcm::File::New( );
+ f->SetLoadMode(gdcm::LD_ALL);
+ f->SetFileName( fileName.str() );
+
+ //reread->SetFileName( fileName.str() );
+ //reread->SetLoadMode(gdcm::LD_ALL); // Load everything
// Possible values are
// gdcm::LD_ALL,
// gdcm::LD_NOSEQ,
// gdcm::LD_NOSHADOW,
// gdcm::LD_NOSEQ|gdcm::LD_NOSHADOW,
// gdcm::LD_NOSHADOWSEQ
- reread->Load();
+
+ f->Load();
+ // reread->Load();
+ gdcm::FileHelper *reread = gdcm::FileHelper::New( f );
+
+ reread->Print();
if( !reread->GetFile()->IsReadable() )
{
}
// Step 6 : Compare to the written image
- std::cout << "6...";
+ std::cout << "6..." << std::endl;
size_t dataSizeWritten = reread->GetImageDataSize();
uint8_t *imageDataWritten = reread->GetImageData();
return 1;
}
- // Test the data's content
+ // Test the data content
if ( memcmp(imageData, imageDataWritten, size) !=0 )
{
std::cout << "Failed" << std::endl
return 1;
}
- std::cout << "OK" << std::endl;
-
fileH->Delete();
reread->Delete();
delete[] imageData;
-
return 0;
}
return 1;
}
- gdcm::Debug::DebugOn();
-
+ // gdcm::Debug::DebugOn();
+ char c;
int ret=0;
int i=0;
while( Images[i].sizeX>0 && Images[i].sizeY>0 )
{
- std::cout << "Test n :" << i;
+ std::cout << "Test n :" << i <<std::endl;;
ret += WriteSimple(Images[i] );
i++;
+
}
return ret;
git://git.creatis.insa-lyon.fr / gdcm.git / commitdiff