X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=6e6f9f3df4d707273375048b852b6f89018abd58;hb=1d69b92978803204089d270599133917d944c651;hp=4c053864a287ec7e4d79a998f0b6334c7d8aec58;hpb=179f2dccd14c31668ef175e8e3373bf8b3121bd1;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index 4c053864..6e6f9f3d 100644 --- a/src/gdcmUtil.cxx +++ b/src/gdcmUtil.cxx @@ -3,12 +3,12 @@ Program: gdcm Module: $RCSfile: gdcmUtil.cxx,v $ Language: C++ - Date: $Date: 2004/07/17 22:47:01 $ - Version: $Revision: 1.47 $ + Date: $Date: 2004/10/12 04:35:48 $ + Version: $Revision: 1.54 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or - http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details. + http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details. This software is distributed WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR @@ -18,61 +18,109 @@ #include "gdcmUtil.h" #include "gdcmDebug.h" -#include -#include // For isspace -#include // CLEANME: could this be only string ? Related to Win32 ? -#include + +#include //only included in implementation file +#include //only included in implementation file + +namespace gdcm +{ /** * \ingroup Globals - * \brief Because is not yet available in g++2.96 + * \brief Provide a better 'c++' approach for sprintf + * For example c code is: + * sprintf(trash, "%04x|%04x", group , element); + * + * c++ is + * std::ostringstream buf; + * buf << std::right << std::setw(4) << std::setfill('0') << std::hex + * << group << "|" << std::right << std::setw(4) << std::setfill('0') + * << std::hex << element; + * buf.str(); */ -std::istream& eatwhite(std::istream& is) { - char c; - while (is.get(c)) { - if (!isspace(c)) { - is.putback(c); - break; - } - } - return is; + +std::string Util::Format(const char* format, ...) +{ + char buffer[2048]; + va_list args; + va_start(args, format); + vsprintf(buffer, format, args); //might be a security flaw + return buffer; } + /** * \ingroup Globals * \brief Because not available in C++ (?) */ -void Tokenize (const std::string& str, +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); - while (std::string::npos != pos || std::string::npos != lastPos) { + while (std::string::npos != pos || std::string::npos != lastPos) + { tokens.push_back(str.substr(lastPos, pos - lastPos)); lastPos = str.find_first_not_of(delimiters, pos); pos = str.find_first_of (delimiters, lastPos); } } +/** + * \ingroup Globals + * \brief Because not available in C++ (?) + * Counts the number of occurences of a substring within a string + */ + +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 + + do + { + x = str.find(subStr,x); // Find the substring + if (x != std::string::npos) // If present + { + count++; // increase the count + x += subStr.length(); // Skip this word + } + } + while (x != std::string::npos); // Carry on until not present + + return count; +} + /** * \ingroup Globals * \brief Weed out a string from the non-printable characters (in order * to avoid corrupting the terminal of invocation when printing) * @param s string to remove non printable characters from */ -std::string CreateCleanString(std::string s) { - std::string str=s; +std::string Util::CreateCleanString(std::string s) +{ + std::string str = s; for(unsigned int i=0;i0) + { if(!isprint(s[str.size()-1])) + { if(s[str.size()-1]==0) + { str[str.size()-1]=' '; + } + } + } return str; } @@ -82,12 +130,12 @@ std::string CreateCleanString(std::string s) { * \brief Add a SEPARATOR to the end of the name is necessary * @param name file/directory name to normalize */ -void NormalizePath(std::string &name) +void Util::NormalizePath(std::string &name) { const char SEPARATOR_X = '/'; const char SEPARATOR_WIN = '\\'; const std::string SEPARATOR = "/"; - int size=name.size(); + int size = name.size(); if((name[size-1]!=SEPARATOR_X)&&(name[size-1]!=SEPARATOR_WIN)) { @@ -100,7 +148,7 @@ void 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 GetPath(std::string &fullName) +std::string Util::GetPath(std::string &fullName) { int pos1 = fullName.rfind("/"); int pos2 = fullName.rfind("\\"); @@ -112,6 +160,7 @@ std::string GetPath(std::string &fullName) { fullName.resize(pos2); } + return fullName; } @@ -120,23 +169,32 @@ std::string GetPath(std::string &fullName) * \brief Get the (last) name of a full path file name * @param fullName file/directory name to extract end name from */ -std::string GetName(std::string &fullName) +std::string Util::GetName(std::string &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; + 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 lastName; - for (int j=deb;j