Program: gdcm
Module: $RCSfile: gdcmDataEntry.cxx,v $
Language: C++
- Date: $Date: 2005/10/26 15:48:33 $
- Version: $Revision: 1.12 $
+ Date: $Date: 2005/12/09 12:23:38 $
+ 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
DataEntry::DataEntry(DocEntry *e)
: DocEntry(e->GetDictEntry())
{
- Flag = 0;
+ Flag = FLAG_NONE;
BinArea = 0;
SelfArea = true;
// Public
/**
* \brief Sets the value (non string) of the current Dicom Header Entry
+ * @param area area
+ * @param self self
*/
void DataEntry::SetBinArea( uint8_t *area, bool self )
{
}
/**
* \brief Inserts the value (non string) into the current Dicom Header Entry
+ * @param area area
+ * @param length length
*/
void DataEntry::CopyBinArea( uint8_t *area, uint32_t length )
{
}
}
+/**
+ * \brief Inserts the value (non string) into the current Dicom Header Entry
+ * @param id id
+ * @param val val
+ */
void DataEntry::SetValue(const uint32_t &id, const double &val)
{
if( !BinArea )
}
/**
* \brief returns, as a double (?!?) one of the values
- // (when entry is multivaluated), identified by its index.
- // Returns 0.0 if index is wrong
- // FIXME : warn the user there was a problem !
+ * (when entry is multivaluated), identified by its index.
+ * Returns 0.0 if index is wrong
+ * FIXME : warn the user there was a problem !
+ * @param id id
*/
double DataEntry::GetValue(const uint32_t &id) const
{
*/
bool DataEntry::IsValueCountValid() const
{
- bool valid;
uint32_t vm;
const std::string &strVM = GetVM();
uint32_t vc = GetValueCount();
+ bool valid = vc == 0;
+ if( valid )
+ return true;
// FIXME : what shall we do with VM = "2-n", "3-n", etc
if( strVM == "1-n" )
{
- // make sure it is at least one ??? FIXME
- valid = vc >= 1 || vc == 0;
+ // make sure there is at least one ??? FIXME
+ valid = vc >= 1;
}
else
{
os.str( strVM );
os >> vm;
// Two cases:
- // vm respect the one from the dict
+ // vm respects the one from the dict
// vm is 0 (we need to check if this element is allowed to be empty) FIXME
// note (JPR)
// Problem : entry type may depend on the modality and/or the Sequence
// it's embedded in !
// (Get the information in the 'Conformance Statements' ...)
- valid = vc == vm || vc == 0;
+ valid = vc == vm;
}
return valid;
}
return GetLength()/sizeof(uint16_t);
else if( vr == "UL" || vr == "SL" )
return GetLength()/sizeof(uint32_t);
- else if( vr == "FL" )
- return GetLength()/sizeof(float);
+ else if( vr == "FL" || vr == "OF" )
+ return GetLength()/4 ; // FL has a *4* length! sizeof(float);
else if( vr == "FD" )
- return GetLength()/sizeof(double);
+ return GetLength()/8; // FD has a *8* length! sizeof(double);
else if( Global::GetVR()->IsVROfStringRepresentable(vr) )
{
// Some element in DICOM are allowed to be empty
- if( !GetLength() ) return 0;
+ if( !GetLength() )
+ return 0;
// Don't use std::string to accelerate processing
uint32_t count = 1;
for(uint32_t i=0;i<GetLength();i++)
}
return count;
}
-
return GetLength();
}
/**
{
if( value.size() > 0 )
{
- // FIXME : should be quicker if we don't create one more std::string
- // just to make even the length of a char array ...
-
- /*
- std::string finalVal = Util::DicomString( value.c_str() );
- SetLength(finalVal.size());
- NewBinArea();
-
- memcpy(BinArea, &(finalVal[0]), finalVal.size());
- */
-
size_t l = value.size();
SetLength(l + l%2);
NewBinArea();
- //memcpy(BinArea, &(value[0]), l);
memcpy(BinArea, value.c_str(), l);
if (l%2)
BinArea[l] = '\0';
StrArea=s.str();
}
else
+ {
StrArea.append((const char *)BinArea,GetLength());
-
+ // to avoid gdcm propagate oddities in lengthes
+ if ( GetLength()%2)
+ StrArea.append(" ",1);
+ }
return StrArea;
}
+
/**
- * \brief Copies all the attributes from an other DocEntry
+ * \brief Copies all the attributes from an other DocEntry
* @param doc entry to copy from
+ * @remarks The content BinArea is copied too
*/
void DataEntry::Copy(DocEntry *doc)
{
CopyBinArea(entry->BinArea,entry->GetLength());
}
}
+
/**
- * \brief Writes the value of a DataEntry
+ * \brief Writes the 'value' area of a DataEntry
* @param fp already open ofstream pointer
* @param filetype type of the file (ACR, ImplicitVR, ExplicitVR, ...)
*/
{
return; //delimitors have NO value
}
-
- uint8_t *binArea8 = BinArea; //safe notation
- size_t lgr = GetLength();
- if (BinArea) // the binArea was *actually* loaded
- {
-
- // The same operation should be done if we wanted
- // to write image with Big Endian Transfer Syntax,
- // while working on Little Endian Processor
+
+ // --> We only deal with Little Endian writting
// --> forget Big Endian Transfer Syntax writting!
// Next DICOM version will give it up ...
-
- // --> FIXME
- // The stuff looks nice, but it's probably bugged,
- // since troubles occur on big endian processors (SunSparc, Motorola)
- // while reading the pixels of a
- // gdcm-written Little-Endian 16 bits per pixel image
-
+
+ // WARNING - For Implicit VR private element,
+ // we have *no choice* but considering them as
+ // something like 'OB' values.
+ // we rewrite them as we found them on disc.
+ // Some trouble will occur if element was
+ // *actually* OW, if image was produced
+ // on Big endian based processor, read and writen
+ // on Little endian based processor
+ // and, later on, somebody needs
+ // this 'OW' Implicit VR private element (?!?)
+ // (Same stuff, mutatis mutandis, for Little/Big)
+
+ // 8/16 bits Pixels problem should be solved automatiquely,
+ // since we ensure the VR (OB vs OW) is conform to Pixel size.
+
+ uint8_t *data = BinArea; //safe notation
+ size_t l = GetLength();
+ gdcmDebugMacro ("in DataEntry::WriteContent " << GetKey()
+ << " : " << Global::GetVR()->GetAtomicElementLength(this->GetVR())
+ );
+ if (BinArea) // the binArea was *actually* loaded
+ {
#if defined(GDCM_WORDS_BIGENDIAN) || defined(GDCM_FORCE_BIGENDIAN_EMULATION)
-
- /// \todo FIXME : Right now, we only care of Pixels element
- /// we should deal with *all* the BinEntries
- /// Well, not really since we are not interpreting values read...
-
- // 8 Bits Pixels *are* OB, 16 Bits Pixels *are* OW
- // -value forced while Reading process-
-
- // --> WARNING
- // --> the following lines *looked* very clever,
- // --> but they don't work on big endian processors.
- // --> since I've no access for the moment to a big endian proc :-(
- // --> I comment them out, to see the result on the dash board
- // -->
-
- // --> Revert to initial code : TestWriteSimple hangs on Darwin :-(
- if (GetGroup() == 0x7fe0 && GetVR() == "OW")
- {
- uint16_t *binArea16 = (uint16_t*)binArea8;
- binary_write (*fp, binArea16, lgr );
- }
- else
- {
- // For any other VR, DataEntry is re-written as-is
- binary_write (*fp, binArea8, lgr );
+ unsigned short vrLgth =
+ Global::GetVR()->GetAtomicElementLength(this->GetVR());
+ unsigned int i;
+ switch(vrLgth)
+ {
+ case 1:
+ {
+ binary_write (*fp, data, l );
+ break;
+ }
+ case 2:
+ {
+gdcmDebugMacro ("AtomicLength = 2 found; lgt =" << l);
+ uint16_t *data16 = (uint16_t *)data;
+ for(i=0;i<l/vrLgth;i++)
+ binary_write( *fp, data16[i]);
+ break;
+ }
+ case 4:
+ {
+ uint32_t *data32 = (uint32_t *)data;
+ for(i=0;i<l/vrLgth;i++)
+ binary_write( *fp, data32[i]);
+ break;
+ }
+ case 8:
+ {
+ double *data64 = (double *)data;
+ for(i=0;i<l/vrLgth;i++)
+ binary_write( *fp, data64[i]);
+ break;
+ }
}
-
- // --> WARNING
- // --> remove the following line, an uncomment the previous ones,
- // --> if it doesn't work better
- // -->
- /*binary_write ( *fp, binArea8, lgr ); // Elem value*/
-
#else
- binary_write ( *fp, binArea8, lgr ); // Elem value
+ binary_write (*fp, data, l );
#endif //GDCM_WORDS_BIGENDIAN
+
}
else
{
// --> the initial data (on the the source image) is lost
// --> user is *not* informed !
- fp->seekp(lgr, std::ios::cur);
+ fp->seekp(l, std::ios::cur);
}
+ // to avoid gdcm to propagate oddities
+ // (length was already modified)
+ if (l%2)
+ fp->seekp(1, std::ios::cur);
+}
+
+/**
+ * \brief Compute the full length of the elementary DataEntry (not only value
+ * length) depending on the VR.
+ */
+uint32_t DataEntry::ComputeFullLength()
+{
+ return GetFullLength();
}
//-----------------------------------------------------------------------------
// Protected
-void DataEntry::NewBinArea(void)
+/// \brief Creates a DataEntry owned BinArea (remove previous one if any)
+void DataEntry::NewBinArea( )
{
DeleteBinArea();
if( GetLength() > 0 )
BinArea = new uint8_t[GetLength()];
SelfArea = true;
}
-
+/// \brief Removes the BinArea, if owned by the DataEntry
void DataEntry::DeleteBinArea(void)
{
if (BinArea && SelfArea)
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff