Program: gdcm
Module: $RCSfile: TestWrite.cxx,v $
Language: C++
- Date: $Date: 2004/12/03 11:55:37 $
- Version: $Revision: 1.11 $
+ Date: $Date: 2005/03/02 17:22:11 $
+ Version: $Revision: 1.19 $
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 "gdcmFile.h"
+#include "gdcmFileHelper.h"
+
#include <iostream>
-#include <stdio.h>
-#include "gdcm.h"
-int main(int argc, char* argv[])
+int main(int argc, char *argv[])
{
- std::string toto;
- char zozo[200];
-
+ std::string fileNameToWrite;
- gdcm::Header* e1;
- gdcm::File * f1;
+ gdcm::File *e1;
+ gdcm::FileHelper *f1;
- //gdcmDocument * d; //not used
- void* imageData;
+ void *imageData;
int dataSize;
if (argc < 3) {
}
/*
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 <<"---------------------------------------"
<< "--------------------- file :" << argv[1]
<< std::endl;
- toto = argv[1];
+ std::string fileName = argv[1];
+ std::string mode = argv[2];
- e1 = new gdcm::Header( toto.c_str() );
+ e1 = new gdcm::File( fileName.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->GetEntryValue(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"
}*/
imageData= f1->GetImageData();
- switch (argv[2][0]) {
+ switch (mode[0])
+ {
case 'a' :
// ecriture d'un fichier ACR
- // à partir d'un dcmHeader correct.
+ // à partir d'un dcmFile correct.
- sprintf(zozo, "%s.ACR", toto.c_str());
- printf ("WriteACR\n");
- f1->WriteAcr(zozo);
+ fileNameToWrite = fileName + ".ACR";
+ std::cout << "WriteACR" << std::endl;
+ f1->WriteAcr(fileNameToWrite);
break;
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.
- sprintf(zozo, "%s.DCM", toto.c_str());
- printf ("WriteDCM Implicit VR\n");
- f1->WriteDcmImplVR(zozo);
+ fileNameToWrite = fileName + ".DCM";
+ std::cout << "WriteDCM Implicit VR" << std::endl;
+ f1->WriteDcmImplVR(fileNameToWrite);
break;
case 'x' :
// ecriture d'un fichier DICOM Explicit VR
- // à partir d'un dcmHeader correct.
+ // à partir d'un dcmFile correct.
- sprintf(zozo, "%s.XDCM", toto.c_str());
+ fileNameToWrite = fileName + ".XDCM";
std::cout << "WriteDCM Explicit VR" << std::endl;
- f1->WriteDcmExplVR(zozo);
+ f1->WriteDcmExplVR(fileNameToWrite);
break;
case 'r' :
// Ecriture d'un Raw File, a afficher avec
// affim filein= dimx= dimy= nbit= signe=
- sprintf(zozo, "%s.RAW", toto.c_str());
+ fileNameToWrite = fileName + ".RAW";
std::cout << "WriteRaw" << std::endl;
- f1->WriteRawData(zozo);
+ f1->WriteRawData(fileNameToWrite);
break;
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++)
{
- ((uint8_t*)imageData)[i] += 127;
+ ((uint8_t*)imageData)[i] = 255 - ((uint8_t*)imageData)[i];
}
}
else
std::cout << "videoinv for 16 bits" << std::endl;
for (int i=0; i<dataSize/2; i++)
{
- ((uint16_t*)imageData)[i] += 60000; //32767;
+ ((uint16_t*)imageData)[i] = 65535 - ((uint16_t*)imageData)[i];
}
}
- sprintf(zozo, "%s.VDCM", toto.c_str());
- printf ("WriteDCM Explicit VR + VideoInv\n");
- f1->WriteDcmExplVR(zozo);
+ fileNameToWrite = fileName + ".VDCM";
+ std::cout << "WriteDCM Explicit VR + VideoInv" << std::endl;
+ f1->WriteDcmExplVR(fileNameToWrite);
break;
}
- return 0;
+ delete e1;
+ delete f1;
+ return 0;
}