X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmUtil.cxx;h=64562315c175020eda0d3480eed3b2d2407c1ade;hb=40f0708d21ca92b35385f00e44f671eb7bef37d0;hp=8fa6d9b14a896741213ae16efff9e18f7f01660e;hpb=d0dd94b3bab6007ec04534a451f456ceebd6dca7;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index 8fa6d9b1..64562315 100644 --- a/src/gdcmUtil.cxx +++ b/src/gdcmUtil.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmUtil.cxx,v $ Language: C++ - Date: $Date: 2005/01/28 17:29:59 $ - Version: $Revision: 1.127 $ + Date: $Date: 2005/02/11 19:09:30 $ + Version: $Revision: 1.136 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -35,7 +35,7 @@ #include //only included in implementation file #if defined(_MSC_VER) || defined(__MINGW32__) - #include // for gethostname & gethostbyname + #include // for gethostname and gethostbyname #undef GetCurrentTime #else #ifndef __BORLANDC__ @@ -80,18 +80,21 @@ // For GetCurrentThreadID() #ifdef __linux__ -#include -#include + #include + #include #endif #ifdef __sun -#include + #include #endif namespace gdcm { +//------------------------------------------------------------------------- const std::string Util::GDCM_UID = "1.2.826.0.1.3680043.2.1143"; std::string Util::RootUID = GDCM_UID; +//------------------------------------------------------------------------- +// Public /** * \brief Provide a better 'c++' approach for sprintf * For example c code is: @@ -107,7 +110,6 @@ std::string Util::RootUID = GDCM_UID; * gdcm style code is * Format("%04x|%04x", group , elem); */ - std::string Util::Format(const char *format, ...) { char buffer[2048]; @@ -126,7 +128,7 @@ std::string Util::Format(const char *format, ...) */ void Util::Tokenize (const std::string &str, std::vector &tokens, - const std::string& delimiters) + const std::string &delimiters) { std::string::size_type lastPos = str.find_first_not_of(delimiters,0); std::string::size_type pos = str.find_first_of (delimiters,lastPos); @@ -314,6 +316,48 @@ std::string Util::GetCurrentDateTime() return r; } +unsigned int Util::GetCurrentThreadID() +{ +// FIXME the implementation is far from complete +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) + return (unsigned int)GetCurrentThreadId(); +#endif +#ifdef __linux__ + return 0; + // Doesn't work on fedora, but is in the man page... + //return (unsigned int)gettid(); +#endif +#ifdef __sun + return (unsigned int)thr_self(); +#else + //default implementation + return 0; +#endif +} + +unsigned int Util::GetCurrentProcessID() +{ +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) + // NOTE: There is also a _getpid()... + return (unsigned int)GetCurrentProcessId(); +#else + // get process identification, POSIX + return (unsigned int)getpid(); +#endif +} + +/** + * \brief tells us if the processor we are working with is BigEndian or not + */ +bool Util::IsCurrentProcessorBigEndian() +{ +#ifdef GDCM_WORDS_BIGENDIAN + return true; +#else + return false; +#endif +} + /** * \brief Create a /DICOM/ string: * It should a of even length (no odd length ever) @@ -370,44 +414,30 @@ bool Util::DicomStringEqual(const std::string &s1, const char *s2) return s1_even == s2_even; } -/** - * \brief tells us if the processor we are working with is BigEndian or not - */ -bool Util::IsCurrentProcessorBigEndian() -{ -#ifdef GDCM_WORDS_BIGENDIAN - return true; -#else - return false; -#endif -} - - - #ifdef _WIN32 -typedef BOOL(WINAPI * pSnmpExtensionInit) ( - IN DWORD dwTimeZeroReference, - OUT HANDLE * hPollForTrapEvent, - OUT AsnObjectIdentifier * supportedView); - -typedef BOOL(WINAPI * pSnmpExtensionTrap) ( - OUT AsnObjectIdentifier * enterprise, - OUT AsnInteger * genericTrap, - OUT AsnInteger * specificTrap, - OUT AsnTimeticks * timeStamp, - OUT RFC1157VarBindList * variableBindings); - -typedef BOOL(WINAPI * pSnmpExtensionQuery) ( - IN BYTE requestType, - IN OUT RFC1157VarBindList * variableBindings, - OUT AsnInteger * errorStatus, - OUT AsnInteger * errorIndex); - -typedef BOOL(WINAPI * pSnmpExtensionInitEx) ( - OUT AsnObjectIdentifier * supportedView); + typedef BOOL(WINAPI * pSnmpExtensionInit) ( + IN DWORD dwTimeZeroReference, + OUT HANDLE * hPollForTrapEvent, + OUT AsnObjectIdentifier * supportedView); + + typedef BOOL(WINAPI * pSnmpExtensionTrap) ( + OUT AsnObjectIdentifier * enterprise, + OUT AsnInteger * genericTrap, + OUT AsnInteger * specificTrap, + OUT AsnTimeticks * timeStamp, + OUT RFC1157VarBindList * variableBindings); + + typedef BOOL(WINAPI * pSnmpExtensionQuery) ( + IN BYTE requestType, + IN OUT RFC1157VarBindList * variableBindings, + OUT AsnInteger * errorStatus, + OUT AsnInteger * errorIndex); + + typedef BOOL(WINAPI * pSnmpExtensionInitEx) ( + OUT AsnObjectIdentifier * supportedView); #endif //_WIN32 - +/// \brief gets current M.A.C adress (for internal use only) int GetMacAddrSys ( unsigned char *addr ) { #ifdef _WIN32 @@ -420,8 +450,8 @@ int GetMacAddrSys ( unsigned char *addr ) HANDLE PollForTrapEvent; AsnObjectIdentifier SupportedView; - UINT OID_ifEntryType[] = { 1, 3, 6, 1, 2, 1, 2, 2, 1, 3 }; - UINT OID_ifEntryNum[] = { 1, 3, 6, 1, 2, 1, 2, 1 }; + UINT OID_ifEntryType[] = { 1, 3, 6, 1, 2, 1, 2, 2, 1, 3 }; + UINT OID_ifEntryNum[] = { 1, 3, 6, 1, 2, 1, 2, 1 }; UINT OID_ipMACEntAddr[] = { 1, 3, 6, 1, 2, 1, 2, 2, 1, 6 }; AsnObjectIdentifier MIB_ifMACEntAddr = { sizeof(OID_ipMACEntAddr) / sizeof(UINT), OID_ipMACEntAddr }; @@ -597,13 +627,13 @@ int GetMacAddrSys ( unsigned char *addr ) // We should investiage the use of SIZEOF_ADDR_IFREQ // #ifdef HAVE_SA_LEN -#ifndef max -#define max(a,b) ((a) > (b) ? (a) : (b)) -#endif -#define ifreq_size(i) max(sizeof(struct ifreq),\ - sizeof((i).ifr_name)+(i).ifr_addr.sa_len) + #ifndef max + #define max(a,b) ((a) > (b) ? (a) : (b)) + #endif + #define ifreq_size(i) max(sizeof(struct ifreq),\ + sizeof((i).ifr_name)+(i).ifr_addr.sa_len) #else -#define ifreq_size(i) sizeof(struct ifreq) + #define ifreq_size(i) sizeof(struct ifreq) #endif // HAVE_SA_LEN if( (sd = socket(AF_INET, SOCK_DGRAM, IPPROTO_IP)) < 0 ) @@ -669,9 +699,9 @@ int GetMacAddrSys ( unsigned char *addr ) } /** - * Mini function to return the last digit from a number express in base 256 - * pre condition data contain an array of 6 unsigned char - * post condition carry contain the last digit + * \brief Mini function to return the last digit from a number express in base 256 + * pre condition data contain an array of 6 unsigned char + * post condition carry contain the last digit */ inline int getlastdigit(unsigned char *data) { @@ -718,103 +748,11 @@ std::string Util::GetMACAddress() } else { - gdcmVerboseMacro("Problem in finding the MAC Address"); + gdcmWarningMacro("Problem in finding the MAC Address"); return ""; } } -/** - * \brief Return the IP adress of the machine writting the DICOM image - */ -std::string Util::GetIPAddress() -{ - // This is a rip from - // http://www.codeguru.com/Cpp/I-N/internet/network/article.php/c3445/ -#ifndef HOST_NAME_MAX - // SUSv2 guarantees that `Host names are limited to 255 bytes'. - // POSIX 1003.1-2001 guarantees that `Host names (not including the - // terminating NUL) are limited to HOST_NAME_MAX bytes'. -# define HOST_NAME_MAX 255 - // In this case we should maybe check the string was not truncated. - // But I don't known how to check that... -#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) - // with WinSock DLL we need to initialize the WinSock before using gethostname - WORD wVersionRequested = MAKEWORD(1,0); - WSADATA WSAData; - int err = WSAStartup(wVersionRequested,&WSAData); - if (err != 0) - { - // Tell the user that we could not find a usable - // WinSock DLL. - WSACleanup(); - return "127.0.0.1"; - } -#endif - -#endif //HOST_NAME_MAX - - std::string str; - char szHostName[HOST_NAME_MAX+1]; - int r = gethostname(szHostName, HOST_NAME_MAX); - - if( r == 0 ) - { - // Get host adresses - struct hostent *pHost = gethostbyname(szHostName); - - for( int i = 0; pHost!= NULL && pHost->h_addr_list[i]!= NULL; i++ ) - { - for( int j = 0; jh_length; j++ ) - { - if( j > 0 ) str += "."; - - str += Util::Format("%u", - (unsigned int)((unsigned char*)pHost->h_addr_list[i])[j]); - } - // str now contains one local IP address - -#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) - WSACleanup(); -#endif - - } - } - // If an error occur r == -1 - // Most of the time it will return 127.0.0.1... - return str; -} - -unsigned int Util::GetCurrentThreadID() -{ -// FIXME the implementation is far from complete -#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) - return (unsigned int)GetCurrentThreadId(); -#endif -#ifdef __linux__ - return 0; - // Doesn't work on fedora, but is in the man page... - //return (unsigned int)gettid(); -#endif -#ifdef __sun - return (unsigned int)thr_self(); -#else - //default implementation - return 0; -#endif -} - -unsigned int Util::GetCurrentProcessID() -{ -#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) - // NOTE: There is also a _getpid()... - return (unsigned int)GetCurrentProcessId(); -#else - // get process identification, POSIX - return (unsigned int)getpid(); -#endif - -} - /** * \brief Creates a new UID. As stipulate in the DICOM ref * each time a DICOM image is create it should have @@ -870,8 +808,9 @@ const std::string &Util::GetRootUID() return RootUID; } +//------------------------------------------------------------------------- /** - * \brief + * \brief class for binary write * @param os ostream to write to * @param val val */ @@ -890,7 +829,7 @@ std::ostream &binary_write(std::ostream &os, const uint16_t &val) { #ifdef GDCM_WORDS_BIGENDIAN uint16_t swap; - swap = ((( val << 8 ) & 0x0ff00 ) | (( val >> 8 ) & 0x00ff ) ); + swap = ((( val << 8 ) & 0xff00 ) | (( val >> 8 ) & 0x00ff ) ); return os.write(reinterpret_cast(&swap), 2); #else return os.write(reinterpret_cast(&val), 2); @@ -934,5 +873,129 @@ std::ostream &binary_write(std::ostream &os, std::string const &val) return os.write(val.c_str(), val.size()); } +/** + * \brief binary_write binary_write + * @param os ostream to write to + * @param val val + */ +std::ostream &binary_write(std::ostream &os, const uint8_t *val, size_t len) +{ + // We are writting sizeof(char) thus no need to swap bytes + return os.write(reinterpret_cast(val), len); +} + +/** + * \brief binary_write binary_write + * @param os ostream to write to + * @param val val + */ +std::ostream &binary_write(std::ostream &os, const uint16_t *val, size_t len) +{ +// This is tricky since we are writting two bytes buffer. Be carefull with little endian +// vs big endian. Also this other trick is to allocate a small (efficient) buffer that store +// intermidiate result before writting it. +#ifdef GDCM_WORDS_BIGENDIAN + const int BUFFER_SIZE = 4096; + uint16_t *buffer = new uint16_t[BUFFER_SIZE/2]; + uint16_t *binArea16 = val; + + // how many BUFFER_SIZE long pieces in binArea ? + int nbPieces = len/BUFFER_SIZE; //(16 bits = 2 Bytes) + int remainingSize = len%BUFFER_SIZE; + + for (int j=0;j> 8) | (binArea16[i] << 8); + uint16_t val16 = binArea16[i]; + buffer[i] = ((( val16 << 8 ) & 0xff00 ) | (( val16 >> 8 ) & 0x00ff ) ); + } + fp->write ( (char*)buffer, BUFFER_SIZE ); + binArea16 += BUFFER_SIZE/2; + } + if ( remainingSize > 0) + { + for (int i = 0; i < remainingSize/2; i++) + { + //buffer[i] = (binArea16[i] >> 8) | (binArea16[i] << 8); + uint16_t val16 = binArea16[i]; + buffer[i] = ((( val16 << 8 ) & 0xff00 ) | (( val16 >> 8 ) & 0x00ff ) ); + } + fp->write ( (char*)buffer, remainingSize ); + } + delete[] buffer; +#else + return os.write(reinterpret_cast(val), len); +#endif +} + +//------------------------------------------------------------------------- +// Protected + +//------------------------------------------------------------------------- +// Private +/** + * \brief Return the IP adress of the machine writting the DICOM image + */ +std::string Util::GetIPAddress() +{ + // This is a rip from + // http://www.codeguru.com/Cpp/I-N/internet/network/article.php/c3445/ +#ifndef HOST_NAME_MAX + // SUSv2 guarantees that `Host names are limited to 255 bytes'. + // POSIX 1003.1-2001 guarantees that `Host names (not including the + // terminating NUL) are limited to HOST_NAME_MAX bytes'. +#define HOST_NAME_MAX 255 + // In this case we should maybe check the string was not truncated. + // But I don't known how to check that... +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) + // with WinSock DLL we need to initialize the WinSock before using gethostname + WORD wVersionRequested = MAKEWORD(1,0); + WSADATA WSAData; + int err = WSAStartup(wVersionRequested,&WSAData); + if (err != 0) + { + // Tell the user that we could not find a usable + // WinSock DLL. + WSACleanup(); + return "127.0.0.1"; + } +#endif + +#endif //HOST_NAME_MAX + + std::string str; + char szHostName[HOST_NAME_MAX+1]; + int r = gethostname(szHostName, HOST_NAME_MAX); + + if( r == 0 ) + { + // Get host adresses + struct hostent *pHost = gethostbyname(szHostName); + + for( int i = 0; pHost!= NULL && pHost->h_addr_list[i]!= NULL; i++ ) + { + for( int j = 0; jh_length; j++ ) + { + if( j > 0 ) str += "."; + + str += Util::Format("%u", + (unsigned int)((unsigned char*)pHost->h_addr_list[i])[j]); + } + // str now contains one local IP address + +#if defined(_MSC_VER) || defined(__BORLANDC__) || defined(__MINGW32__) + WSACleanup(); +#endif + + } + } + // If an error occur r == -1 + // Most of the time it will return 127.0.0.1... + return str; +} + +//------------------------------------------------------------------------- } // end namespace gdcm