Program: gdcm
Module: $RCSfile: TestWrite.cxx,v $
Language: C++
- Date: $Date: 2004/12/03 20:16:55 $
- Version: $Revision: 1.12 $
+ Date: $Date: 2005/01/21 11:40:52 $
+ Version: $Revision: 1.16 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "gdcmHeader.h"
#include "gdcmFile.h"
+#include "gdcmFileHelper.h"
#include <iostream>
-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
{
std::string zozo;
- gdcm::Header* e1;
- gdcm::File * f1;
+ gdcm::File *e1;
+ gdcm::FileHelper *f1;
- //gdcmDocument * d; //not used
void* imageData;
int dataSize;
}
/*
if (0) { // Just to keep the code for further use
- std::cout <<std::endl << "-------- Test gdcmHeader ------" <<std::endl;
- e1 = new gdcmHeaderHelper(argv[1]);
- if (!f1->GetHeader()->IsReadable()) {
+ std::cout <<std::endl << "-------- Test gdcmFile ------" <<std::endl;
+ e1 = new gdcmFileHelper(argv[1]);
+ if (!f1->GetFile()->IsReadable()) {
std::cout << "Sorry, not a DICOM / ACR File" <<std::endl;
exit(0);
}
- std::cout << std::endl << "----------------------> after new gdcmHeader"
+ std::cout << std::endl << "----------------------> after new gdcmFile"
<< std::endl;
e1->PrintEntry();
std::cout <<std::endl <<"---------------------------------------"
std::string toto = argv[1];
std::string mode = argv[2];
- e1 = new gdcm::Header( toto.c_str() );
+ e1 = new gdcm::File( toto.c_str() );
if (!e1->IsReadable())
{
std::cerr << "Sorry, not a Readable DICOM / ACR File" <<std::endl;
}
// e1->Print();
- f1 = new gdcm::File(e1);
+ f1 = new gdcm::FileHelper(e1);
// ---
dataSize = f1->GetImageDataSize();
<< " SampleserPixel=" << sPP
<< " PlanarConfiguration=" << planarConfig
<< " PhotometricInterpretation="
- << e1->GetEntryByNumber(0x0028,0x0004)
+ << e1->GetEntry(0x0028,0x0004)
<< std::endl;
int numberOfScalarComponents=e1->GetNumberOfScalarComponents();
std::cout << "NumberOfScalarComponents " << numberOfScalarComponents <<std::endl;
- transferSyntaxName = e1->GetTransfertSyntaxName();
+ transferSyntaxName = e1->GetTransferSyntaxName();
std::cout << " TransferSyntaxName= [" << transferSyntaxName << "]" << std::endl;
/* if ( transferSyntaxName != "Implicit VR - Little Endian"
{
case 'a' :
// ecriture d'un fichier ACR
- // à partir d'un dcmHeader correct.
+ // à partir d'un dcmFile correct.
zozo = toto + ".ACR";
std::cout << "WriteACR" << std::endl;
case 'd' : // Not document in the 'usage', because the method is knowed to be bugged.
// ecriture d'un fichier DICOM Implicit VR
- // à partir d'un dcmHeader correct.
+ // à partir d'un dcmFile correct.
zozo = toto + ".DCM";
std::cout << "WriteDCM Implicit VR" << std::endl;
case 'x' :
// ecriture d'un fichier DICOM Explicit VR
- // à partir d'un dcmHeader correct.
+ // à partir d'un dcmFile correct.
zozo = toto + ".XDCM";
std::cout << "WriteDCM Explicit VR" << std::endl;
case 'v' :
- if ( f1->GetHeader()->GetBitsAllocated() == 8)
+ if ( f1->GetFile()->GetBitsAllocated() == 8)
{
std::cout << "videoinv for 8 bits" << std::endl;
for (int i=0; i<dataSize; i++)