diff --git a/EGkGeomDB.h b/EGkGeomDB.h index 15a309b..f5cccd2 100644 --- a/EGkGeomDB.h +++ b/EGkGeomDB.h @@ -33,17 +33,17 @@ class _declspec( novtable) IGeomDB virtual bool Clear( void) = 0 ; virtual bool Load( std::ifstream& osIn) = 0 ; virtual bool Save( std::ofstream& osOut) = 0 ; - virtual bool ExistsObj( const std::string& sName) = 0 ; - virtual bool AddGeoObj( const std::string& sName, IGeoObj* pGeoObj) = 0 ; - virtual GeoObjType GetObjType( const std::string& sName) = 0 ; - virtual IGeoObj* GetGeoObj( const std::string& sName) = 0 ; - virtual bool Copy( const std::string& sNameSou, const std::string& sNameDest) = 0 ; - virtual bool Erase( const std::string& sName) = 0 ; - virtual bool Translate( const std::string& sName, const Vector3d& vtMove) = 0 ; - virtual bool Rotate( const std::string& sName, const Point3d& ptAx, const Vector3d& vtAx, double dCosAng, double dSinAng) = 0 ; - virtual bool Rotate( const std::string& sName, const Point3d& ptAx, const Vector3d& vtAx, double dAngDeg) = 0 ; - virtual bool Scale( const std::string& sName, const Point3d& ptCen, double dCoeffX, double dCoeffY, double dCoeffZ) = 0 ; - virtual bool Mirror( const std::string& sName, const Point3d& ptOn, const Vector3d& vtNorm) = 0 ; + virtual bool ExistsObj( int nId) = 0 ; + virtual bool AddGeoObj( int nId, IGeoObj* pGeoObj) = 0 ; + virtual GeoObjType GetObjType( int nId) = 0 ; + virtual IGeoObj* GetGeoObj( int nId) = 0 ; + virtual bool Copy(int nIdSou, int nIdDest) = 0 ; + virtual bool Erase( int nId) = 0 ; + virtual bool Translate( int nId, const Vector3d& vtMove) = 0 ; + virtual bool Rotate( int nId, const Point3d& ptAx, const Vector3d& vtAx, double dCosAng, double dSinAng) = 0 ; + virtual bool Rotate( int nId, const Point3d& ptAx, const Vector3d& vtAx, double dAngDeg) = 0 ; + virtual bool Scale( int nId, const Point3d& ptCen, double dCoeffX, double dCoeffY, double dCoeffZ) = 0 ; + virtual bool Mirror( int nId, const Point3d& ptOn, const Vector3d& vtNorm) = 0 ; } ; //----------------------------------------------------------------------------- diff --git a/EGnStringUtils.h b/EGnStringUtils.h index 3c6b5f1..3646571 100644 --- a/EGnStringUtils.h +++ b/EGnStringUtils.h @@ -86,7 +86,7 @@ FromString( const std::string& sVal, double& dVal) pStart = sVal.c_str() ; dVal = strtod( pStart, &pStop) ; return ( pStop != pStart && *pStop == '\0' && errno == 0) ; } -const std::string EGN_EXPORT ToString( int nVal, int nPrec = 1) ; +EGN_EXPORT const std::string ToString( int nVal, int nPrec = 1) ; inline const std::string ToString( bool bVal) { return std::string( ( bVal ? "1" : "0")) ; }