X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=Example%2FTestCopyDicom.cxx;h=081c58c1ee7da1ddd4c7394830048f009661ace7;hb=97811f429fdf36ed2d7404e41ce7817c65e96e32;hp=f7139f88615de71ca356d631ef773183736a5f2a;hpb=5dd999e6394b31ea3b040e8cd71563dc1951c23c;p=gdcm.git diff --git a/Example/TestCopyDicom.cxx b/Example/TestCopyDicom.cxx index f7139f88..081c58c1 100644 --- a/Example/TestCopyDicom.cxx +++ b/Example/TestCopyDicom.cxx @@ -1,14 +1,33 @@ -#include "gdcmHeader.h" +/*========================================================================= + + Program: gdcm + Module: $RCSfile: TestCopyDicom.cxx,v $ + Language: C++ + Date: $Date: 2005/10/18 08:35:43 $ + Version: $Revision: 1.31 $ + + Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de + l'Image). All rights reserved. See Doc/License.txt or + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ #include "gdcmFile.h" +#include "gdcmFileHelper.h" #include "gdcmDocument.h" -#include "gdcmValEntry.h" +#include "gdcmDataEntry.h" #ifndef _WIN32 -#include +#include //for access, unlink +#else +#include //for _access #endif // return true if the file exists -bool FileExists(const char* filename) +bool FileExists(const char *filename) { #ifdef _MSC_VER # define access _access @@ -26,7 +45,7 @@ bool FileExists(const char* filename) } } -bool RemoveFile(const char* source) +bool RemoveFile(const char *source) { #ifdef _MSC_VER #define _unlink unlink @@ -37,7 +56,7 @@ bool RemoveFile(const char* source) // Here we load a gdcmFile and then try to create from scratch a copy of it, // copying field by field the dicom image -int main(int argc, char* argv[]) +int main(int argc, char *argv[]) { if (argc < 3) { @@ -46,74 +65,84 @@ int main(int argc, char* argv[]) return 1; } - if( FileExists( argv[2] ) ) - { - std::cerr << "Don't try to cheat, I am removing the file anyway" << std::endl; - if( !RemoveFile( argv[2] ) ) +// don't modify identation in order to let this source xdiffable with ../Test + + std::string filename = argv[1]; + std::string output = argv[2]; + + if( FileExists( output.c_str() ) ) { - std::cerr << "Ouch, the file exist, but I cannot remove it" << std::endl; - return 1; + std::cerr << "Don't try to cheat, I am removing the file anyway" + << std::endl; + if( !RemoveFile( output.c_str() ) ) + { + std::cerr << "Ouch, the file exist, but I cannot remove it" + << std::endl; + return 1; + } } - } - gdcmFile *original = new gdcmFile( argv[1] ); + gdcm::File *fileOr = new gdcm::File(); + fileOr->SetFileName( filename ); + fileOr->Load(); + gdcm::FileHelper *original = new gdcm::FileHelper( fileOr ); - std::cout << "--- Original ----------------------" << std::endl; - //original->GetHeader()->Print(); + std::cout << "--- Original ----------------------" << std::endl; + //original->GetFile()->Print(); - gdcmFile *copy = new gdcmFile( argv[2] ); - - //First of all copy the header field by field + gdcm::FileHelper *copy = new gdcm::FileHelper( ); + copy->SetFileName( output ); + copy->Load(); + + //size_t dataSize; + uint8_t *imageData; + //dataSize = original->GetImageDataSize();// just an accesor :useless here + + imageData = original->GetImageData(); // VERY important : + // brings pixels into memory ! + //(void)imageData; // not enough to avoid warning with icc compiler + //(void)dataSize; // not enough to avoid warning on 'Golgot' - // Warning :Accessor gdcmElementSet::GetEntry() should not exist - //It was commented out by Mathieu, that was a *good* idea - // (the user does NOT have to know the way we implemented the Header !) - - TagDocEntryHT & Ht = original->GetHeader()->GetEntry(); - - for (TagDocEntryHT::iterator tag = Ht.begin(); tag != Ht.end(); ++tag) - { - if (tag->second->GetVR() == "SQ") //to skip pb of SQ recursive exploration - continue; - - std::string value = ((gdcmValEntry*)(tag->second))->GetValue(); - //According to JPR I should also skip those: -// if (tag->second->GetVR() == "unkn") //to skip pb of SQ recursive exploration -// continue; - -// if( value.find( "gdcm::NotLoaded" ) == 0 ) -// continue; - - if( value.find( "gdcm::Loaded" ) == 0 ) - continue; - - //std::cerr << "Reading: " << tag->second->GetVR() << std::endl; - //tag->second->Print(); std::cout << std::endl; - - std::cerr << "Reading: " << value << std::endl; - - // Well ... Should have dynamic cast here - copy->GetHeader()->ReplaceOrCreateByNumber( - value, - tag->second->GetGroup(), - tag->second->GetElement() ); - - // todo : Setting Offset to 0 to avoid further missprint - } + std::cout << imageData << std::endl; // to avoid warning ? - size_t dataSize = original->GetImageDataSize(); - void *imageData = original->GetImageData(); + //First of all copy the header field by field + + gdcm::DocEntry *d = original->GetFile()->GetFirstEntry(); + while(d) + { + if ( gdcm::DataEntry *de = dynamic_cast(d) ) + { + copy->GetFile()->InsertEntryBinArea( de->GetBinArea(),de->GetLength(), + de->GetGroup(),de->GetElement(), + de->GetVR() ); + } + else + { + // We skip pb of SQ recursive exploration + std::cout << "Skipped Sequence " + << "------------- " << d->GetVR() << " "<< std::hex + << d->GetGroup() << "," << d->GetElement() + << std::endl; + } + + d=original->GetFile()->GetNextEntry(); + } - //copy->GetImageData(); - copy->SetImageData(imageData, dataSize); + //copy->GetImageData(); + //copy->SetImageData(imageData, dataSize); - std::cout << "--- Copy ----------------------" << std::endl; - std::cout <GetHeader()->Print(); - std::cout << "--- ---- ----------------------" << std::endl; + std::cout << "--- Copy ----------------------" << std::endl; + std::cout <GetFile()->Print(); + std::cout << "--- ---- ----------------------" << std::endl; - copy->WriteDcmExplVR( argv[2] ); + copy->WriteDcmExplVR( output ); + - return 0; + delete fileOr; // File + delete original; // FileHelper + delete copy; // FileHelper + return 0; }