X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmUtil.cxx;h=a9900f468c231bb9e68ae8902e5112835b298da6;hb=2d43f5c8ae2004242af2297ceb2926d81675548f;hp=349988731553713eca6126d0726d41ddbbd5bda8;hpb=9b3db5f141ec2b11eadefaa2ea2a3a20058b37f9;p=gdcm.git diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx index 34998873..a9900f46 100644 --- a/src/gdcmUtil.cxx +++ b/src/gdcmUtil.cxx @@ -1,215 +1,230 @@ -// gdcmUtil.cxx -//----------------------------------------------------------------------------- -#include "gdcmUtil.h" - -#include -#include // For isspace -#include - -//----------------------------------------------------------------------------- -// Library globals. -gdcmDebug dbg; - -//----------------------------------------------------------------------------- -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 << std::endl; -} - -void gdcmDebug::Error( bool Test, const char * Msg1, const char * Msg2) { - if (!Test) - return; - std::cerr << Msg1 << ' ' << Msg2 << std::endl; - Exit(1); -} - -void gdcmDebug::Error(const char* Msg1, const char* Msg2, - const char* Msg3) { - std::cerr << Msg1 << ' ' << Msg2 << ' ' << Msg3 << std::endl; - Exit(1); -} - -void gdcmDebug::Assert(int Level, bool Test, - const char * Msg1, const char * Msg2) { - if (Level > DebugLevel) - return ; - if (!Test) - std::cerr << Msg1 << ' ' << Msg2 << std::endl; -} - -void gdcmDebug::Exit(int a) { -#ifdef __GNUC__ - std::exit(a); -#endif -#ifdef _MSC_VER - exit(a); // Found in #include -#endif -} - -//----------------------------------------------------------------------------- -gdcmDictSet *gdcmGlobal::Dicts = (gdcmDictSet *)0; -gdcmVR *gdcmGlobal::VR = (gdcmVR *)0; -gdcmTS *gdcmGlobal::TS = (gdcmTS *)0; -gdcmDicomDirElement *gdcmGlobal::ddElem = (gdcmDicomDirElement *)0; -gdcmGlobal gdcmGlob; - -gdcmGlobal::gdcmGlobal(void) { - if (VR || TS || Dicts || ddElem) - dbg.Verbose(0, "gdcmGlobal::gdcmGlobal : VR or TS or Dicts already allocated"); - Dicts = new gdcmDictSet(); - VR = new gdcmVR(); - TS = new gdcmTS(); - ddElem = new gdcmDicomDirElement(); -} +/*========================================================================= + + Program: gdcm + Module: $RCSfile: gdcmUtil.cxx,v $ + Language: C++ + Date: $Date: 2004/10/28 22:21:57 $ + Version: $Revision: 1.57 $ + + 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. + +=========================================================================*/ -gdcmGlobal::~gdcmGlobal() { - delete Dicts; - delete VR; - delete TS; - delete ddElem; -} +#include "gdcmUtil.h" +#include "gdcmDebug.h" -gdcmVR *gdcmGlobal::GetVR(void) { - return VR; -} +#include //only included in implementation file +#include //only included in implementation file -gdcmTS *gdcmGlobal::GetTS(void) { - return TS; -} +namespace gdcm +{ -gdcmDictSet *gdcmGlobal::GetDicts(void) { - return Dicts; -} +/** + * \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(); + */ -gdcmDicomDirElement *gdcmGlobal::GetDicomDirElements(void) { - return ddElem; +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; } -//----------------------------------------------------------------------------- -// Here are some usefull functions, belonging to NO class, -// dealing with strings, file names, etc -// that can be called from anywhere -// by whomsoever they can help. -//----------------------------------------------------------------------------- - -// Because is not yet available in g++2.96 -std::istream& eatwhite(std::istream& is) { - char c; - while (is.get(c)) { - if (!isspace(c)) { - is.putback(c); - break; - } - } - return is; -} -/////////////////////////////////////////////////////////////////////////// -// Because is not available in C++ (?) -void Tokenize (const std::string& str, - std::vector& tokens, - const std::string& delimiters) { +/** + * \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) { + 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 -/////////////////////////////////////////////////////////////////////////// -// 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; - i0) + { if(!isprint(s[str.size()-1])) + { if(s[str.size()-1]==0) + { str[str.size()-1]=' '; + } + } + } - return(str); + return str; } -/////////////////////////////////////////////////////////////////////////// -/* +/** + * \ingroup Globals * \brief Add a SEPARATOR to the end of the name is necessary - * @param + * @param name file/directory name to normalize */ -void NormalizePath(std::string &name) +std::string Util::NormalizePath(std::string const & pathname) { -const char SEPARATOR_X = '/'; -const char SEPARATOR_WIN = '\\'; -const std::string SEPARATOR = "/"; - int size=name.size(); - if((name[size-1]!=SEPARATOR_X)&&(name[size-1]!=SEPARATOR_WIN)) + 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; + 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 GetPath(std::string &fullName) +std::string Util::GetPath(std::string const & fullName) { - int pos1=fullName.rfind("/"); - int pos2=fullName.rfind("\\"); - if(pos1>pos2) - fullName.resize(pos1); + std::string res = fullName; + int pos1 = res.rfind("/"); + int pos2 = res.rfind("\\"); + if( pos1 > pos2) + { + res.resize(pos1); + } else - fullName.resize(pos2); - return(fullName); + { + res.resize(pos2); + } + + return res; } -/////////////////////////////////////////////////////////////////////////// -/* +/** + * \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 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; - for (int i=fin;i!=0;i--) { - if (fullName.c_str()[i] == '/' || fullName.c_str()[i] == '\\') - break; - deb = i; - } - std::string lastName; - for (int i=deb;i backslash_pos ? slash_pos : backslash_pos; + if(slash_pos != std::string::npos) + { + return filename.substr(slash_pos + 1); + } + else + { + return filename; + } } + + +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)&0xff) | ((*val&0xff)<<8)); + 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)); +} + + +} // end namespace gdcm +