+2004-12-03 Mathieu Malaterre <Mathieu.Malaterre@creatis.insa-lyon.fr>
+ * Huge cleanup:
+ - Remove printf / sprintf
+ - include iostream AFTER gdcm so we don't get warnings
+ - GDCM_NO_ANSI_STRING_STREAM shouldn't be used explitely ouside of gdcm source
+ - Also remove tons of include from header files, hopefully this should speeup the compilation time, since it was becoming a dog slow.
+ - Remove gdcm.h as it include way too many files and slow down compilation (plus it is not up to date)
+ - remove 'using namespace std' this is BAD !
+
2004-12-03 Benoit Regrain <Benoit.Regrain@creatis.insa-lyon.fr>
* Remove memory leaks on the DicomDir
* Remove some useless datas in DicomDirObject
Program: gdcm
Module: $RCSfile: BuildUpDicomDir.cxx,v $
Language: C++
- Date: $Date: 2004/11/30 18:10:23 $
- Version: $Revision: 1.9 $
+ Date: $Date: 2004/12/03 20:16:55 $
+ Version: $Revision: 1.10 $
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 "gdcm.h"
#include "gdcmDocEntry.h"
#include "gdcmDicomDir.h"
#include "gdcmDicomDirPatient.h"
#include "gdcmDirList.h"
#include "gdcmDebug.h"
-
-#include <fstream>
-#include <iostream>
-#include <stdio.h>
-#ifdef GDCM_NO_ANSI_STRING_STREAM
-# include <strstream>
-# define ostringstream ostrstream
-# else
-# include <sstream>
-#endif
-
-#define ostringstream ostrstream
-
-#include <sys/types.h>
-#include <errno.h>
-
-// for Directory pb
-#if defined(_MSC_VER) || defined(__BORLANDC__)
- #include <windows.h>
- #include <direct.h>
- #include <stdio.h>
-#else
- #include <dirent.h>
- #include <unistd.h>
-#endif
-
-#include <vector>
-#include <algorithm>
+#include "gdcmDicomDirStudy.h"
+#include "gdcmDicomDirSerie.h"
+#include "gdcmDicomDirImage.h"
// ===============================================================
/**
gdcm::DicomDir *dcmdir;
dcmdir = new gdcm::DicomDir();
- printf( "\n------- BuildUpDicomDir: Test Print Meta only -----\n");
+ std::cout << "\n------- BuildUpDicomDir: Test Print Meta only -----" << std::endl;
((gdcm::Document *)dcmdir)->Print();
gdcm::DicomDirPatient *p1=dcmdir->NewPatient();
ADD_EXECUTABLE(FlatHashTablePrint FlatHashTablePrint.cxx)
TARGET_LINK_LIBRARIES(FlatHashTablePrint gdcm)
+
+ADD_EXECUTABLE(Volume2Dicom Volume2Dicom.cxx)
+TARGET_LINK_LIBRARIES(Volume2Dicom gdcm)
Program: gdcm
Module: $RCSfile: FindTags.cxx,v $
Language: C++
- Date: $Date: 2004/11/16 04:26:17 $
- Version: $Revision: 1.5 $
+ Date: $Date: 2004/12/03 20:16:55 $
+ Version: $Revision: 1.6 $
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 <iostream>
-#include "gdcm.h"
-#include "math.h"
-#include <stdio.h>
+#include "gdcmFile.h"
+#include "gdcmHeader.h"
+#include "gdcmUtil.h"
-int main(int argc, char* argv[]) {
+#include <iostream>
+int main(int argc, char* argv[])
+{
std::string toto, titi;
gdcm::File * f1;
std::string ManufacturerName="SIEMENS ";
std::string RecCode="ACR-NEMA 2.0";
std::string ImagePositionPatient, Location, ImageLocation;
- char zozo[100], zizi[50];
+ std::string zozo;
char c;
float x, y, z, l;
int dataSize = f1->GetImageDataSize();
- printf ("---> pourFindTaggs : dataSize %d\n",dataSize);
+ std::cout << "---> pourFindTaggs : dataSize " << dataSize << std::endl;
f1->SetEntryByNumber(RecCode ,0x0008,0x0010);
f1->SetEntryByNumber(ManufacturerName ,0x0008,0x0070);
// existerait-il qq chose qui marche à tout coup?
// Location
- sprintf(zizi,"%f\n",l);
- Location = zizi;
+ std::string zizi = gdcm::Util::Format("%f",l);
+ Location = gdcm::Util::DicomString(zizi.c_str());
f1->SetEntryByNumber(Location, 0x0020,0x0050);
// sinon, la longueur du champ est erronée (?!?)
// Image Location
- sprintf(zizi,"%d\n",0x7FE0);
- ImageLocation = zizi;
+ zizi = gdcm::Util::Format("%d",0x7FE0);
+ ImageLocation = gdcm::Util::DicomString(zizi.c_str());
//f1->SetEntryByNumber(Location, 0x0028,0x0200);
//f1->GetHeader()->SetEntryLengthByNumber(strlen(ImageLocation.c_str())-1, 0x0020,0x0050); // prudence !
// ecriture d'un fichier ACR à partir d'un dcmHeader correct.
- printf ("----------------avant PrintEntry---------------------\n");
+ std::cout << "----------------avant PrintEntry---------------------" << std::endl;
f1->GetHeader()->Print();
- printf ("----------------avant WriteDcm---------------------\n");
+ std::cout << "----------------avant WriteDcm---------------------" << std::endl;
// ecriture d'un fichier ACR à partir d'un dcmHeader correct.
- sprintf(zozo, "%s.acr", toto.c_str());
- printf ("WriteACR\n");
+ zozo = toto + ".acr";
+ std::cout << "WriteACR" << std::endl;
f1->WriteAcr(zozo);
- printf ("----------------apres Write---------------------\n");
+ std::cout << "----------------apres Write---------------------" << std::endl;
- return 0;
+ return 0;
}
Program: gdcm
Module: $RCSfile: FlatHashTablePrint.cxx,v $
Language: C++
- Date: $Date: 2004/11/16 04:26:17 $
- Version: $Revision: 1.4 $
+ Date: $Date: 2004/12/03 20:16:55 $
+ Version: $Revision: 1.5 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
=========================================================================*/
#include "gdcmHeader.h"
+#include "gdcmDocEntry.h"
// Iterate on all the Dicom entries encountered in the gdcmFile (given
// as line argument) and print them. This is an illustration of the
Program: gdcm
Module: $RCSfile: PrintDicomDir.cxx,v $
Language: C++
- Date: $Date: 2004/11/16 04:26:17 $
- Version: $Revision: 1.6 $
+ Date: $Date: 2004/12/03 20:16:55 $
+ Version: $Revision: 1.7 $
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 <iostream>
-#include "gdcm.h"
#include "gdcmDocument.h"
#include "gdcmDicomDir.h"
#include "gdcmValEntry.h"
+#include "gdcmDicomDirPatient.h"
+#include "gdcmDicomDirStudy.h"
+#include "gdcmDicomDirSerie.h"
+#include "gdcmDicomDirImage.h"
+#include "gdcmTS.h"
#include <fstream>
-
-using namespace std;
+#include <iostream>
int main(int argc, char* argv[])
{
*/
- cout << std::endl << std::endl
+ std::cout << std::endl << std::endl
<< " = PATIENT/STUDY/SERIE List =================================="
<< std::endl<< std::endl;
Program: gdcm
Module: $RCSfile: PrintDocument.cxx,v $
Language: C++
- Date: $Date: 2004/11/16 04:26:17 $
- Version: $Revision: 1.8 $
+ Date: $Date: 2004/12/03 20:16:55 $
+ 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
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
+#include "gdcmHeader.h"
+
#include <iostream>
-#include "gdcm.h"
int main(int argc, char* argv[])
{
Program: gdcm
Module: $RCSfile: PrintFile.cxx,v $
Language: C++
- Date: $Date: 2004/12/03 11:55:37 $
- Version: $Revision: 1.16 $
+ Date: $Date: 2004/12/03 20:16:55 $
+ Version: $Revision: 1.17 $
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 <iostream>
-#include "gdcm.h"
int main(int argc, char* argv[])
{
Program: gdcm
Module: $RCSfile: PrintHeader.cxx,v $
Language: C++
- Date: $Date: 2004/12/03 10:21:53 $
- Version: $Revision: 1.11 $
+ Date: $Date: 2004/12/03 20:16:55 $
+ Version: $Revision: 1.12 $
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 <iostream>
-#include "gdcm.h"
int main(int argc, char* argv[])
{
Program: gdcm
Module: $RCSfile: TestDcm2Acr.cxx,v $
Language: C++
- Date: $Date: 2004/11/16 04:26:18 $
- Version: $Revision: 1.4 $
+ Date: $Date: 2004/12/03 20:16:55 $
+ Version: $Revision: 1.5 $
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 "gdcmHeader.h"
+
#include <iostream>
-#include "gdcm.h"
-#include <stdio.h>
int main(int argc, char* argv[])
{
std::string toto;
- char zozo[100];
+ std::string zozo;
gdcm::File * f1;
- printf (" Before gdcmFile() \n");
- printf ("\n\n---------------------------------------\n\n");
+ std::cout << " Before gdcmFile()" << std::endl;
+ std::cout << "\n\n---------------------------------------" << std::endl;
- if (argc > 1) {
+ if (argc > 1)
+ {
toto = argv[1];
f1 = new gdcm::File(toto);
- } else {
+ }
+ else
+ {
std::string filename = GDCM_DATA_ROOT;
filename += "/test.acr";
- f1 = new gdcm::File(filename.c_str());
+ f1 = new gdcm::File(filename);
}
- printf (" Sortie gdcmFile() \n");
+ std::cout << " Sortie gdcmFile()" << std::endl;
//e1.PrintPubDict(std::cout);
f1->GetHeader()->Print();
//cle = gdcmDictEntry::TranslateToKey(0x0028,0x0008);
int dataSize = f1->GetImageDataSize();
- printf ("dataSize %d\n",dataSize);
+ std::cout << "dataSize:" << dataSize << std::endl;
// void* imageData= f1->GetHeader()->GetImageData();
// ecriture d'un fichier ACR à partir d'un dcmHeader correct.
- sprintf(zozo, "%s.nema", toto.c_str());
+ zozo = toto + ".nema";
f1->WriteAcr(zozo);
- printf ("\n\n---------------------------------------\n\n");
+ std::cout << "\n\n---------------------------------------\n\n" << std::endl;
f1->GetHeader()->Print();
Program: gdcm
Module: $RCSfile: TestWrite.cxx,v $
Language: C++
- Date: $Date: 2004/12/03 11:55:37 $
- Version: $Revision: 1.11 $
+ Date: $Date: 2004/12/03 20:16:55 $
+ Version: $Revision: 1.12 $
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 <iostream>
-#include <stdio.h>
-#include "gdcm.h"
int main(int argc, char* argv[])
{
- std::string toto;
- char zozo[200];
-
+ std::string zozo;
gdcm::Header* e1;
gdcm::File * f1;
<< "--------------------- file :" << argv[1]
<< std::endl;
- toto = argv[1];
+ std::string toto = argv[1];
+ std::string mode = argv[2];
e1 = new gdcm::Header( toto.c_str() );
if (!e1->IsReadable())
}*/
imageData= f1->GetImageData();
- switch (argv[2][0]) {
+ switch (mode[0])
+ {
case 'a' :
// ecriture d'un fichier ACR
// à partir d'un dcmHeader correct.
- sprintf(zozo, "%s.ACR", toto.c_str());
- printf ("WriteACR\n");
+ zozo = toto + ".ACR";
+ std::cout << "WriteACR" << std::endl;
f1->WriteAcr(zozo);
break;
// ecriture d'un fichier DICOM Implicit VR
// à partir d'un dcmHeader correct.
- sprintf(zozo, "%s.DCM", toto.c_str());
- printf ("WriteDCM Implicit VR\n");
+ zozo = toto + ".DCM";
+ std::cout << "WriteDCM Implicit VR" << std::endl;
f1->WriteDcmImplVR(zozo);
break;
// ecriture d'un fichier DICOM Explicit VR
// à partir d'un dcmHeader correct.
- sprintf(zozo, "%s.XDCM", toto.c_str());
+ zozo = toto + ".XDCM";
std::cout << "WriteDCM Explicit VR" << std::endl;
f1->WriteDcmExplVR(zozo);
break;
// Ecriture d'un Raw File, a afficher avec
// affim filein= dimx= dimy= nbit= signe=
- sprintf(zozo, "%s.RAW", toto.c_str());
+ zozo = toto + ".RAW";
std::cout << "WriteRaw" << std::endl;
f1->WriteRawData(zozo);
break;
((uint16_t*)imageData)[i] += 60000; //32767;
}
}
- sprintf(zozo, "%s.VDCM", toto.c_str());
- printf ("WriteDCM Explicit VR + VideoInv\n");
+ zozo = toto + ".VDCM";
+ std::cout << "WriteDCM Explicit VR + VideoInv" << std::endl;
f1->WriteDcmExplVR(zozo);
break;
Program: gdcm
Module: $RCSfile: TestWriteSimple.cxx,v $
Language: C++
- Date: $Date: 2004/11/16 04:26:18 $
- Version: $Revision: 1.5 $
+ Date: $Date: 2004/12/03 20:16:55 $
+ Version: $Revision: 1.6 $
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 "gdcm.h"
+#include "gdcmHeader.h"
+#include "gdcmFile.h"
int main(int argc, char* argv[])
{
Program: gdcm
Module: $RCSfile: Write.cxx,v $
Language: C++
- Date: $Date: 2004/12/03 11:55:37 $
- Version: $Revision: 1.11 $
+ Date: $Date: 2004/12/03 20:16:55 $
+ Version: $Revision: 1.12 $
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 <iostream>
-#include <stdio.h>
-#include "gdcm.h"
int main(int argc, char* argv[])
{
- std::string toto;
- char zozo[200];
+ std::string zozo;
gdcm::Header* e1;
gdcm::File * f1;
<< "--------------------- file :" << argv[1]
<< std::endl;
- toto = argv[1];
+ std::string toto = argv[1];
e1 = new gdcm::Header( toto.c_str() );
if (!e1->IsReadable()) {
imageData= f1->GetImageData();
(void)imageData; // to avoid warnings
- switch (argv[2][0]) {
+ switch (argv[2][0])
+ {
case 'a' :
// ecriture d'un fichier ACR
// à partir d'un dcmHeader correct.
- sprintf(zozo, "%s.ACR", toto.c_str());
- printf ("WriteACR\n");
+ zozo = toto + ".ACR";
+ std::cout << "WriteACR" << std::endl;
f1->WriteAcr(zozo);
break;
// ecriture d'un fichier DICOM Implicit VR
// à partir d'un dcmHeader correct.
- sprintf(zozo, "%s.DCM", toto.c_str());
- printf ("WriteDCM Implicit VR\n");
+ zozo = toto + ".DCM";
+ std::cout << "WriteDCM Implicit VR" << std::endl;
f1->WriteDcmImplVR(zozo);
break;
// ecriture d'un fichier DICOM Explicit VR
// à partir d'un dcmHeader correct.
- sprintf(zozo, "%s.XDCM", toto.c_str());
- std::cout << "WriteDCM Explicit VR" << std::endl;
+ zozo = toto + ".DCM";
+ std::cout << "WriteDCM Implicit VR" << std::endl;
f1->WriteDcmExplVR(zozo);
break;
// Ecriture d'un Raw File, a afficher avec
// affim filein= dimx= dimy= nbit= signe=
- sprintf(zozo, "%s.RAW", toto.c_str());
+ zozo = toto + ".RAW";
std::cout << "WriteRaw" << std::endl;
f1->WriteRawData(zozo);
break;
Program: gdcm
Module: $RCSfile: WriteDicom.cxx,v $
Language: C++
- Date: $Date: 2004/11/26 10:55:03 $
- Version: $Revision: 1.8 $
+ Date: $Date: 2004/12/03 20:16:55 $
+ 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
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include "gdcm.h"
+#include "gdcmHeader.h"
+#include "gdcmFile.h"
// Writting of a DICOM file based on a correct dicom header
// and data pixel of another image
int main(int argc, char* argv[])
{
- if (argc < 3)
- {
- std::cerr << "Usage :" << std::endl << argv[0] <<
- " HeaderFileName DataFileName" << std::endl;
- return 0;
- }
-
- const char *first = argv[1];
- gdcm::File *f1 = new gdcm::File( first );
-
- const char *second = argv[2];
- gdcm::File *f2 = new gdcm::File( second );
-
- // We assume that DICOM fields of second file actually exists :
-
- std::string nbFrames = f2->GetHeader()->GetEntryByNumber(0x0028, 0x0008);
- if(nbFrames != "gdcm::Unfound") {
- f1->GetHeader()->ReplaceOrCreateByNumber( nbFrames, 0x0028, 0x0008);
- }
-
- f1->GetHeader()->ReplaceOrCreateByNumber(
- f2->GetHeader()->GetEntryByNumber(0x0028, 0x0010), 0x0028, 0x0010); // nbLig
- f1->GetHeader()->ReplaceOrCreateByNumber(
- f2->GetHeader()->GetEntryByNumber(0x0028, 0x0011), 0x0028, 0x0011); // nbCol
-
- // Some other tags should be updated:
-
- // TODO : add a default value
- // TODO : a function which take as input a list of tuple (gr, el)
- // and that does the job
-
- int dataSize = f2->GetImageDataSize();
- uint8_t* imageData = f2->GetImageData();
-
- std::cout << "dataSize :" << dataSize << std::endl;
-
- // TODO : Shouldn't we merge those two functions ?
- f1->SetImageData( imageData, dataSize);
-
- f1->GetHeader()->Print();
-
- std::string s0 = f2->GetHeader()->GetEntryByNumber(0x7fe0, 0x0000);
- std::string s10 = f2->GetHeader()->GetEntryByNumber(0x7fe0, 0x0010);
-
- std::cout << "lgr 7fe0, 0000 " << s0 << std::endl;
- std::cout << "lgr 7fe0, 0010 " << s10 << std::endl;
-
- std::cout << "WriteDCM" << std::endl;
-
- f1->WriteDcmExplVR("WriteDicom.dcm");
-
- return 0;
+ if (argc < 3)
+ {
+ std::cerr << "Usage :" << std::endl << argv[0] <<
+ " HeaderFileName DataFileName" << std::endl;
+ return 0;
+ }
+
+ const char *first = argv[1];
+ gdcm::File *f1 = new gdcm::File( first );
+
+ const char *second = argv[2];
+ gdcm::File *f2 = new gdcm::File( second );
+
+ // We assume that DICOM fields of second file actually exists :
+
+ std::string nbFrames = f2->GetHeader()->GetEntryByNumber(0x0028, 0x0008);
+ if(nbFrames != "gdcm::Unfound") {
+ f1->GetHeader()->ReplaceOrCreateByNumber( nbFrames, 0x0028, 0x0008);
+ }
+
+ f1->GetHeader()->ReplaceOrCreateByNumber(
+ f2->GetHeader()->GetEntryByNumber(0x0028, 0x0010), 0x0028, 0x0010); // nbLig
+ f1->GetHeader()->ReplaceOrCreateByNumber(
+ f2->GetHeader()->GetEntryByNumber(0x0028, 0x0011), 0x0028, 0x0011); // nbCol
+
+ // Some other tags should be updated:
+
+ // TODO : add a default value
+ // TODO : a function which take as input a list of tuple (gr, el)
+ // and that does the job
+
+ int dataSize = f2->GetImageDataSize();
+ uint8_t* imageData = f2->GetImageData();
+
+ std::cout << "dataSize :" << dataSize << std::endl;
+
+ // TODO : Shouldn't we merge those two functions ?
+ f1->SetImageData( imageData, dataSize);
+
+ f1->GetHeader()->Print();
+
+ std::string s0 = f2->GetHeader()->GetEntryByNumber(0x7fe0, 0x0000);
+ std::string s10 = f2->GetHeader()->GetEntryByNumber(0x7fe0, 0x0010);
+
+ std::cout << "lgr 7fe0, 0000 " << s0 << std::endl;
+ std::cout << "lgr 7fe0, 0010 " << s10 << std::endl;
+
+ std::cout << "WriteDCM" << std::endl;
+
+ f1->WriteDcmExplVR("WriteDicom.dcm");
+
+ return 0;
}
Program: gdcm
Module: $RCSfile: WriteRead.cxx,v $
Language: C++
- Date: $Date: 2004/11/16 04:26:18 $
- Version: $Revision: 1.8 $
+ Date: $Date: 2004/12/03 20:16:56 $
+ 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
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
+#include "gdcmHeader.h"
+#include "gdcmFile.h"
+
#include <iostream>
-#include <stdio.h>
-#include "gdcm.h"
int main(int argc, char* argv[])
{
- std::string toto;
- char zozo[200];
+ std::string zozo;
gdcm::Header* e1, *e2;
gdcm::File * f1, *f2;
return 1;
}
- toto = argv[1];
+ std::string toto = argv[1];
// --------------------- we read the input image
// --------------------- we write it as an Explicit VR DICOM file
- sprintf(zozo, "temp.XDCM" );
+ zozo = "temp.XDCM";
std::cout << "WriteDCM Explicit VR" << std::endl;
f1->WriteDcmExplVR(zozo);
Program: gdcm
Module: $RCSfile: makeDicomDir.cxx,v $
Language: C++
- Date: $Date: 2004/11/16 04:26:18 $
- Version: $Revision: 1.8 $
+ Date: $Date: 2004/12/03 20:16:56 $
+ 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
PURPOSE. See the above copyright notices for more information.
=========================================================================*/
-#include <iostream>
-#include "gdcm.h"
#include "gdcmDocEntry.h"
#include "gdcmDicomDir.h"
#include "gdcmDicomDirPatient.h"
#include "gdcmDirList.h"
+#include <iostream>
+
// ---
void StartMethod(void *toto) {
(void)toto;
BuildUpDicomDir.cxx # writes a file named "NewDICOMDIR"
makeDicomDir.cxx # writes a file named "NewDICOMDIR"
TestCopyDicom.cxx
+ # TestRescaleDicom.cxx
)
# add test that require VTK:
IF(GDCM_VTK)
Program: gdcm
Module: $RCSfile: TestAllReadCompareDicom.cxx,v $
Language: C++
- Date: $Date: 2004/11/30 14:17:52 $
- Version: $Revision: 1.20 $
+ Date: $Date: 2004/12/03 20:16:56 $
+ Version: $Revision: 1.21 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
=========================================================================*/
#include "gdcmHeader.h"
#include "gdcmFile.h"
-#include <stdio.h>
+#include <iostream>
//Generated file:
#include "gdcmDataImages.h"
Program: gdcm
Module: $RCSfile: TestBug.cxx,v $
Language: C++
- Date: $Date: 2004/11/16 04:28:20 $
- Version: $Revision: 1.15 $
+ Date: $Date: 2004/12/03 20:16:56 $
+ 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
// We have to be carefull when the code both use cout + printf VC++ gets
// confused, thus make sure we use only one kind of iostream
-#include "gdcm.h"
+#include "gdcmHeader.h"
int TestBug(int argc, char* argv[])
{
Program: gdcm
Module: $RCSfile: TestChangeHeader.cxx,v $
Language: C++
- Date: $Date: 2004/11/26 10:55:03 $
- Version: $Revision: 1.27 $
+ Date: $Date: 2004/12/03 20:16:56 $
+ Version: $Revision: 1.28 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
=========================================================================*/
#include "gdcmHeader.h"
#include "gdcmFile.h"
-#include <string>
// Writting of a DICOM file, using a correct gdcmHeader.
// and pixels of an other image
Program: gdcm
Module: $RCSfile: TestCopyDicom.cxx,v $
Language: C++
- Date: $Date: 2004/12/02 15:14:16 $
- Version: $Revision: 1.24 $
+ Date: $Date: 2004/12/03 20:16:56 $
+ Version: $Revision: 1.25 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
=========================================================================*/
#include "gdcmHeader.h"
#include "gdcmFile.h"
-#include "gdcmDocument.h"
#include "gdcmValEntry.h"
#include "gdcmBinEntry.h"
Program: gdcm
Module: $RCSfile: TestDicomDir.cxx,v $
Language: C++
- Date: $Date: 2004/11/16 04:28:20 $
- Version: $Revision: 1.21 $
+ Date: $Date: 2004/12/03 20:16:56 $
+ Version: $Revision: 1.22 $
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 "gdcm.h"
#include "gdcmDocEntry.h"
#include "gdcmDicomDir.h"
+#include "gdcmDicomDirPatient.h"
+#include "gdcmDicomDirStudy.h"
+#include "gdcmDicomDirSerie.h"
+#include "gdcmDicomDirImage.h"
+#include "gdcmTS.h"
#include <iostream>
#include <fstream>
Program: gdcm
Module: $RCSfile: TestUtil.cxx,v $
Language: C++
- Date: $Date: 2004/11/16 04:28:20 $
- Version: $Revision: 1.3 $
+ Date: $Date: 2004/12/03 20:16:56 $
+ Version: $Revision: 1.4 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// This test should test everything in Util, since I didn't know any other
// way to test this class.
-#include "gdcm.h"
+#include "gdcmUtil.h"
+#include <iostream>
int TestUtil(int , char * [])
{
Program: gdcm
Module: $RCSfile: gdcmBinEntry.h,v $
Language: C++
- Date: $Date: 2004/11/25 15:46:10 $
- Version: $Revision: 1.26 $
+ Date: $Date: 2004/12/03 20:16:57 $
+ Version: $Revision: 1.27 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#define GDCMBINENTRY_H
#include "gdcmValEntry.h"
-
#include <iostream>
namespace gdcm
Program: gdcm
Module: $RCSfile: gdcmDebug.h,v $
Language: C++
- Date: $Date: 2004/10/12 04:35:44 $
- Version: $Revision: 1.8 $
+ Date: $Date: 2004/12/03 20:16:57 $
+ 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
#define GDCMDEBUG_H
#include "gdcmCommon.h"
+
namespace gdcm
{
-
//-----------------------------------------------------------------------------
/**
Program: gdcm
Module: $RCSfile: gdcmDicomDir.cxx,v $
Language: C++
- Date: $Date: 2004/12/03 17:13:18 $
- Version: $Revision: 1.84 $
+ Date: $Date: 2004/12/03 20:16:57 $
+ Version: $Revision: 1.85 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDicomDirStudy.h"
#include "gdcmDicomDirSerie.h"
#include "gdcmDicomDirImage.h"
+#include "gdcmDicomDirPatient.h"
+#include "gdcmDicomDirMeta.h"
+#include "gdcmDicomDirElement.h"
#include "gdcmDirList.h"
#include "gdcmUtil.h"
#include "gdcmDebug.h"
Program: gdcm
Module: $RCSfile: gdcmDicomDir.h,v $
Language: C++
- Date: $Date: 2004/12/03 17:13:18 $
- Version: $Revision: 1.40 $
+ Date: $Date: 2004/12/03 20:16:57 $
+ Version: $Revision: 1.41 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#ifndef GDCMDICOMDIR_H
#define GDCMDICOMDIR_H
-#include "gdcmCommon.h"
#include "gdcmDocument.h"
-#include "gdcmDicomDirPatient.h"
-#include "gdcmDicomDirMeta.h"
-#include "gdcmDicomDirElement.h"
#include <list>
#include <vector>
namespace gdcm
{
//-----------------------------------------------------------------------------
+class DicomDirPatient;
+class DicomDirMeta;
+class DicomDirElement;
+class DicomDirStudy;
+class DicomDirSerie;
+class DicomDirImage;
+class SQItem;
+
typedef std::list<DicomDirPatient*> ListDicomDirPatient;
typedef std::vector<Document*> VectDocument;
Program: gdcm
Module: $RCSfile: gdcmDicomDirMeta.cxx,v $
Language: C++
- Date: $Date: 2004/12/03 17:13:18 $
- Version: $Revision: 1.16 $
+ Date: $Date: 2004/12/03 20:16:57 $
+ Version: $Revision: 1.17 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDicomDirMeta.h"
#include "gdcmDocument.h"
+#include "gdcmDocEntry.h"
namespace gdcm
{
Program: gdcm
Module: $RCSfile: gdcmDicomDirMeta.h,v $
Language: C++
- Date: $Date: 2004/12/03 17:13:18 $
- Version: $Revision: 1.12 $
+ Date: $Date: 2004/12/03 20:16:57 $
+ 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
#define GDCMDICOMDIRMETA_H
#include "gdcmDicomDirObject.h"
+
namespace gdcm
{
Program: gdcm
Module: $RCSfile: gdcmDicomDirObject.cxx,v $
Language: C++
- Date: $Date: 2004/12/03 17:13:18 $
- Version: $Revision: 1.8 $
+ Date: $Date: 2004/12/03 20:16:57 $
+ 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
#include "gdcmGlobal.h"
#include "gdcmDebug.h"
#include "gdcmValEntry.h"
+#include "gdcmDictSet.h"
+
namespace gdcm
{
Program: gdcm
Module: $RCSfile: gdcmDicomDirObject.h,v $
Language: C++
- Date: $Date: 2004/12/03 17:13:18 $
- Version: $Revision: 1.7 $
+ Date: $Date: 2004/12/03 20:16:57 $
+ 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
{
//-----------------------------------------------------------------------------
class DicomDirObject;
-typedef std::list<DicomDirObject *> ListContent;
//-----------------------------------------------------------------------------
/**
*/
class GDCM_EXPORT DicomDirObject : public SQItem
{
+typedef std::list<DicomDirObject *> ListContent;
public:
DicomDirObject(int depth = 1);
Program: gdcm
Module: $RCSfile: gdcmDicomDirPatient.cxx,v $
Language: C++
- Date: $Date: 2004/12/03 17:13:18 $
- Version: $Revision: 1.20 $
+ Date: $Date: 2004/12/03 20:16:57 $
+ Version: $Revision: 1.21 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDicomDirPatient.h"
#include "gdcmDicomDirElement.h"
#include "gdcmGlobal.h"
+#include "gdcmDicomDirStudy.h"
+#include "gdcmSQItem.h"
+
namespace gdcm
{
Program: gdcm
Module: $RCSfile: gdcmDicomDirPatient.h,v $
Language: C++
- Date: $Date: 2004/12/03 17:13:18 $
- Version: $Revision: 1.14 $
+ Date: $Date: 2004/12/03 20:16:57 $
+ Version: $Revision: 1.15 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#define GDCMPATIENT_H
#include "gdcmDicomDirObject.h"
-#include "gdcmDicomDirStudy.h"
-#include "gdcmSQItem.h"
namespace gdcm
{
-
+class DicomDirStudy;
//-----------------------------------------------------------------------------
typedef std::list<DicomDirStudy*> ListDicomDirStudy;
Program: gdcm
Module: $RCSfile: gdcmDicomDirSerie.cxx,v $
Language: C++
- Date: $Date: 2004/12/03 17:13:18 $
- Version: $Revision: 1.22 $
+ Date: $Date: 2004/12/03 20:16:57 $
+ Version: $Revision: 1.23 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDicomDirSerie.h"
#include "gdcmDicomDirElement.h"
+#include "gdcmDicomDirImage.h"
#include "gdcmGlobal.h"
namespace gdcm
Program: gdcm
Module: $RCSfile: gdcmDicomDirSerie.h,v $
Language: C++
- Date: $Date: 2004/12/03 17:13:18 $
- Version: $Revision: 1.15 $
+ Date: $Date: 2004/12/03 20:16:57 $
+ 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
#define GDCMDICOMDIRSERIE_H
#include "gdcmDicomDirObject.h"
-#include "gdcmDicomDirImage.h"
namespace gdcm
{
+class DicomDirImage;
//-----------------------------------------------------------------------------
typedef std::list<DicomDirImage *> ListDicomDirImage;
Program: gdcm
Module: $RCSfile: gdcmDicomDirStudy.cxx,v $
Language: C++
- Date: $Date: 2004/12/03 17:13:18 $
- Version: $Revision: 1.19 $
+ Date: $Date: 2004/12/03 20:16:57 $
+ Version: $Revision: 1.20 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDicomDirStudy.h"
#include "gdcmDicomDirElement.h"
#include "gdcmGlobal.h"
+#include "gdcmDicomDirSerie.h"
namespace gdcm
{
Program: gdcm
Module: $RCSfile: gdcmDicomDirStudy.h,v $
Language: C++
- Date: $Date: 2004/12/03 17:13:18 $
- Version: $Revision: 1.14 $
+ Date: $Date: 2004/12/03 20:16:57 $
+ Version: $Revision: 1.15 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#define GDCMDICOMDIRSTUDY_H
#include "gdcmDicomDirObject.h"
-#include "gdcmDicomDirSerie.h"
+
namespace gdcm
{
-
+class DicomDirSerie;
//-----------------------------------------------------------------------------
typedef std::list<DicomDirSerie *> ListDicomDirSerie;
Program: gdcm
Module: $RCSfile: gdcmDict.h,v $
Language: C++
- Date: $Date: 2004/11/16 02:54:35 $
- Version: $Revision: 1.23 $
+ Date: $Date: 2004/12/03 20:16:57 $
+ Version: $Revision: 1.24 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#ifndef GDCMDICT_H
#define GDCMDICT_H
-#include "gdcmCommon.h"
#include "gdcmDictEntry.h"
#include <iostream>
{
//-----------------------------------------------------------------------------
+typedef std::string DictKey;
typedef std::map<TagKey, DictEntry> TagKeyHT;
typedef std::map<TagName, DictEntry> TagNameHT;
typedef std::list<std::string> EntryNamesList;
Program: gdcm
Module: $RCSfile: gdcmDictSet.h,v $
Language: C++
- Date: $Date: 2004/10/18 02:17:07 $
- Version: $Revision: 1.28 $
+ Date: $Date: 2004/12/03 20:16:57 $
+ Version: $Revision: 1.29 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#define GDCMDICTSET_H
#include "gdcmDict.h"
+
#include <map>
#include <list>
namespace gdcm
{
-typedef std::string DictKey;
typedef std::map<DictKey, Dict*> DictSetHT;
//-----------------------------------------------------------------------------
Program: gdcm
Module: $RCSfile: gdcmDocEntry.cxx,v $
Language: C++
- Date: $Date: 2004/11/25 15:46:11 $
- Version: $Revision: 1.33 $
+ Date: $Date: 2004/12/03 20:16:57 $
+ Version: $Revision: 1.34 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDocEntry.h"
#include "gdcmTS.h"
+#include "gdcmVR.h"
#include "gdcmGlobal.h"
#include "gdcmUtil.h"
Program: gdcm
Module: $RCSfile: gdcmDocEntry.h,v $
Language: C++
- Date: $Date: 2004/11/30 16:24:31 $
- Version: $Revision: 1.31 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.32 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#define GDCMDOCENTRY_H
#include "gdcmDictEntry.h"
+
#include <iostream>
#include <fstream>
+namespace gdcm
+{
class Header;
class ValEntry;
class BinEntry;
class SeqEntry;
-namespace gdcm
-{
//-----------------------------------------------------------------------------
/**
* \brief The dicom header of a Dicom file contains a set of such entries
Program: gdcm
Module: $RCSfile: gdcmDocEntryArchive.cxx,v $
Language: C++
- Date: $Date: 2004/11/24 10:23:47 $
- Version: $Revision: 1.3 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.4 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDocEntryArchive.h"
#include "gdcmDebug.h"
+#include "gdcmDocEntry.h"
#include <string>
Program: gdcm
Module: $RCSfile: gdcmDocEntryArchive.h,v $
Language: C++
- Date: $Date: 2004/11/24 10:23:47 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.3 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#ifndef GDCMDOCENTRYARCHIVE_H
#define GDCMDOCENTRYARCHIVE_H
-#include "gdcmCommon.h"
#include "gdcmHeader.h"
namespace gdcm
Program: gdcm
Module: $RCSfile: gdcmDocEntrySet.cxx,v $
Language: C++
- Date: $Date: 2004/11/16 10:25:53 $
- Version: $Revision: 1.26 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.27 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDebug.h"
#include "gdcmCommon.h"
+#include "gdcmDictSet.h"
#include "gdcmGlobal.h"
#include "gdcmException.h"
#include "gdcmDocEntry.h"
Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2004/12/02 15:14:17 $
- Version: $Revision: 1.145 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.146 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmGlobal.h"
#include "gdcmUtil.h"
#include "gdcmDebug.h"
+#include "gdcmTS.h"
+#include "gdcmException.h"
+#include "gdcmDictSet.h"
+#include "gdcmRLEFramesInfo.h"
+#include "gdcmJPEGFragmentsInfo.h"
+#include "gdcmDocEntrySet.h"
+#include "gdcmSQItem.h"
#include <vector>
#include <iomanip>
Program: gdcm
Module: $RCSfile: gdcmDocument.h,v $
Language: C++
- Date: $Date: 2004/11/26 10:55:04 $
- Version: $Revision: 1.66 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.67 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#ifndef GDCMDOCUMENT_H
#define GDCMDOCUMENT_H
-#include "gdcmCommon.h"
#include "gdcmVR.h"
-#include "gdcmTS.h"
-#include "gdcmException.h"
-#include "gdcmDictSet.h"
-#include "gdcmDocEntry.h"
-#include "gdcmRLEFramesInfo.h"
-#include "gdcmJPEGFragmentsInfo.h"
-#include "gdcmDocEntrySet.h"
+#include "gdcmDict.h"
#include "gdcmElementSet.h"
-class ValEntry;
-class BinEntry;
-class SeqEntry;
-
#include <map>
#include <list>
#include <fstream>
namespace gdcm
{
+class ValEntry;
+class BinEntry;
+class SeqEntry;
+class Dict;
+class RLEFramesInfo;
+class JPEGFragmentsInfo;
enum TransferSyntaxType {
ImplicitVRLittleEndian = 0,
Program: gdcm
Module: $RCSfile: gdcmElementSet.h,v $
Language: C++
- Date: $Date: 2004/11/30 16:24:31 $
- Version: $Revision: 1.25 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.26 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#ifndef GDCMELEMENTSET_H
#define GDCMELEMENTSET_H
-#include "gdcmCommon.h"
#include "gdcmDocEntrySet.h"
+
#include <map>
#include <iostream>
#include <fstream>
+namespace gdcm
+{
class ValEntry;
class BinEntry;
class SeqEntry;
-namespace gdcm
-{
typedef std::map<TagKey, DocEntry *> TagDocEntryHT;
//-----------------------------------------------------------------------------
Program: gdcm
Module: $RCSfile: gdcmException.h,v $
Language: C++
- Date: $Date: 2004/11/04 18:14:34 $
- Version: $Revision: 1.18 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ 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
#define GDCM_EXCEPTION_H
#include "gdcmCommon.h"
+
#include <string>
#include <iostream>
#include <exception>
+
namespace gdcm
{
Program: gdcm
Module: $RCSfile: gdcmFile.cxx,v $
Language: C++
- Date: $Date: 2004/12/03 14:22:40 $
- Version: $Revision: 1.170 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.171 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmDebug.h"
#include "gdcmUtil.h"
#include "gdcmBinEntry.h"
+#include "gdcmHeader.h"
+#include "gdcmPixelReadConvert.h"
+#include "gdcmPixelWriteConvert.h"
+#include "gdcmDocEntryArchive.h"
+
#include <fstream>
namespace gdcm
return WriteBase(fileName);
}
+bool File::SetEntryByNumber(std::string const& content,
+ uint16_t group, uint16_t element)
+{
+ HeaderInternal->SetEntryByNumber(content,group,element);
+ return true;
+}
+
/**
* \brief Access to the underlying \ref PixelReadConverter RGBA LUT
*/
Program: gdcm
Module: $RCSfile: gdcmFile.h,v $
Language: C++
- Date: $Date: 2004/12/03 14:22:40 $
- Version: $Revision: 1.82 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.83 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#define GDCMFILE_H
#include "gdcmCommon.h"
-#include "gdcmHeader.h"
-#include "gdcmPixelReadConvert.h"
-#include "gdcmPixelWriteConvert.h"
-#include "gdcmDocEntryArchive.h"
namespace gdcm
{
+class Header;
+class ValEntry;
+class BinEntry;
+class PixelReadConvert;
+class PixelWriteConvert;
+class DocEntryArchive;
//-----------------------------------------------------------------------------
/*
* In addition to Dicom header exploration, this class is designed
bool WriteAcr (std::string const& fileName);
bool Write(std::string const& fileName);
- virtual bool SetEntryByNumber(std::string const& content,
- uint16_t group, uint16_t element)
- {
- HeaderInternal->SetEntryByNumber(content,group,element);
- return true;
- }
+ bool SetEntryByNumber(std::string const& content,
+ uint16_t group, uint16_t element);
uint8_t* GetLutRGBA();
// Write mode
Program: gdcm
Module: $RCSfile: gdcmGlobal.cxx,v $
Language: C++
- Date: $Date: 2004/10/28 18:13:36 $
- Version: $Revision: 1.6 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.7 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
=========================================================================*/
#include "gdcmGlobal.h"
+
#include "gdcmDebug.h"
+#include "gdcmVR.h"
+#include "gdcmTS.h"
+#include "gdcmDictSet.h"
+#include "gdcmDicomDirElement.h"
namespace gdcm
{
Program: gdcm
Module: $RCSfile: gdcmGlobal.h,v $
Language: C++
- Date: $Date: 2004/10/12 04:35:46 $
- Version: $Revision: 1.4 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.5 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#ifndef GDCMGLOBAL_H
#define GDCMGLOBAL_H
-#include "gdcmVR.h"
-#include "gdcmTS.h"
-#include "gdcmDictSet.h"
-#include "gdcmDicomDirElement.h"
+#include "gdcmCommon.h"
namespace gdcm
{
-
+class DictSet;
+class VR;
+class TS;
+class DicomDirElement;
//-----------------------------------------------------------------------------
/**
* \brief This class contains all globals elements that might be
Program: gdcm
Module: $RCSfile: gdcmHeader.h,v $
Language: C++
- Date: $Date: 2004/11/26 10:55:04 $
- Version: $Revision: 1.95 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.96 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#ifndef GDCMHEADER_H
#define GDCMHEADER_H
-#include "gdcmCommon.h"
#include "gdcmDocument.h"
namespace gdcm
Program: gdcm
Module: $RCSfile: gdcmJPEGFragment.h,v $
Language: C++
- Date: $Date: 2004/12/03 10:21:54 $
- Version: $Revision: 1.5 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.6 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#define GDCMJPEGFRAGMENT_H
#include "gdcmCommon.h"
+
#include <iostream>
namespace gdcm
*/
class GDCM_EXPORT JPEGFragment
{
-friend class Document;
-friend class File;
-friend class PixelReadConvert;
- long Offset;
- long Length;
public:
JPEGFragment();
void Print( std::string indent = "", std::ostream &os = std::cout );
+
+private:
+ long Offset;
+ long Length;
+
+friend class Document;
+friend class File;
+friend class PixelReadConvert;
};
} // end namespace gdcm
Program: gdcm
Module: $RCSfile: gdcmJPEGFragmentsInfo.h,v $
Language: C++
- Date: $Date: 2004/12/03 10:21:54 $
- Version: $Revision: 1.6 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.7 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#define GDCMJPEGFRAGMENTSINFO_H
#include "gdcmJPEGFragment.h"
+
#include <list>
#include <iostream>
Program: gdcm
Module: $RCSfile: gdcmJpeg2000.cxx,v $
Language: C++
- Date: $Date: 2004/10/22 03:05:42 $
- Version: $Revision: 1.13 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ 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
//-----------------------------------------------------------------------------
#include "gdcmFile.h"
+#include <iostream>
+
namespace gdcm
{
Program: gdcm
Module: $RCSfile: gdcmPixelReadConvert.cxx,v $
Language: C++
- Date: $Date: 2004/12/03 10:21:55 $
- Version: $Revision: 1.1 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.2 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// grep PixelReadConvert everywhere and clean up !
#include "gdcmDebug.h"
+#include "gdcmHeader.h"
#include "gdcmPixelReadConvert.h"
+#include "gdcmDocEntry.h"
+#include "gdcmRLEFramesInfo.h"
+#include "gdcmJPEGFragmentsInfo.h"
+
#include <fstream>
-#include <stdio.h>
namespace gdcm
{
Program: gdcm
Module: $RCSfile: gdcmPixelReadConvert.h,v $
Language: C++
- Date: $Date: 2004/12/03 11:55:38 $
- Version: $Revision: 1.2 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.3 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#define GDCMPIXELREADCONVERT_H
#include "gdcmCommon.h"
-#include "gdcmRLEFramesInfo.h"
-#include "gdcmJPEGFragmentsInfo.h"
#include "gdcmException.h"
-#include "gdcmHeader.h"
namespace gdcm
{
+class Header;
+class RLEFramesInfo;
+class JPEGFragmentsInfo;
/*
* \brief Utility container for gathering the various forms the pixel data
* migth take during the user demanded processes.
Program: gdcm
Module: $RCSfile: gdcmRLEFrame.h,v $
Language: C++
- Date: $Date: 2004/12/03 10:21:54 $
- Version: $Revision: 1.9 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.10 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#define GDCMRLEFRAME_H
#include "gdcmCommon.h"
+
#include <iostream>
namespace gdcm
Program: gdcm
Module: $RCSfile: gdcmRLEFramesInfo.h,v $
Language: C++
- Date: $Date: 2004/12/03 10:21:54 $
- Version: $Revision: 1.7 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ 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
#define GDCMRLEFRAMESINFO_H
#include "gdcmRLEFrame.h"
+
#include <list>
+
namespace gdcm
{
Program: gdcm
Module: $RCSfile: gdcmSQItem.cxx,v $
Language: C++
- Date: $Date: 2004/12/03 17:13:18 $
- Version: $Revision: 1.39 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.40 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmValEntry.h"
#include "gdcmBinEntry.h"
#include "gdcmGlobal.h"
+#include "gdcmDictSet.h"
#include "gdcmUtil.h"
#include "gdcmDebug.h"
+
#include <fstream>
namespace gdcm
Program: gdcm
Module: $RCSfile: gdcmSeqEntry.h,v $
Language: C++
- Date: $Date: 2004/11/25 15:46:12 $
- Version: $Revision: 1.24 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.25 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#ifndef GDCMSQDOCENTRY_H
#define GDCMSQDOCENTRY_H
-#include "gdcmSQItem.h"
#include "gdcmDocEntry.h"
+
#include <list>
+
namespace gdcm
{
-
+class SQItem;
//-----------------------------------------------------------------------------
typedef std::list<SQItem *> ListSQItem;
//-----------------------------------------------------------------------------
Program: gdcm
Module: $RCSfile: gdcmSerieHeader.cxx,v $
Language: C++
- Date: $Date: 2004/11/26 10:55:04 $
- Version: $Revision: 1.1 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.2 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#include "gdcmSerieHeader.h"
#include "gdcmDirList.h"
-#include "gdcmDebug.h"
+#include "gdcmHeader.h"
#include <math.h>
#include <algorithm>
Program: gdcm
Module: $RCSfile: gdcmSerieHeader.h,v $
Language: C++
- Date: $Date: 2004/11/26 10:55:04 $
- Version: $Revision: 1.1 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.2 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#ifndef GDCMSERIEHEADER_H
#define GDCMSERIEHEADER_H
-#include "gdcmHeader.h"
+#include "gdcmCommon.h"
+#include <list>
namespace gdcm
{
-
+class Header;
//-----------------------------------------------------------------------------
/*
* \defgroup SerieHeader
Program: gdcm
Module: $RCSfile: gdcmTS.h,v $
Language: C++
- Date: $Date: 2004/10/27 01:32:15 $
- Version: $Revision: 1.11 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.12 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#define GDCMTS_H
#include "gdcmCommon.h"
+
#include <map>
#include <string>
#include <iostream>
Program: gdcm
Module: $RCSfile: gdcmValEntry.h,v $
Language: C++
- Date: $Date: 2004/11/25 15:46:12 $
- Version: $Revision: 1.31 $
+ Date: $Date: 2004/12/03 20:16:58 $
+ Version: $Revision: 1.32 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
#define GDCMVALENTRY_H
#include "gdcmDocEntry.h"
+
#include <iostream>
namespace gdcm
#include <vtkPointData.h>
#include <vtkLookupTable.h>
-vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.59 $");
+vtkCxxRevisionMacro(vtkGdcmReader, "$Revision: 1.60 $");
vtkStandardNewMacro(vtkGdcmReader);
//-----------------------------------------------------------------------------
{
for (int line = 0; line < numLines; line++)
{
+ cerr << line << endl;
// Copy one line at proper destination:
memcpy((void*)destination, (void*)source, lineSize);
source += lineSize;
projects / gdcm.git / commitdiff