From d41e99ad73d7727f9d5d50bbb976331c94564567 Mon Sep 17 00:00:00 2001 From: jpr Date: Fri, 19 Aug 2005 13:15:05 +0000 Subject: [PATCH] Some never comitted before comments. --- src/gdcmDicomDir.cxx | 7 ++++--- src/gdcmFileHelper.h | 13 +++++++------ src/gdcmPixelReadConvert.cxx | 17 +++-------------- 3 files changed, 14 insertions(+), 23 deletions(-) diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx index bcdc5ad1..cf828c9e 100644 --- a/src/gdcmDicomDir.cxx +++ b/src/gdcmDicomDir.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDicomDir.cxx,v $ Language: C++ - Date: $Date: 2005/07/23 01:59:21 $ - Version: $Revision: 1.152 $ + Date: $Date: 2005/08/19 13:15:05 $ + Version: $Revision: 1.153 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -100,7 +100,8 @@ // // (Root directory Entity) PATIENT // PATIENT STUDY -// STUDY SERIES +// STUDY SERIES +// STUDY VISIT // SERIES IMAGE // IMAGE / // diff --git a/src/gdcmFileHelper.h b/src/gdcmFileHelper.h index 39b9de92..39348bf7 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/30 18:27:00 $ - Version: $Revision: 1.20 $ + Date: $Date: 2005/08/19 13:15:05 $ + Version: $Revision: 1.21 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -68,7 +68,7 @@ public: void SetLoadMode(int loadMode); void SetFileName(std::string const &fileName); bool Load(); - /// to allow user user to modify pixel order (Mirror, TopDown, 90°Rotate,...) + /// to allow user to modify pixel order (e.g. Mirror, TopDown, 90°Rotate,...) void SetUserFunction( VOID_FUNCTION_PUINT8_PFILE_POINTER userFunc ) { UserFunction = userFunc; } // File methods @@ -89,7 +89,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); @@ -204,10 +205,10 @@ private: FileType WriteType; /// Pointer to a user supplied function to allow modification of pixel order /// (i.e. : Mirror, TopDown, 90°Rotation, ...) - /// use as : void userSuppliedMirrorFunction(uint8_t *im, gdcm::File *f) + /// 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 ctkgdcmSerieViewer for an example + /// See vtkgdcmSerieViewer for an example VOID_FUNCTION_PUINT8_PFILE_POINTER UserFunction; }; } // end namespace gdcm diff --git a/src/gdcmPixelReadConvert.cxx b/src/gdcmPixelReadConvert.cxx index cd2bc609..ba2b53f9 100644 --- a/src/gdcmPixelReadConvert.cxx +++ b/src/gdcmPixelReadConvert.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmPixelReadConvert.cxx,v $ Language: C++ - Date: $Date: 2005/07/30 18:27:00 $ - Version: $Revision: 1.75 $ + Date: $Date: 2005/08/19 13:15:05 $ + Version: $Revision: 1.76 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -283,7 +283,7 @@ bool PixelReadConvert::ReadAndDecompressPixelData( std::ifstream *fp ) ConvertReorderEndianity(); ConvertReArrangeBits(); ConvertFixGreyLevels(); - if (UserFunction) // user is allowed to Mirror, TopDown, Rotate, .. the image + if (UserFunction) // user is allowed to Mirror, TopDown, Rotate,...the image UserFunction( Raw, FileInternal); ConvertHandleColor(); @@ -1287,14 +1287,3 @@ void PixelReadConvert::Print( std::ostream &os, std::string const &indent ) //----------------------------------------------------------------------------- } // end namespace gdcm - -// NOTES on File internal calls -// User -// ---> GetImageData -// ---> GetImageDataIntoVector -// |---> GetImageDataIntoVectorRaw -// | lut intervention -// User -// ---> GetImageDataRaw -// ---> GetImageDataIntoVectorRaw - -- 2.48.1