X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFileHelper.h;h=acd8b0139b90762ba822ff2e49ecfb22f46ae67f;hb=bd1e1aea88a95e4d14cd59088a7e5280703402ea;hp=3661ebfe3a955b6a4efd1cf6cae218c16f6b9dbc;hpb=9cd51041e87ba178719523a35ef7ad823924cbf6;p=gdcm.git diff --git a/src/gdcmFileHelper.h b/src/gdcmFileHelper.h index 3661ebfe..acd8b013 100644 --- a/src/gdcmFileHelper.h +++ b/src/gdcmFileHelper.h @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmFileHelper.h,v $ Language: C++ - Date: $Date: 2005/07/19 15:19:27 $ - Version: $Revision: 1.19 $ + Date: $Date: 2005/10/18 19:54:27 $ + Version: $Revision: 1.26 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -21,17 +21,19 @@ #include "gdcmDebug.h" #include "gdcmBase.h" -//#include + namespace gdcm { class File; -class ValEntry; -class BinEntry; +class DataEntry; class SeqEntry; class PixelReadConvert; class PixelWriteConvert; class DocEntryArchive; + +typedef void (*VOID_FUNCTION_PUINT8_PFILE_POINTER)(uint8_t *, File *); + //----------------------------------------------------------------------------- /** * \brief In addition to Dicom header exploration, this class is designed @@ -63,17 +65,19 @@ public: void SetLoadMode(int loadMode); void SetFileName(std::string const &fileName); bool Load(); - + /// to allow user to modify pixel order (e.g. Mirror, TopDown,...) + void SetUserFunction( VOID_FUNCTION_PUINT8_PFILE_POINTER userFunc ) + { UserFunction = userFunc; } // File methods - bool SetValEntry(std::string const &content, - uint16_t group, uint16_t elem); - bool SetBinEntry(uint8_t *content, int lgth, - uint16_t group, uint16_t elem); - - ValEntry *InsertValEntry(std::string const &content, - uint16_t group, uint16_t elem); - BinEntry *InsertBinEntry(uint8_t *binArea, int lgth, + bool SetEntryString(std::string const &content, + uint16_t group, uint16_t elem); + bool SetEntryBinArea(uint8_t *content, int lgth, uint16_t group, uint16_t elem); + + DataEntry *InsertEntryString(std::string const &content, + uint16_t group, uint16_t elem); + DataEntry *InsertEntryBinArea(uint8_t *binArea, int lgth, + uint16_t group, uint16_t elem); SeqEntry *InsertSeqEntry(uint16_t group, uint16_t elem); // File helpers @@ -82,7 +86,8 @@ public: uint8_t *GetImageData(); uint8_t *GetImageDataRaw(); - size_t GetImageDataIntoVector(void *destination, size_t maxSize); + + GDCM_LEGACY(size_t GetImageDataIntoVector(void *destination,size_t maxSize)); void SetImageData(uint8_t *data, size_t expectedSize); @@ -106,31 +111,32 @@ public: /// \brief Tells the writer we want to keep 'Grey pixels + Palettes color' /// when possible (as opposed to convert 'Palettes color' to RGB) - void SetWriteModeToRaw() { SetWriteMode(WMODE_RAW); }; + void SetWriteModeToRaw() { SetWriteMode(WMODE_RAW); } /// \brief Tells the writer we want to write RGB image when possible /// (as opposed to 'Grey pixels + Palettes color') - void SetWriteModeToRGB() { SetWriteMode(WMODE_RGB); }; + void SetWriteModeToRGB() { SetWriteMode(WMODE_RGB); } /// \brief Sets the Write Mode ( ) - void SetWriteMode(FileMode mode) { WriteMode = mode; }; + void SetWriteMode(FileMode mode) { WriteMode = mode; } /// \brief Gets the Write Mode ( ) - FileMode GetWriteMode() { return WriteMode; }; + FileMode GetWriteMode() { return WriteMode; } // Write format /// \brief Tells the writer we want to write as Implicit VR - void SetWriteTypeToDcmImplVR() { SetWriteType(ImplicitVR); }; + void SetWriteTypeToDcmImplVR() { SetWriteType(ImplicitVR); } /// \brief Tells the writer we want to write as Explicit VR - void SetWriteTypeToDcmExplVR() { SetWriteType(ExplicitVR); }; + void SetWriteTypeToDcmExplVR() { SetWriteType(ExplicitVR); } /// \brief Tells the writer we want to write as ACR-NEMA - void SetWriteTypeToAcr() { SetWriteType(ACR); }; + void SetWriteTypeToAcr() { SetWriteType(ACR); } /// \brief Tells the writer we want to write as LibIDO - void SetWriteTypeToAcrLibido() { SetWriteType(ACR_LIBIDO); }; + void SetWriteTypeToAcrLibido() { SetWriteType(ACR_LIBIDO); } + void SetWriteTypeToJPEG() { SetWriteType(JPEG); } /// \brief Tells the writer which format we want to write /// (ImplicitVR, ExplicitVR, ACR, ACR_LIBIDO) - void SetWriteType(FileType format) { WriteType = format; }; + void SetWriteType(FileType format) { WriteType = format; } /// \brief Gets the format we talled the write we wanted to write /// (ImplicitVR, ExplicitVR, ACR, ACR_LIBIDO) - FileType GetWriteType() { return WriteType; }; + FileType GetWriteType() { return WriteType; } // Write pixels of ONE image on hard drive // No test is made on processor "endianness" @@ -149,6 +155,7 @@ protected: void RestoreWrite(); void SetWriteFileTypeToACR(); + void SetWriteFileTypeToJPEG(); void SetWriteFileTypeToExplicitVR(); void SetWriteFileTypeToImplicitVR(); void RestoreWriteFileType(); @@ -157,10 +164,12 @@ protected: void SetWriteToNoLibido(); void RestoreWriteOfLibido(); - ValEntry *CopyValEntry(uint16_t group, uint16_t elem); - BinEntry *CopyBinEntry(uint16_t group, uint16_t elem, - const std::string &vr); + DataEntry *CopyDataEntry(uint16_t group, uint16_t elem, + const TagName &vr = GDCM_VRUNKNOWN); void CheckMandatoryElements(); + void CheckMandatoryEntry(uint16_t group,uint16_t elem,std::string value); + void SetMandatoryEntry(uint16_t group,uint16_t elem,std::string value); + void CopyMandatoryEntry(uint16_t group,uint16_t elem,std::string value); void RestoreWriteMandatory(); private: @@ -177,7 +186,7 @@ private: /// When false the destructor is in charge of deletion. bool SelfHeader; - /// Wether already parsed or not + /// Whether already parsed or not bool Parsed; // Utility pixel converter @@ -195,6 +204,13 @@ private: FileMode WriteMode; /// \brief (ImplicitVR, ExplicitVR, ACR, ACR_LIBIDO) FileType WriteType; + /// Pointer to a user supplied function to allow modification of pixel order + /// (i.e. : Mirror, TopDown, 90°Rotation, ...) + /// use as : void userSuppliedFunction(uint8_t *im, gdcm::File *f) + /// NB : the "uint8_t *" type of first param is just for prototyping. + /// User will Cast it according what he founds with f->GetPixelType() + /// See vtkgdcmSerieViewer for an example + VOID_FUNCTION_PUINT8_PFILE_POINTER UserFunction; }; } // end namespace gdcm