Program: gdcm
Module: $RCSfile: gdcmDocument.cxx,v $
Language: C++
- Date: $Date: 2004/09/22 01:01:36 $
- Version: $Revision: 1.85 $
+ Date: $Date: 2004/09/23 10:17:26 $
+ Version: $Revision: 1.90 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
std::string PhotometricInterpretation = GetEntryByNumber(0x0028,0x0004);
if( PhotometricInterpretation == "PALETTE COLOR " )
{
- LoadEntryVoidArea(0x0028,0x1200); // gray LUT
+ LoadEntryBinArea(0x0028,0x1200); // gray LUT
/// FIXME FIXME FIXME
/// The tags refered by the three following lines used to be CORRECTLY
/// defined as having an US Value Representation in the public
/// also used as gdcmBinEntry, which requires the proper conversion,
/// - OW, and hence loaded as gdcmBinEntry, but afterwards also used
/// as gdcmValEntry, which requires the proper conversion.
- LoadEntryVoidArea(0x0028,0x1201); // R LUT
- LoadEntryVoidArea(0x0028,0x1202); // G LUT
- LoadEntryVoidArea(0x0028,0x1203); // B LUT
+ LoadEntryBinArea(0x0028,0x1201); // R LUT
+ LoadEntryBinArea(0x0028,0x1202); // G LUT
+ LoadEntryBinArea(0x0028,0x1203); // B LUT
// Segmented Red Palette Color LUT Data
- LoadEntryVoidArea(0x0028,0x1221);
+ LoadEntryBinArea(0x0028,0x1221);
// Segmented Green Palette Color LUT Data
- LoadEntryVoidArea(0x0028,0x1222);
+ LoadEntryBinArea(0x0028,0x1222);
// Segmented Blue Palette Color LUT Data
- LoadEntryVoidArea(0x0028,0x1223);
+ LoadEntryBinArea(0x0028,0x1223);
}
//FIXME later : how to use it?
- LoadEntryVoidArea(0x0028,0x3006); //LUT Data (CTX dependent)
+ LoadEntryBinArea(0x0028,0x3006); //LUT Data (CTX dependent)
CloseFile();
/*
* \brief Modifies the value of a given Header Entry (Dicom Element)
* when it exists. Create it with the given value when unexistant.
- * @param voidArea (binary) value to be set
+ * @param binArea (binary) value to be set
* @param Group Group number of the Entry
* @param Elem Element number of the Entry
* \return pointer to the modified/created Header Entry (NULL when creation
* failed).
*/
gdcmBinEntry * gdcmDocument::ReplaceOrCreateByNumber(
- void *voidArea,
+ uint8_t* binArea,
int lgth,
uint16_t group,
uint16_t elem,
if (!dictEntry)
{
- currentEntry = NewDocEntryByNumber(group, elem,VR);
+ currentEntry = NewDocEntryByNumber(group, elem, VR);
}
else
{
}
}
- SetEntryByNumber(voidArea, lgth, group, elem);
+ SetEntryByNumber(binArea, lgth, group, elem);
return binEntry;
}
* \brief Accesses an existing gdcmDocEntry (i.e. a Dicom Element)
* through it's (group, element) and modifies it's content with
* the given value.
- * @param content new value (void *) to substitute with
+ * @param content new value (void * -> uint8_t*) to substitute with
* @param lgth new value length
* @param group group number of the Dicom Element to modify
* @param element element number of the Dicom Element to modify
*/
-bool gdcmDocument::SetEntryByNumber(void *content,
+bool gdcmDocument::SetEntryByNumber(uint8_t*content,
int lgth,
uint16_t group,
uint16_t element)
}
*/
gdcmBinEntry* a = (gdcmBinEntry *)TagHT[key];
- a->SetVoidArea(content);
+ a->SetBinArea(content);
a->SetLength(lgth);
+ a->SetValue(GDCM_BINLOADED);
return true;
}
* @param elem element number of the Entry
* @return Pointer to the 'non string' area
*/
-void * gdcmDocument::GetEntryVoidAreaByNumber(uint16_t group, uint16_t elem)
+void * gdcmDocument::GetEntryBinAreaByNumber(uint16_t group, uint16_t elem)
{
gdcmDocEntry* entry = GetDocEntryByNumber(group, elem);
if (!entry)
dbg.Verbose(1, "gdcmDocument::GetDocEntryByNumber: no entry");
return 0;
}
- return ((gdcmBinEntry *)entry)->GetVoidArea();
+ return ((gdcmBinEntry *)entry)->GetBinArea();
}
/**
* @param group group number of the Entry
* @param elem element number of the Entry
*/
-void* gdcmDocument::LoadEntryVoidArea(uint16_t group, uint16_t elem)
+void* gdcmDocument::LoadEntryBinArea(uint16_t group, uint16_t elem)
{
gdcmDocEntry *docElement = GetDocEntryByNumber(group, elem);
if ( !docElement )
size_t o =(size_t)docElement->GetOffset();
fseek(Fp, o, SEEK_SET);
size_t l = docElement->GetLength();
- char* a = new char[l];
+ uint8_t* a = new uint8_t[l];
if(!a)
{
- dbg.Verbose(0, "gdcmDocument::LoadEntryVoidArea cannot allocate a");
+ dbg.Verbose(0, "gdcmDocument::LoadEntryBinArea cannot allocate a");
return NULL;
}
size_t l2 = fread(a, 1, l , Fp);
return NULL;
}
/// \todo Drop any already existing void area! JPR
- if( !SetEntryVoidAreaByNumber( a, group, elem ) );
+ if( !SetEntryBinAreaByNumber( a, group, elem ) );
{
- dbg.Verbose(0, "gdcmDocument::LoadEntryVoidArea setting failed.");
+ dbg.Verbose(0, "gdcmDocument::LoadEntryBinArea setting failed.");
}
return a;
}
/**
* \brief Loads (from disk) the element content
* when a string is not suitable
- * @param element Entry whose voidArea is going to be loaded
+ * @param element Entry whose binArea is going to be loaded
*/
-void *gdcmDocument::LoadEntryVoidArea(gdcmBinEntry *element)
+void *gdcmDocument::LoadEntryBinArea(gdcmBinEntry *element)
{
size_t o =(size_t)element->GetOffset();
fseek(Fp, o, SEEK_SET);
size_t l = element->GetLength();
- char* a = new char[l];
+ uint8_t* a = new uint8_t[l];
if( !a )
{
- dbg.Verbose(0, "gdcmDocument::LoadEntryVoidArea cannot allocate a");
+ dbg.Verbose(0, "gdcmDocument::LoadEntryBinArea cannot allocate a");
return NULL;
}
- element->SetVoidArea((void *)a);
+ element->SetBinArea((uint8_t*)a);
/// \todo check the result
size_t l2 = fread(a, 1, l , Fp);
if( l != l2 )
* @param element Element number of the searched Dicom Element
* @return
*/
-bool gdcmDocument::SetEntryVoidAreaByNumber(void * area,
+bool gdcmDocument::SetEntryBinAreaByNumber(uint8_t* area,
uint16_t group,
uint16_t element)
{
}
if ( gdcmBinEntry* binEntry = dynamic_cast<gdcmBinEntry*>(currentEntry) )
{
- binEntry->SetVoidArea( area );
+ binEntry->SetBinArea( area );
return true;
}
return true;
// When we find a BinEntry not very much can be done :
if (gdcmBinEntry* binEntryPtr = dynamic_cast< gdcmBinEntry* >(entry) )
{
- s << "gdcm::Loaded (BinEntry)";
+ s << GDCM_BINLOADED;
binEntryPtr->SetValue(s.str());
- LoadEntryVoidArea(binEntryPtr); // last one, not to erase length !
+ LoadEntryBinArea(binEntryPtr); // last one, not to erase length !
return;
}
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff