Include : aggiornamento.

This commit is contained in:
Dario Sassi
2013-12-02 08:57:23 +00:00
parent 2ca8ca2b20
commit 93bc521f6a
4 changed files with 12 additions and 8 deletions
+1 -1
View File
@@ -14,10 +14,10 @@
#pragma once
#include <string>
#include "/EgtDev/Include/EGnScan.h"
#include "/EgtDev/Include/EGkPoint3d.h"
#include "/EgtDev/Include/EGkFrame3d.h"
#include "/EgtDev/Include/EGkGeoObjType.h"
#include "/EgtDev/Include/EGnScan.h"
//----------------------- Macro per import/export ----------------------------
#undef EGK_EXPORT
+6 -5
View File
@@ -32,12 +32,13 @@ class _declspec( novtable) IGeomDB
virtual bool Init( void) = 0 ;
virtual bool Clear( void) = 0 ;
virtual bool Load( std::ifstream& osIn) = 0 ;
virtual bool Save( std::ofstream& osOut) = 0 ;
virtual bool ExistsObj( int nId) = 0 ;
virtual bool AddGeoObj( int nId, IGeoObj* pGeoObj) = 0 ;
virtual GeoObjType GetObjType( int nId) = 0 ;
virtual bool Save( std::ofstream& osOut) const = 0 ;
virtual bool ExistsNode( int nId) const = 0 ;
virtual bool AddGroup( int nId, int nParentId) = 0 ;
virtual bool AddGeoObj( int nId, int nParentId, IGeoObj* pGeoObj) = 0 ;
virtual GeoObjType GetObjType( int nId) const = 0 ;
virtual IGeoObj* GetGeoObj( int nId) = 0 ;
virtual bool Copy(int nIdSou, int nIdDest) = 0 ;
virtual bool Copy(int nIdSou, int nIdDest, int nParentIdDest) = 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 ;
+3
View File
@@ -86,6 +86,9 @@ FromString( const std::string& sVal, double& dVal)
pStart = sVal.c_str() ;
dVal = strtod( pStart, &pStop) ;
return ( pStop != pStart && *pStop == '\0' && errno == 0) ; }
EGN_EXPORT bool FromString( const std::string& sVal, Vector3d& vtVal) ;
EGN_EXPORT bool FromString( const std::string& sVal, Point3d& ptVal) ;
EGN_EXPORT bool FromString( const std::string& sVal, Point3d& ptVal, double& dW) ;
EGN_EXPORT const std::string ToString( int nVal, int nPrec = 1) ;
inline const std::string
ToString( bool bVal)
+2 -2
View File
@@ -45,11 +45,11 @@ inline bool CopyCurveBezier( const ICurveBezier* pCBSou, ICurveBezier* pCBDest)
if ( ! pCBDest->Init( nDeg, bRat))
return false ;
if ( bRat) {
for ( int i = 0 ; i <= nDeg ; i ++)
for ( int i = 0 ; i <= nDeg ; ++ i)
pCBDest->SetControlPoint( i, pCBSou->GetControlPoint( i), pCBSou->GetControlWeight( i)) ;
}
else {
for ( int i = 0 ; i <= nDeg ; i ++)
for ( int i = 0 ; i <= nDeg ; ++ i)
pCBDest->SetControlPoint( i, pCBSou->GetControlPoint( i)) ;
}
return true ; }