From 0ecdc751f2951230506c1d728e9695503ca5cb13 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 4 May 2015 07:35:06 +0000 Subject: [PATCH] Include : - aggiornamento prototipi. --- EGnFileUtils.h | 1 + EGnStringUtils.h | 4 ++-- EInAPI.h | 2 +- EMkMachMgr.h | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/EGnFileUtils.h b/EGnFileUtils.h index 4299cd5..5ef6b88 100644 --- a/EGnFileUtils.h +++ b/EGnFileUtils.h @@ -29,4 +29,5 @@ EGN_EXPORT bool ExistsFile( const std::string& sFile) ; EGN_EXPORT bool EraseFile( const std::string& sFile) ; EGN_EXPORT bool FileExtensionMatches( const std::string& sFile, const std::string& sExt) ; EGN_EXPORT bool FindFirstFileEgt( const std::string& sFileSpec, std::string& sFileName) ; +EGN_EXPORT bool ExistsDirectory( const std::string& sDir) ; EGN_EXPORT bool EmptyDirectory( const std::string& sDir) ; diff --git a/EGnStringUtils.h b/EGnStringUtils.h index 17f8962..30fc7a1 100644 --- a/EGnStringUtils.h +++ b/EGnStringUtils.h @@ -64,7 +64,7 @@ ToLower( std::string& sString) //---------------------------------------------------------------------------- inline bool IsEmptyOrSpaces( const std::string& sName) - { return ( sName.empty() || + { return ( &sName == nullptr || sName.empty() || sName.find_first_not_of( " \t\r\n") == std::string::npos) ; } //---------------------------------------------------------------------------- @@ -75,7 +75,7 @@ IsNullOrSpace( char cChar) //---------------------------------------------------------------------------- inline bool IsValidName( const std::string& sName) - { if ( sName.empty()) + { if ( &sName == nullptr || sName.empty()) return false ; return ( sName.find_first_of( "\\/:*?\"<>|", 0) == std::string::npos) ; } diff --git a/EInAPI.h b/EInAPI.h index 04adb7c..4e3a152 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -389,7 +389,7 @@ EIN_EXPORT BOOL __stdcall EgtShearGroup( int nId, const double vPnt[3], const do const double vDir[3], double dCoeff) ; // Machining -EIN_EXPORT BOOL __stdcall EgtInitMachMgr( void) ; +EIN_EXPORT BOOL __stdcall EgtInitMachMgr( const wchar_t* wsMachinesDir) ; EIN_EXPORT int __stdcall EgtGetMachGroupNbr( void) ; EIN_EXPORT int __stdcall EgtGetFirstMachGroup( void) ; EIN_EXPORT int __stdcall EgtGetNextMachGroup( int nId) ; diff --git a/EMkMachMgr.h b/EMkMachMgr.h index c192559..ee64553 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -29,7 +29,7 @@ class __declspec( novtable) IMachMgr public : // Basic virtual ~IMachMgr( void) {} - virtual bool Init( IGeomDB* pGeomDB) = 0 ; + virtual bool Init( IGeomDB* pGeomDB, const std::string& sMachinesDir) = 0 ; virtual bool Update( void) = 0 ; virtual bool Insert( int nInsGrp) = 0 ; // MachGroups