X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=ebb8191d56b9cba8ba022c84109a29df7af67a4b;hb=82874940805320d00eecb834bfa8643822c49e45;hp=b4907d912c4b4a169b6c60081807241cf9fdfd82;hpb=c9dd24ae7aab3c9f32af740ebfce6dfb47bd855f;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index b4907d91..ebb8191d 100644 --- a/src/gdcmUtil.cxx +++ b/src/gdcmUtil.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmUtil.cxx,v $ Language: C++ - Date: $Date: 2004/10/10 00:42:55 $ - Version: $Revision: 1.53 $ + Date: $Date: 2004/11/05 20:23:14 $ + Version: $Revision: 1.60 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -19,6 +19,11 @@ #include "gdcmUtil.h" #include "gdcmDebug.h" +#include //only included in implementation file +#include //only included in implementation file + +namespace gdcm +{ /** * \ingroup Globals @@ -33,10 +38,8 @@ * << std::hex << element; * buf.str(); */ -#include //only included in implementation file -#include //only included in implementation file -std::string gdcmUtil::Format(const char* format, ...) +std::string Util::Format(const char* format, ...) { char buffer[2048]; va_list args; @@ -50,9 +53,9 @@ std::string gdcmUtil::Format(const char* format, ...) * \ingroup Globals * \brief Because not available in C++ (?) */ -void gdcmUtil::Tokenize (const std::string& str, - std::vector& tokens, - const std::string& delimiters) +void Util::Tokenize (const std::string& str, + std::vector& tokens, + 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); @@ -70,8 +73,8 @@ void gdcmUtil::Tokenize (const std::string& str, * Counts the number of occurences of a substring within a string */ -int gdcmUtil::CountSubstring (const std::string& str, - const std::string& subStr) +int Util::CountSubstring (const std::string& str, + const std::string& subStr) { int count = 0; // counts how many times it appears unsigned int x = 0; // The index position in the string @@ -96,7 +99,7 @@ int gdcmUtil::CountSubstring (const std::string& str, * to avoid corrupting the terminal of invocation when printing) * @param s string to remove non printable characters from */ -std::string gdcmUtil::CreateCleanString(std::string s) +std::string Util::CreateCleanString(std::string const & s) { std::string str = s; @@ -127,17 +130,19 @@ std::string gdcmUtil::CreateCleanString(std::string s) * \brief Add a SEPARATOR to the end of the name is necessary * @param name file/directory name to normalize */ -void gdcmUtil::NormalizePath(std::string &name) +std::string Util::NormalizePath(std::string const & pathname) { const char SEPARATOR_X = '/'; const char SEPARATOR_WIN = '\\'; const std::string SEPARATOR = "/"; + std::string name = pathname; int size = name.size(); - if((name[size-1]!=SEPARATOR_X)&&(name[size-1]!=SEPARATOR_WIN)) + if( name[size-1] != SEPARATOR_X && name[size-1] != SEPARATOR_WIN ) { - name+=SEPARATOR; + name += SEPARATOR; } + return name; } /** @@ -145,50 +150,119 @@ void gdcmUtil::NormalizePath(std::string &name) * \brief Get the (directory) path from a full path file name * @param fullName file/directory name to extract Path from */ -std::string gdcmUtil::GetPath(std::string &fullName) +std::string Util::GetPath(std::string const & fullName) { - int pos1 = fullName.rfind("/"); - int pos2 = fullName.rfind("\\"); + std::string res = fullName; + int pos1 = res.rfind("/"); + int pos2 = res.rfind("\\"); if( pos1 > pos2) { - fullName.resize(pos1); + res.resize(pos1); } else { - fullName.resize(pos2); + res.resize(pos2); } - return fullName; + return res; } /** - * \ingroup Globals + * \ingroup Util * \brief Get the (last) name of a full path file name * @param fullName file/directory name to extract end name from */ -std::string gdcmUtil::GetName(std::string &fullName) +std::string Util::GetName(std::string const & fullName) { - int fin = fullName.length()-1; - char a =fullName.c_str()[fin]; - if (a == '/' || a == '\\') - { - fin--; - } - int deb = 0; - for (int i=fin;i!=0;i--) - { - if (fullName.c_str()[i] == '/' || fullName.c_str()[i] == '\\') - { - break; - } - deb = i; - } + std::string filename = fullName; - std::string lastName; - for (int j=deb;j backslash_pos ? slash_pos : backslash_pos; + if(slash_pos != std::string::npos) + { + return filename.substr(slash_pos + 1); + } + else + { + return filename; + } +} + +/** + * \ingroup Util + * \brief Create a /DICOM/ string: + * It should a of even lenght (no odd length ever) + * It can contains as many \0 as you want. + * This function is similar to DicomString(const char*), + * except it doesn't take a lenght. + * It only pad with a null character if length is odd + */ +std::string Util::DicomString(const char* s) +{ + size_t l = strlen(s); + if( l%2 ) { - lastName=lastName+fullName.c_str()[j]; + l++; } + std::string r(s, s+l); + assert( !(r.size() % 2) ); + return r; +} + +/** + * \ingroup Util + * \brief Create a /DICOM/ string: + * It should a of even length (no odd length ever) + * It can contains as many \0 as you want. + */ +std::string Util::DicomString(const char* s, size_t l) +{ + std::string r(s, s+l); + assert( !(r.size() % 2) ); + return r; +} + +template +std::ostream& binary_write(std::ostream& os, const T& val) +{ + return os.write(reinterpret_cast(&val), sizeof val); +} + +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 ) ); + return os.write(reinterpret_cast(&swap), 2); +#else + return os.write(reinterpret_cast(&val), 2); +#endif //GDCM_WORDS_BIGENDIAN +} + +std::ostream& binary_write(std::ostream& os, const uint32_t& val) +{ +#ifdef GDCM_WORDS_BIGENDIAN + uint32_t swap; + swap = ( ((val<<24) & 0xff000000) | ((val<<8) & 0x00ff0000) | + ((val>>8) & 0x0000ff00) | ((val>>24) & 0x000000ff) ); + return os.write(reinterpret_cast(&swap), 4); +#else + return os.write(reinterpret_cast(&val), 4); +#endif //GDCM_WORDS_BIGENDIAN +} + +//template <> +std::ostream& binary_write(std::ostream& os, const char* val) +{ + return os.write(val, strlen(val)); +} + +std::ostream& binary_write(std::ostream& os, std::string const & val) +{ + return os.write(val.c_str(), val.size()); +} + + +} // end namespace gdcm - return lastName; -}