Salome HOME
projects
/
modules
/
kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge V9_dev branch into master
[modules/kernel.git]
/
src
/
Basics
/
Basics_DirUtils.cxx
diff --git
a/src/Basics/Basics_DirUtils.cxx
b/src/Basics/Basics_DirUtils.cxx
index 6a52479a136282178d3c43098f5ff822a959070d..9c33b5d5a7442665a8567bbcbf29f6585edc55c0 100644
(file)
--- a/
src/Basics/Basics_DirUtils.cxx
+++ b/
src/Basics/Basics_DirUtils.cxx
@@
-44,14
+44,22
@@
# define _separator_ '/'
#endif
# define _separator_ '/'
#endif
+#define _extension_ ".hdf"
+
namespace Kernel_Utils
{
namespace Kernel_Utils
{
- std::string GetBaseName( const std::string& file_path )
+ std::string GetBaseName( const std::string& file_path
, const bool with_extension
)
{
{
+ std::string tmp_str = file_path;
int pos = file_path.rfind( _separator_ );
if ( pos >= 0 )
int pos = file_path.rfind( _separator_ );
if ( pos >= 0 )
- return pos < (int)file_path.size()-1 ? file_path.substr( pos+1 ) : "";
- return file_path;
+ tmp_str = pos < (int)file_path.size()-1 ? file_path.substr( pos+1 ) : "";
+
+ pos = tmp_str.rfind( _extension_ );
+ if( !with_extension && pos >= 0 )
+ tmp_str = pos < (int)tmp_str.size()-1 ? tmp_str.substr( 0, pos ) : "";
+
+ return tmp_str;
}
std::string GetDirName( const std::string& file_path )
}
std::string GetDirName( const std::string& file_path )
@@
-157,6
+165,15
@@
namespace Kernel_Utils
return aFilePath;
}
return aFilePath;
}
+ std::string AddExtension( const std::string& name )
+ {
+ std::string tmp_str = name;
+ int pos = tmp_str.rfind( _extension_ );
+ if( pos < 0 )
+ return tmp_str.append( _extension_ );
+ return tmp_str;
+ }
+
//============================================================================
// function : IsExists
// purpose : Returns True(False) if the path (not)exists
//============================================================================
// function : IsExists
// purpose : Returns True(False) if the path (not)exists