X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=f8dbe313c41eecaebda4f29267566010d037037e;hb=559c3639fc5b255b36a951f352db1addead9f78f;hp=6f31287edc1b572fc923e5931b7e80b247684563;hpb=39ebfe7d84122eb1ded9089ba5678fabbb901f34;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index 6f31287e..f8dbe313 100644 --- a/src/gdcmUtil.cxx +++ b/src/gdcmUtil.cxx @@ -1,181 +1,235 @@ -// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.18 2003/09/22 08:28:43 regrain Exp $ - -//This is needed when compiling in debug mode -#ifdef _MSC_VER -// 'identifier' : class 'type' needs to have dll-interface to be used by -// clients of class 'type2' -#pragma warning ( disable : 4251 ) -// 'identifier' : identifier was truncated to 'number' characters in the -// debug information -#pragma warning ( disable : 4786 ) -#endif //_MSC_VER - -#include -#include // For isspace -#include -#include "gdcmUtil.h" -using namespace std; - -// Library globals. -gdcmDebug dbg; +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmUtil.cxx,v $ + Language: C++ + Date: $Date: 2004/11/03 20:52:13 $ + Version: $Revision: 1.59 $ + + 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.html for details. + + This software is distributed WITHOUT ANY WARRANTY; without even + the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR + PURPOSE. See the above copyright notices for more information. + +=========================================================================*/ -gdcmDebug::gdcmDebug(int level) { - DebugLevel = level; -} - -void gdcmDebug::Verbose(int Level, const char * Msg1, const char * Msg2) { - if (Level > DebugLevel) - return ; - std::cerr << Msg1 << ' ' << Msg2 << '\n'; -} - -void gdcmDebug::Assert(int Level, bool Test, - const char * Msg1, const char * Msg2) { - if (Level > DebugLevel) - return ; - if (!Test) - std::cerr << Msg1 << ' ' << Msg2 << '\n'; +#include "gdcmUtil.h" +#include "gdcmDebug.h" + +#include //only included in implementation file +#include //only included in implementation file + +namespace gdcm +{ + +/** + * \ingroup Globals + * \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::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 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); + 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); + } } -void gdcmDebug::Error( bool Test, const char * Msg1, const char * Msg2) { - if (!Test) - return; - std::cerr << Msg1 << ' ' << Msg2 << '\n'; - Exit(1); -} +/** + * \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 Util::CreateCleanString(std::string const & 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]=' '; + } + } + } -void gdcmDebug::Exit(int a) { -#ifdef __GNUC__ - std::exit(a); -#endif -#ifdef _MSC_VER - exit(a); // Found in #include -#endif -} + return str; +} + +/** + * \ingroup Globals + * \brief Add a SEPARATOR to the end of the name is necessary + * @param name file/directory name to normalize + */ +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 ) + { + name += SEPARATOR; + } + return name; +} + +/** + * \ingroup Globals + * \brief Get the (directory) path from a full path file name + * @param fullName file/directory name to extract Path from + */ +std::string Util::GetPath(std::string const & fullName) +{ + std::string res = fullName; + int pos1 = res.rfind("/"); + int pos2 = res.rfind("\\"); + if( pos1 > pos2) + { + res.resize(pos1); + } + else + { + res.resize(pos2); + } -/////////////////////////////////////////////////////////////////////////// -gdcmVR * gdcmGlobal::VR = (gdcmVR*)0; -gdcmTS * gdcmGlobal::TS = (gdcmTS*)0; -gdcmDictSet * gdcmGlobal::Dicts = (gdcmDictSet*)0; -gdcmGlobal gdcmGlob; - -gdcmGlobal::gdcmGlobal(void) { - if (VR || TS || Dicts) - dbg.Verbose(0, "gdcmGlobal::gdcmGlobal : VR or TS or Dicts already allocated"); - VR = new gdcmVR(); - TS = new gdcmTS(); - Dicts = new gdcmDictSet(); + return res; } -gdcmGlobal::~gdcmGlobal() { - delete VR; - delete TS; - delete Dicts; -} +/** + * \ingroup Globals + * \brief Get the (last) name of a full path file name + * @param fullName file/directory name to extract end name from + */ +std::string Util::GetName(std::string const & fullName) +{ + std::string filename = fullName; -gdcmVR * gdcmGlobal::GetVR(void) { - return VR; -} + std::string::size_type slash_pos = filename.rfind("/"); + std::string::size_type backslash_pos = filename.rfind("\\"); + slash_pos = slash_pos > backslash_pos ? slash_pos : backslash_pos; + if(slash_pos != std::string::npos) + { + return filename.substr(slash_pos + 1); + } + else + { + return filename; + } +} -gdcmTS * gdcmGlobal::GetTS(void) { - return TS; -} -gdcmDictSet * gdcmGlobal::GetDicts(void) { - return Dicts; -} -/////////////////////////////////////////////////////////////////////////// -// Because is not yet available in g++2.96 -istream& eatwhite(istream& is) { - char c; - while (is.get(c)) { - if (!isspace(c)) { - is.putback(c); - break; - } - } - return is; +template +std::ostream& binary_write(std::ostream& os, const T& val) +{ + return os.write(reinterpret_cast(&val), sizeof val); } -/////////////////////////////////////////////////////////////////////////// -// Because is not available in C++ (?) - -void Tokenize (const string& str, - vector& tokens, - const string& delimiters) { - string::size_type lastPos = str.find_first_not_of(delimiters,0); - string::size_type pos = str.find_first_of (delimiters,lastPos); - while (string::npos != pos || 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); - } +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 } - -/////////////////////////////////////////////////////////////////////////// -// to prevent a flashing screen when non-printable character - -char * _cleanString(char *v) { - char *d; - int i, l; - l = strlen(v); - for (i=0,d=v; - i>8) & 0x0000ff00) | ((val>>24) & 0x000000ff) ); + return os.write(reinterpret_cast(&swap), 4); +#else + return os.write(reinterpret_cast(&val), 4); +#endif //GDCM_WORDS_BIGENDIAN } - -/////////////////////////////////////////////////////////////////////////// -// to prevent a flashing screen when non-printable character - -std::string _CreateCleanString(std::string s) { -/* char *d, *di, *v; - int i, l; - v=(char*)s.c_str(); - l = strlen(v); - d = di = strdup(v); - for (i=0; - i +std::ostream& binary_write(std::ostream& os, const char* val) +{ + return os.write(val, strlen(val)); } -/////////////////////////////////////////////////////////////////////////// -// -// because it may not be associated to a dictionary ... - -std::string TranslateToKey(guint16 group, guint16 element) { - char trash[10]; - string key; - // CLEAN ME: better call the iostream<< with the hex manipulator on. - // This requires some reading of the stdlibC++ sources to make the - // proper call (or copy). - sprintf(trash, "%04x|%04x", group , element); - key = trash; // Convertion through assignement - return key; +std::ostream& binary_write(std::ostream& os, std::string const & val) +{ + return os.write(val.c_str(), val.size()); } +} // end namespace gdcm