-// gdcmFile.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+
+ Program: gdcm
+ Module: $RCSfile: gdcmFile.cxx,v $
+ Language: C++
+ Date: $Date: 2004/06/22 14:14:01 $
+ Version: $Revision: 1.106 $
+
+ 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.
+
+ 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 "gdcmDebug.h"
#include "jpeg/ljpg/jpegless.h"
-typedef std::pair<TagHeaderEntryHT::iterator,TagHeaderEntryHT::iterator> IterHT;
+typedef std::pair<TagDocEntryHT::iterator,TagDocEntryHT::iterator> IterHT;
//-----------------------------------------------------------------------------
// Constructor / Destructor
* one sets an a posteriori shadow dictionary (efficiency can be
* seen as a side effect).
* @param header file to be opened for reading datas
- * @return
+ * @return
*/
gdcmFile::gdcmFile(gdcmHeader *header) {
Header=header;
* with a FALSE value for the 'enable_sequence' param.
* ('public elements' may be embedded in 'shadow Sequences')
*/
-gdcmFile::gdcmFile(std::string & filename,
+gdcmFile::gdcmFile(std::string const & filename,
bool exception_on_error,
bool enable_sequences,
bool ignore_shadow) {
SetPixelDataSizeFromHeader();
}
-/**
- * \ingroup gdcmFile
- * \brief Constructor dedicated to writing a new DICOMV3 part10 compliant
- * file (see SetFileName, SetDcmTag and Write)
- * Opens (in read only and when possible) an existing file and checks
- * for DICOM compliance. Returns NULL on failure.
- * \note the in-memory representation of all available tags found in
- * the DICOM header is post-poned to first header information access.
- * This avoid a double parsing of public part of the header when
- * one sets an a posteriori shadow dictionary (efficiency can be
- * seen as a side effect).
- * @param filename file to be opened for parsing
- * @param exception_on_error whether we throw an exception or not
- * @param enable_sequences = true to allow the header
- * to be parsed *inside* the SeQuences,
- * when they have an actual length
- * \warning enable_sequences *has to be* true for reading PAPYRUS 3.0 files
- * @param ignore_shadow to allow skipping the shadow elements,
- * to save memory space.
- * \warning The TRUE value for this param has to be used
- * with a FALSE value for the 'enable_sequence' param.
- * ('public elements' may be embedded in 'shadow Sequences')
- */
- gdcmFile::gdcmFile(const char *filename,
- bool exception_on_error,
- bool enable_sequences,
- bool ignore_shadow) {
- Header=new gdcmHeader(filename,
- exception_on_error,
- enable_sequences,
- ignore_shadow);
- SelfHeader=true;
- PixelRead=-1; // no ImageData read yet.
-
- if (Header->IsReadable())
- SetPixelDataSizeFromHeader();
-}
-
/**
* \ingroup gdcmFile
* \brief canonical destructor
//-----------------------------------------------------------------------------
// Public
-/**
- * \ingroup gdcmFile
- * \brief returns the gdcmHeader *Header
- * @return
- */
-gdcmHeader *gdcmFile::GetHeader(void) {
- return(Header);
-}
/**
* \ingroup gdcmFile
* \brief computes the length (in bytes) to ALLOCATE to receive the
- * image(s) pixels (multiframes taken into account)
+ * image(s) pixels (multiframes taken into account)
* \warning : it is NOT the group 7FE0 length
* (no interest for compressed images).
* @return length to allocate
* Header->GetZSize() * (nb/8)* Header->GetSamplesPerPixel();
std::string str_PhotometricInterpretation =
Header->GetEntryByNumber(0x0028,0x0004);
-
+
/*if ( str_PhotometricInterpretation == "PALETTE COLOR " )*/
// pb when undealt Segmented Palette Color
*/
void * gdcmFile::GetImageData (void) {
PixelData = new char[lgrTotale];
- if (PixelData)
+ if (PixelData) {
GetImageDataIntoVector(PixelData, lgrTotale);
-
+ GetHeader()->SetEntryVoidAreaByNumber(PixelData,
+ GetHeader()->GetGrPixel(),
+ GetHeader()->GetNumPixel());
+ }
PixelRead=0; // no PixelRaw
+
return(PixelData);
}
/// Create a member lgrTotaleRaw ???
lgrTotale /= 3;
PixelData = new char[lgrTotale];
- if (PixelData)
+
+ if (PixelData) {
GetImageDataIntoVectorRaw(PixelData, lgrTotale);
+ GetHeader()->SetEntryVoidAreaByNumber(PixelData,
+ GetHeader()->GetGrPixel(),
+ GetHeader()->GetNumPixel());
+ }
PixelRead=1; // PixelRaw
return(PixelData);
}
Header->SetImageDataSize(ExpectedSize);
PixelData = inData;
lgrTotale = ExpectedSize;
+ PixelRead = 1;
return(true);
}
// the *last* of the (GrPixel, NumPixel), if many.
TagKey key = gdcmDictEntry::TranslateToKey(grPixel, numPixel);
- TagHeaderEntryHT::iterator p2;
- gdcmHeaderEntry *PixelElement;
+ TagDocEntryHT::iterator p2;
+ gdcmDocEntry *PixelElement;
IterHT it= Header->GetEntry().equal_range(key); // get a pair of iterators first-last synonym
}
// ----------------- End of Special Patch ----------------
- fwrite(PixelData, lgrTotale, 1, fp1);
+ // fwrite(PixelData, lgrTotale, 1, fp1); // should be useless, now
fclose (fp1);
return(true);
}