Program: gdcm
Module: $RCSfile: gdcmUtil.cxx,v $
Language: C++
- Date: $Date: 2005/08/22 15:38:05 $
- Version: $Revision: 1.158 $
+ Date: $Date: 2005/10/20 07:25:10 $
+ Version: $Revision: 1.166 $
Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
l'Image). All rights reserved. See Doc/License.txt or
return count;
}
+/**
+ * \brief Checks whether a 'string' is printable or not (in order
+ * to avoid corrupting the terminal of invocation when printing)
+ * @param s string to check
+ */
+bool Util::IsCleanString(std::string const &s)
+{
+ std::cout<< std::endl << s << std::endl;
+ for(unsigned int i=0; i<s.size(); i++)
+ {
+ //std::cout<< std::endl << i << " : " << (unsigned char)s[i] << std::endl;
+ if (!isprint((unsigned char)s[i]) )
+ {
+ return false;
+ }
+ }
+ return true;
+}
+
+/**
+ * \brief Checks whether an 'area' is printable or not (in order
+ * to avoid corrupting the terminal of invocation when printing)
+ * @param s area to check (uint8_t is just for prototyping. feel free to cast)
+ * @param l area length to check
+ */
+bool Util::IsCleanArea(uint8_t *s, int l)
+{
+ for( int i=0; i<l; i++)
+ {
+ if (!isprint((unsigned char)s[i]) )
+ {
+ return false;
+ }
+ }
+ return true;
+}
/**
* \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
+ * @param s string to check (uint8_t is just for prototyping. feel free to cast)
*/
std::string Util::CreateCleanString(std::string const &s)
{
return str;
}
+/**
+ * \brief Weed out a string from the non-printable characters (in order
+ * to avoid corrupting the terminal of invocation when printing)
+ * @param s area to process (uint8_t is just for prototyping. feel free to cast)
+ * @param l area length to check
+ */
+std::string Util::CreateCleanString(uint8_t *s, int l)
+{
+ std::string str;
+
+ for( int i=0; i<l; i++)
+ {
+ if (!isprint((unsigned char)s[i]) )
+ {
+ str = str + '.';
+ }
+ else
+ {
+ str = str + (char )s[i];
+ }
+ }
+
+ return str;
+}
/**
* \brief Add a SEPARATOR to the end of the name is necessary
* @param pathname file/directory name to normalize
return tmpAll;
}
-/*
- * \brief Provide a simple static GetVersion() function
- */
-std::string Util::GetVersion()
-{
- return GDCM_VERSION;
-}
-
unsigned int Util::GetCurrentThreadID()
{
// FIXME the implementation is far from complete
append += Util::GDCM_MAC_ADRESS;
append += ".";
append += Util::GetCurrentDateTime();
-
+ append += ".";
//Also add a mini random number just in case:
char tmp[10];
int r = (int) (100.0*rand()/RAND_MAX);
{
#if defined(GDCM_WORDS_BIGENDIAN) || defined(GDCM_FORCE_BIGENDIAN_EMULATION)
uint16_t swap;
- //swap = ((( val << 8 ) & 0xff00 ) | (( val >> 8 ) & 0x00ff ) );
- //save CPU time
- swap = ( val << 8 | val >> 8 );
+ swap = ( val << 8 | val >> 8 );
return os.write(reinterpret_cast<const char*>(&swap), 2);
#else
{
#if defined(GDCM_WORDS_BIGENDIAN) || defined(GDCM_FORCE_BIGENDIAN_EMULATION)
uint32_t swap;
-// swap = ( ((val<<24) & 0xff000000) | ((val<<8) & 0x00ff0000) |
-// ((val>>8) & 0x0000ff00) | ((val>>24) & 0x000000ff) );
-// save CPU time
swap = ( (val<<24) | ((val<<8) & 0x00ff0000) |
((val>>8) & 0x0000ff00) | (val>>24) );
return os.write(reinterpret_cast<const char*>(&swap), 4);