X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmFileHelper.h;h=34b0c7a3c2bd7faed535ff276bb138f68cdb0226;hb=24394a63b18810c791af1c913e1a6fc712d3d3a0;hp=0bfd57ecb1a5160720707c2607ad1071b2207daa;hpb=25a0000db08f39e6702b07f9936686efebf5277f;p=gdcm.git diff --git a/src/gdcmFileHelper.h b/src/gdcmFileHelper.h index 0bfd57ec..34b0c7a3 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/11/30 13:42:19 $ - Version: $Revision: 1.37 $ + Date: $Date: 2006/07/06 12:38:06 $ + Version: $Revision: 1.46 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -21,11 +21,12 @@ #include "gdcmDebug.h" #include "gdcmRefCounter.h" - +#include "gdcmVRKey.h" +#include "gdcmFile.h" namespace gdcm { -class File; +//class File; class DataEntry; class SeqEntry; class PixelReadConvert; @@ -50,8 +51,7 @@ public: WMODE_RAW, WMODE_RGB }; - -public: + /// \brief Constructs a FileHelper with a RefCounter static FileHelper *New() {return new FileHelper();} /// \brief Constructs a FileHelper with a RefCounter from a fileHelper @@ -76,9 +76,9 @@ public: uint16_t group, uint16_t elem); DataEntry *InsertEntryString(std::string const &content, - uint16_t group, uint16_t elem); + uint16_t group, uint16_t elem, const VRKey &vr); DataEntry *InsertEntryBinArea(uint8_t *binArea, int lgth, - uint16_t group, uint16_t elem); + uint16_t group, uint16_t elem, const VRKey &vr); SeqEntry *InsertSeqEntry(uint16_t group, uint16_t elem); // File helpers @@ -88,7 +88,7 @@ public: uint8_t *GetImageData(); uint8_t *GetImageDataRaw(); - GDCM_LEGACY(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); @@ -117,7 +117,11 @@ public: /// (as opposed to 'Grey pixels + Palettes color') void SetWriteModeToRGB() { SetWriteMode(WMODE_RGB); } /// \brief Sets the Write Mode ( ) - void SetWriteMode(FileMode mode) { WriteMode = mode; } + void SetWriteMode(FileMode mode) { + WriteMode = mode; + // Deal with Samples per Pixel + //if (mode == WMODE_RGB) FileInternal->InsertEntryString("3",0x0028,0x0002); + } /// \brief Gets the Write Mode ( ) FileMode GetWriteMode() { return WriteMode; } @@ -133,6 +137,8 @@ public: void SetWriteTypeToAcrLibido() { SetWriteType(ACR_LIBIDO); } /// \brief Tells the writer we want to write as JPEG void SetWriteTypeToJPEG() { SetWriteType(JPEG); } + /// \brief Tells the writer we want to write as JPEG2000 + void SetWriteTypeToJPEG2000() { SetWriteType(JPEG2000); } /// \brief Tells the writer which format we want to write /// (ImplicitVR, ExplicitVR, ACR, ACR_LIBIDO) void SetWriteType(FileType format) { WriteType = format; } @@ -148,13 +154,20 @@ public: bool WriteDcmExplVR(std::string const &fileName); bool WriteAcr (std::string const &fileName); bool Write (std::string const &fileName); - /// \brief if user knows he didn't modify the pixels (e.g. he just anonymized - /// the file), he is allowed to ask to keep the original - /// 'Media Storage SOP Class UID' and 'Image Type' - void SetKeepMediaStorageSOPClassUID (bool v) - { KeepMediaStorageSOPClassUID = v; } - // no GetKeepMediaStorageSOPClassUID() method, on purpose! - + +/// \brief We have to deal with 4 *very* different cases : +/// -1) user created ex nihilo his own image and wants to write it as a Dicom image. +/// USER_OWN_IMAGE +/// -2) user modified the pixels of an existing image. +/// FILTERED_IMAGE +/// -3) user created a new image, using existing images (eg MIP, MPR, cartography image) +/// CREATED_IMAGE +/// -4) user modified/added some tags *without processing* the pixels (anonymization... +/// UNMODIFIED_PIXELS_IMAGE + + void SetContentType (ImageContentType c) { ContentType = c; } + // no GetContentType() method, on purpose! + void CallStartMethod(); void CallProgressMethod(); void CallEndMethod(); @@ -172,6 +185,7 @@ protected: void SetWriteFileTypeToACR(); void SetWriteFileTypeToJPEG(); + void SetWriteFileTypeToJPEG2000(); void SetWriteFileTypeToExplicitVR(); void SetWriteFileTypeToImplicitVR(); void RestoreWriteFileType(); @@ -181,11 +195,14 @@ protected: void RestoreWriteOfLibido(); DataEntry *CopyDataEntry(uint16_t group, uint16_t elem, - const TagName &vr = GDCM_VRUNKNOWN); + const VRKey &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 CheckMandatoryEntry(uint16_t group, uint16_t elem, std::string value, + const VRKey &vr = GDCM_VRUNKNOWN); + void SetMandatoryEntry(uint16_t group, uint16_t elem, std::string value, + const VRKey &vr = GDCM_VRUNKNOWN); + void CopyMandatoryEntry(uint16_t group, uint16_t elem, std::string value, + const VRKey &vr = GDCM_VRUNKNOWN); void RestoreWriteMandatory(); private: @@ -220,7 +237,7 @@ private: // Write variables /// \brief (WMODE_RAW, WMODE_RGB) FileMode WriteMode; - + /// \brief (ImplicitVR, ExplicitVR, ACR, ACR_LIBIDO) FileType WriteType; @@ -232,10 +249,13 @@ private: /// See vtkgdcmSerieViewer for an example VOID_FUNCTION_PUINT8_PFILE_POINTER UserFunction; - /// \brief if user knows he didn't modify the pixels (e.g. he just - /// anonymized the file), he is allowed to ask to keep the original - /// 'Media Storage SOP Class UID' and 'Image Type' - bool KeepMediaStorageSOPClassUID; + /// \brief only user knows what he did before asking the image to be written + /// - he created ex nihilo his own image + /// - he just applied a mathematical process on the pixels + /// - he created a new image, using existing images (eg MIP, MPR,cartography) + /// - he anonymized and image (*no* modif on the pixels) + ImageContentType ContentType; + }; } // end namespace gdcm