-// gdcmUtil.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+
+ Program: gdcm
+ Module: $RCSfile: gdcmUtil.cxx,v $
+ Language: C++
+ 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.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.
+
+=========================================================================*/
+
#include "gdcmUtil.h"
#include "gdcmDebug.h"
-#include <stdio.h>
-#include <ctype.h> // For isspace
-#include <string.h> // CLEANME: could this be only string ? Related to Win32 ?
-/**
- * \ingroup Globals
- * \brief Pointer to a container, holding _all_ the Dicom Dictionaries.
- */
-gdcmDictSet *gdcmGlobal::Dicts = (gdcmDictSet *)0;
+#include <stdarg.h> //only included in implementation file
+#include <stdio.h> //only included in implementation file
-/**
- * \ingroup Globals
- * \brief Pointer to a hash table containing the 'Value Representations'.
- */
-gdcmVR *gdcmGlobal::VR = (gdcmVR *)0;
-
-/**
- * \ingroup Globals
- * \brief Pointer to a hash table containing the Transfer Syntax codes
- * and their english description
- */
-gdcmTS *gdcmGlobal::TS = (gdcmTS *)0;
-
-/**
- * \ingroup Globals
- * \brief Pointer to the hash table containing the Dicom Elements
- * necessary to describe each part of a DICOMDIR
- */
-gdcmDicomDirElement *gdcmGlobal::ddElem = (gdcmDicomDirElement *)0;
+namespace gdcm
+{
/**
* \ingroup Globals
- * \brief Global container
- */
-gdcmGlobal gdcmGlob;
-
-/**
- * \ingroup gdcmGlobal
- * \brief constructor : populates the various H Tables
- */
-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();
-}
-
-/**
- * \ingroup gdcmGlobal
- * \brief canonical destructor
- */
-gdcmGlobal::~gdcmGlobal() {
- delete Dicts;
- delete VR;
- delete TS;
- delete ddElem;
-}
-/**
- * \ingroup gdcmGlobal
- * \brief returns a pointer to the 'Value Representation Table'
- */
-gdcmVR *gdcmGlobal::GetVR(void) {
- return VR;
-}
-/**
- * \ingroup gdcmGlobal
- * \brief returns a pointer to the 'Transfert Syntax Table'
- */
-gdcmTS *gdcmGlobal::GetTS(void) {
- return TS;
-}
-/**
- * \ingroup gdcmGlobal
- * \brief returns a pointer to Dictionaries Table
- */
-gdcmDictSet *gdcmGlobal::GetDicts(void) {
- return Dicts;
-}
-/**
- * \ingroup gdcmGlobal
- * \brief returns a pointer to the DicomDir related elements Table
- */
-gdcmDicomDirElement *gdcmGlobal::GetDicomDirElements(void) {
- return ddElem;
+ * \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;
}
-/**
- * \defgroup Globals Utility functions
- * \brief Here are some utility functions, belonging to NO class,
- * dealing with strings, file names... that can be called
- * from anywhere by whomsoever they can help.
- */
-
-
-/**
- * \ingroup Globals
- * \brief 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;
-}
/**
* \ingroup Globals
* \brief Because not available in C++ (?)
*/
-void Tokenize (const std::string& str,
+void Util::Tokenize (const std::string& str,
std::vector<std::string>& 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(int i=0;i<str.size();i++)
+ for(unsigned int i=0;i<str.size();i++)
{
if(!isprint(str[i]))
+ {
str[i]='.';
+ }
}
if(str.size()>0)
+ {
if(!isprint(s[str.size()-1]))
+ {
if(s[str.size()-1]==0)
+ {
str[str.size()-1]=' ';
+ }
+ }
+ }
- return(str);
+ return str;
}
/**
* \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))
{
* \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("\\");
- if(pos1>pos2)
+ int pos1 = fullName.rfind("/");
+ int pos2 = fullName.rfind("\\");
+ if( pos1 > pos2)
+ {
fullName.resize(pos1);
+ }
else
+ {
fullName.resize(pos2);
- return(fullName);
+ }
+
+ return 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;
- 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<fin+1;j++)
- lastName=lastName+fullName.c_str()[j];
+ std::string lastName;
+ for (int j=deb;j<fin+1;j++)
+ {
+ lastName=lastName+fullName.c_str()[j];
+ }
- return(lastName);
+ return lastName;
}
+
+} // end namespace gdcm
+