-// gdcmUtil.cxx
-//-----------------------------------------------------------------------------
+/*=========================================================================
+
+ Program: gdcm
+ Module: $RCSfile: gdcmUtil.cxx,v $
+ Language: C++
+ Date: $Date: 2004/09/07 14:11:57 $
+ Version: $Revision: 1.49 $
+
+ 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.
+
+ 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;
-
-/**
- * \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;
-
-/**
- * \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;
-}
-
-/**
- * \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.
- */
-
+#include <iostream>
/**
* \ingroup Globals
}
}
+/**
+ * \ingroup Globals
+ * \brief Because not available in C++ (?)
+ * Counts the number of occurences of a substring within a string
+ */
+
+ int 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
std::string 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(s[str.size()-1]==0)
str[str.size()-1]=' ';
- return(str);
+ return str;
}
/**
*/
std::string 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;
}
/**
if (a == '/' || a == '\\') {
fin--;
}
- int deb;
+ int deb = 0;
for (int i=fin;i!=0;i--) {
if (fullName.c_str()[i] == '/' || fullName.c_str()[i] == '\\')
break;
for (int j=deb;j<fin+1;j++)
lastName=lastName+fullName.c_str()[j];
- return(lastName);
+ return lastName;
}
git://git.creatis.insa-lyon.fr / gdcm.git / blobdiff