dealt with in a mood-dependant way by swig), to be able to compile everywhere.
Program: gdcm
Module: $RCSfile: gdcmDicomDir.cxx,v $
Language: C++
- Date: $Date: 2006/04/13 08:05:52 $
- Version: $Revision: 1.188 $
+ Date: $Date: 2006/05/30 08:10:19 $
+ Version: $Revision: 1.189 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
NewMeta();
}
-#ifndef GDCM_LEGACY_REMOVE
+//#ifndef GDCM_LEGACY_REMOVE
/**
* \brief Constructor Parses recursively the directory and creates the DicomDir
* or uses an already built DICOMDIR, depending on 'parseDir' value.
* @deprecated use : new DicomDir() + [ SetLoadMode(lm) + ] SetDirectoryName(name)
* or : new DicomDir() + SetFileName(name)
*/
+ /*
DicomDir::DicomDir(std::string const &fileName, bool parseDir ):
Document( )
{
SetFileName( fileName );
Load( );
}
-#endif
+*/
+//#endif
/**
* \brief Canonical destructor
}
return DoTheLoadingJob( );
}
-#ifndef GDCM_LEGACY_REMOVE
+//#ifndef GDCM_LEGACY_REMOVE
/**
* \brief Loader. (DEPRECATED : kept not to break the API)
* @param fileName file to be open for parsing
* or no tag was found.
* @deprecated use SetFileName(n) + Load() instead
*/
+ /*
bool DicomDir::Load(std::string const &fileName )
{
// We should clean out anything that already exists.
}
return DoTheLoadingJob( );
}
-#endif
+*/
+//#endif
/**
* \brief Does the Loading Job (internal use only)
Program: gdcm
Module: $RCSfile: gdcmDicomDir.h,v $
Language: C++
- Date: $Date: 2006/05/22 14:09:45 $
- Version: $Revision: 1.76 $
+ Date: $Date: 2006/05/30 08:10:19 $
+ Version: $Revision: 1.77 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
/// \brief Constructs a DicomDir with a RefCounter
static DicomDir *New() {return new DicomDir();}
- GDCM_LEGACY( bool Load(std::string const &filename) )
+// GDCM_LEGACY( bool Load(std::string const &filename) )
bool Load( );
void Print(std::ostream &os = std::cout, std::string const &indent = "" );
protected:
DicomDir();
~DicomDir();
- GDCM_LEGACY( DicomDir(std::string const &filename, bool parseDir = false) )
+// GDCM_LEGACY( DicomDir(std::string const &filename, bool parseDir = false) )
void CreateDicomDirChainedList(std::string const &path);
Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2006/05/12 09:37:45 $
- Version: $Revision: 1.348 $
+ Date: $Date: 2006/05/30 08:10:19 $
+ Version: $Revision: 1.349 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
return DoTheLoadingDocumentJob( );
}
-#ifndef GDCM_LEGACY_REMOVE
+
+//#ifndef GDCM_LEGACY_REMOVE
/**
* \brief Loader. (DEPRECATED : not to break the API)
* @param fileName 'Document' (File or DicomDir) to be open for parsing
* @return false if file cannot be open or no swap info was found,
* or no tag was found.
*/
+ /*
bool Document::Load( std::string const &fileName )
{
Filename = fileName;
return DoTheLoadingDocumentJob( );
}
-#endif
+*/
+//#endif
/**
* \brief Performs the Loading Job (internal use only)
LoadDocEntry(d, true);
}
- CloseFile();
+ CloseFile();
// ----------------------------
// Specific code to allow gdcm to read ACR-LibIDO formated images
DocEntry *newDocEntry;
DataEntry *newDataEntry;
SeqEntry *newSeqEntry;
- VRKey vr;
+ //VRKey vr;
bool used; // will be set to false when something wrong happens to an Entry.
// (Entry will then be deleted)
bool delim_mode_intern = delim_mode;
{
break;
}
- newDocEntry = ReadNextDocEntry( );
- // Uncoment this cerr line to be able to 'follow' the DocEntries
- // when something *very* strange happens
- if( Debug::GetDebugFlag() )
- std::cerr<<newDocEntry->GetKey()<<" "<<newDocEntry->GetVR()<<std::endl;
+ newDocEntry = ReadNextDocEntry( );
if ( !newDocEntry )
{
break;
}
+
+ // Uncoment this cerr line to be able to 'follow' the DocEntries
+ // when something *very* strange happens
+ if( Debug::GetDebugFlag() )
+ std::cerr<<newDocEntry->GetKey()<<" "<<newDocEntry->GetVR()<<std::endl;
- // an Item Starter found elsewhere but the first position
+ // an Item Starter found elsewhere but in the first position
// of a SeqEntry means previous entry was a Sequence
// but we didn't get it (private Sequence + Implicit VR)
// we have to backtrack.
{
//////////////////////////// DataEntry
- vr = newDocEntry->GetVR();
+ //vr = newDocEntry->GetVR(); // useless ?
if ( !set->AddEntry( newDataEntry ) )
{
*/
void Document::LoadDocEntry(DocEntry *entry, bool forceLoad)
{
- uint16_t group = entry->GetGroup();
- uint16_t elem = entry->GetElement();
+ uint16_t group = entry->GetGroup();
+ uint16_t elem = entry->GetElement();
const VRKey &vr = entry->GetVR();
- uint32_t length = entry->GetLength();
+ uint32_t length = entry->GetLength();
// Fp->seekg((long)entry->GetOffset(), std::ios::beg); // JPRx
Program: gdcm
Module: $RCSfile: gdcmDocument.h,v $
Language: C++
- Date: $Date: 2006/02/16 20:06:14 $
- Version: $Revision: 1.140 $
+ Date: $Date: 2006/05/30 08:10:19 $
+ Version: $Revision: 1.141 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
// Loading
//Deprecated : use SetFileName() + Load()
-#ifndef GDCM_LEGACY_REMOVE
- virtual bool Load( std::string const &filename );
-#endif
+//#ifndef GDCM_LEGACY_REMOVE
+// virtual bool Load( std::string const &filename );
+//#endif
virtual bool Load( );
// Dictionaries
Program: gdcm
Module: $RCSfile: gdcmSerieHelper.cxx,v $
Language: C++
- Date: $Date: 2006/05/23 14:16:08 $
- Version: $Revision: 1.52 $
+ Date: $Date: 2006/05/30 08:10:19 $
+ Version: $Revision: 1.53 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
if ( SingleSerieUIDFileSetHT.count(id) == 0 )
{
- gdcmDebugMacro(" New Serie UID :[" << id << "]");
+ gdcmDebugMacro(" New/gdcmSerieHelper.cxx Serie UID :[" << id << "]");
// create a std::list in 'id' position
SingleSerieUIDFileSetHT[id] = new FileList;
}
ExRefine.push_back( r );
}
-#ifndef GDCM_LEGACY_REMOVE
+//#ifndef GDCM_LEGACY_REMOVE
/**
* \brief add a rule for restricting a DICOM file to be in the serie we are
* trying to find. For example you can select only the DICOM files from a
* @deprecated use : AddRestriction(TagKey const &key,
* std::string const &value, int op);
*/
+
void SerieHelper::AddRestriction(uint16_t group, uint16_t elem,
std::string const &value, int op)
{
TagKey t(group, elem);
AddRestriction(t, value, op);
}
-#endif
+
+//#endif
/**
* \brief add an extra 'SerieDetail' for building a 'Serie Identifier'
return true;
}
-#ifndef GDCM_LEGACY_REMOVE
+//#ifndef GDCM_LEGACY_REMOVE
/**
* \brief accessor (DEPRECATED : use GetFirstSingleSerieUIDFileSet )
* Warning : 'coherent' means here they have the same Serie UID
* @return The first FileList if found, otherwhise NULL
*/
+ /*
FileList *SerieHelper::GetFirstCoherentFileList()
{
ItFileSetHt = SingleSerieUIDFileSetHT.begin();
return ItFileSetHt->second;
return NULL;
}
-
+*/
/**
* \brief accessor (DEPRECATED : use GetNextSingleSerieUIDFileSet )
* Warning : 'coherent' means here they have the same Serie UID
* \note : meaningfull only if GetFirstCoherentFileList() already called
* @return The next FileList if found, otherwhise NULL
*/
+ /*
FileList *SerieHelper::GetNextCoherentFileList()
{
gdcmAssertMacro (ItFileSetHt != SingleSerieUIDFileSetHT.end());
return ItFileSetHt->second;
return NULL;
}
+*/
/**
* \brief accessor (DEPRECATED : use GetSingleSerieUIDFileSet )
* @param SerieUID SerieUID
* \return pointer to the FileList if found, otherwhise NULL
*/
+ /*
FileList *SerieHelper::GetCoherentFileList(std::string SerieUID)
{
if ( SingleSerieUIDFileSetHT.count(SerieUID) == 0 )
return 0;
return SingleSerieUIDFileSetHT[SerieUID];
}
-#endif
+*/
+//#endif
/**
* value of a given Tag
* @param fileSet File Set to be splitted
* @param group group number of the target Element
- * @param elem element number of the target Element
+ * @param element element number of the target Element
* \return std::map of 'Xcoherent' File sets
*/
std::sort(fileList->begin(), fileList->end(), pt2Func );
}
+/*
#ifndef GDCM_LEGACY_REMOVE
bool SerieHelper::AddGdcmFile(File* header)
{
return AddFile(header);
}
#endif
-
+*/
//-----------------------------------------------------------------------------
} // end namespace gdcm
Program: gdcm
Module: $RCSfile: gdcmSerieHelper.h,v $
Language: C++
- Date: $Date: 2006/05/23 14:16:08 $
- Version: $Revision: 1.40 $
+ Date: $Date: 2006/05/30 08:10:19 $
+ 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
/// \todo should return bool or throw error ?
void AddFileName(std::string const &filename);
bool AddFile(File *header);
- GDCM_LEGACY(bool AddGdcmFile(File* header))
+ // GDCM_LEGACY(bool AddGdcmFile(File* header))
void SetDirectory(std::string const &dir, bool recursive=false);
bool IsCoherent(FileList *fileSet);
const FileList &GetFileList()
{ return *SingleSerieUIDFileSetHT.begin()->second; }
- GDCM_LEGACY( FileList *GetFirstCoherentFileList() )
- GDCM_LEGACY( FileList *GetNextCoherentFileList() )
- GDCM_LEGACY( FileList *GetCoherentFileList(std::string serieUID) )
+ // GDCM_LEGACY( FileList *GetFirstCoherentFileList() )
+ // GDCM_LEGACY( FileList *GetNextCoherentFileList() )
+ // GDCM_LEGACY( FileList *GetCoherentFileList(std::string serieUID) )
FileList *GetFirstSingleSerieUIDFileSet();
FileList *GetNextSingleSerieUIDFileSet();
git://git.creatis.insa-lyon.fr / gdcm.git / commitdiff