Program: gdcm
Module: $RCSfile: gdcmBinEntry.cxx,v $
Language: C++
- Date: $Date: 2004/06/24 18:03:14 $
- Version: $Revision: 1.18 $
+ Date: $Date: 2004/09/27 08:39:05 $
+ 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
- http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+ 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
*/
gdcmBinEntry::gdcmBinEntry(gdcmDictEntry* e) : gdcmValEntry(e)
{
- this->voidArea = NULL;
+ BinArea = 0;
}
/**
*/
gdcmBinEntry::gdcmBinEntry(gdcmDocEntry* e) : gdcmValEntry(e->GetDictEntry())
{
- this->UsableLength = e->GetLength();
- this->ReadLength = e->GetReadLength();
- this->ImplicitVR = e->IsImplicitVR();
- this->Offset = e->GetOffset();
- this->printLevel = e->GetPrintLevel();
- this->SQDepthLevel = e->GetDepthLevel();
+ UsableLength = e->GetLength();
+ ReadLength = e->GetReadLength();
+ ImplicitVR = e->IsImplicitVR();
+ Offset = e->GetOffset();
+ PrintLevel = e->GetPrintLevel();
+ //FIXME
+ //SQDepthLevel = e->GetDepthLevel();
- this->voidArea = NULL; // let's be carefull !
+ BinArea = 0; // let's be carefull !
}
/**
* \brief Canonical destructor.
*/
-gdcmBinEntry::~gdcmBinEntry(){
- if (voidArea)
- free (voidArea);
+gdcmBinEntry::~gdcmBinEntry()
+{
+ if (BinArea)
+ {
+ delete[] BinArea;
+ BinArea = 0; // let's be carefull !
+ }
}
{
gdcmDocEntry::Print(os);
std::ostringstream s;
- void *voidArea = GetVoidArea();
- if (voidArea != NULL)
+ void* binArea = GetBinArea();
+ if (binArea)
{
- s << " [gdcm::Binary data loaded with length is "
- << GetLength() << "]";
+ //s << " [" << GDCM_BINLOADED
+ s << " [" << GetValue()
+ << "; length = " << GetLength() << "]";
}
else
{
if ( GetLength() == 0 )
+ {
s << " []";
+ }
else
{
- s << " [gdcm::Binary data NOT loaded]";
+ //s << " [gdcm::Binary data NOT loaded]";
+ s << " [" <<GetValue() << "]";
}
}
/*
* \brief canonical Writer
- */
-void gdcmBinEntry::Write(FILE *fp, FileType filetype) {
+ * @param fp already open file pointer
+ * @param filetype type of the file to be written
+*/
+void gdcmBinEntry::Write(FILE* fp, FileType filetype)
+{
gdcmDocEntry::Write(fp, filetype);
- void *voidArea = GetVoidArea();
- int lgr=GetLength();
- if (voidArea != NULL)
- { // there is a 'non string' LUT, overlay, etc
- fwrite ( voidArea,(size_t)lgr ,(size_t)1 ,fp); // Elem value
- return;
- }
+ void* binArea = GetBinArea();
+ int lgr = GetLength();
+ if (binArea)
+ {
+ // there is a 'non string' LUT, overlay, etc
+ fwrite ( binArea,(size_t)lgr ,(size_t)1 ,fp); // Elem value
+ }
+ else
+ {
+ // nothing was loaded, but we need to skip space on disc
+ fseek(fp,(size_t)lgr,SEEK_CUR);
+ }
}
//-----------------------------------------------------------------------------
// Public
+
+/// \brief Sets the value (non string) of the current Dicom Header Entry
+void gdcmBinEntry::SetBinArea( uint8_t* area )
+{
+ if (BinArea)
+ delete[] BinArea;
+ BinArea = area;
+}
+
//-----------------------------------------------------------------------------
// Protected