Include :

- aggiornamento interfacce.
This commit is contained in:
Dario Sassi
2015-01-14 21:57:59 +00:00
parent b4908a3462
commit 3c2415213f
4 changed files with 42 additions and 26 deletions
+7 -3
View File
@@ -1,13 +1,13 @@
//----------------------------------------------------------------------------
// EgalTech 2013-2014
// EgalTech 2014-2015
//----------------------------------------------------------------------------
// File : EgkDllMain.h Data : 29.05.14 Versione : 1.5e10
// File : EgkDllMain.h Data : 13.01.15 Versione : 1.6a2
// Contenuto : Prototipi funzioni generali della DLL.
//
//
//
// Modifiche : 21.11.13 DS Creazione modulo.
//
// 13.01.15 DS Agg. funzioni Get sui font.
//
//----------------------------------------------------------------------------
@@ -34,3 +34,7 @@ EGK_EXPORT void SetEGkLogger( ILogger* pLogger) ;
EGK_EXPORT void SetEGkKey( const std::string& sKey) ;
// permette di inizializzare il font manager
EGK_EXPORT void InitFontManager( const std::string& sNfeFontDir, const std::string& sDefaultFont) ;
// restituisce il direttorio dei font proprietari (Nfe)
EGK_EXPORT const std::string& GetNfeFontDir( void) ;
// restituisce il nome del font di default
EGK_EXPORT const std::string& GetDefaultFont( void) ;
+6 -7
View File
@@ -21,13 +21,12 @@ class __declspec( novtable) IExtText : public IGeoObj
{
public :
virtual bool CopyFrom( const IGeoObj* pGObjSrc) = 0 ;
virtual bool Set( const std::string& sText, const Point3d& ptP, double dAngDeg, double dH) = 0 ;
virtual bool Set( const std::string& sText, const Point3d& ptP, double dAngDeg,
const std::string& sFont, int nW, bool bItl, double dH, double dRat, double dAddAdv,
int nInsPos = 7) = 0 ;
virtual bool Set( const std::string& sText, const Point3d& ptP, const Vector3d& vtN, const Vector3d& vtD,
const std::string& sFont, int nW, bool bItl, double dH, double dRat, double dAddAdv,
int nInsPos = 7) = 0 ;
virtual bool Set( const Point3d& ptP, double dAngDeg, const std::string& sText, double dH) = 0 ;
virtual bool Set( const Point3d& ptP, const Vector3d& vtN, const Vector3d& vtD,
const std::string& sText, const std::string& sFont, bool bItl, double dH) = 0 ;
virtual bool Set( const Point3d& ptP, const Vector3d& vtN, const Vector3d& vtD,
const std::string& sText, const std::string& sFont, int nW, bool bItl, double dH,
double dRat, double dAddAdv, int nInsPos = 7) = 0 ;
virtual const Point3d& GetPoint( void) const = 0 ;
virtual const Vector3d& GetNormVersor( void) const = 0 ;
virtual const Vector3d& GetDirVersor( void) const = 0 ;
+1 -1
View File
@@ -38,7 +38,7 @@ class __declspec( novtable) IGeomDB
virtual ~IGeomDB( void) {}
virtual bool Init( void) = 0 ;
virtual bool Clear( void) = 0 ;
virtual bool Load( const std::string& sFileIn) = 0 ;
virtual bool Load( const std::string& sFileIn, int nGroupId = GDB_ID_ROOT) = 0 ;
virtual bool Save( const std::string& sFileOut, int nFlag = GDB_SV_BIN) const = 0 ;
virtual bool ExistsObj( int nId) const = 0 ;
virtual int AddGroup( int nId, int nParentId, const Frame3d& frFrame) = 0 ;
+28 -15
View File
@@ -35,7 +35,12 @@ EIN_EXPORT BOOL __stdcall EgtInit( int nDebug, const wchar_t* sLogFile) ;
EIN_EXPORT BOOL __stdcall EgtExit( void) ;
EIN_EXPORT BOOL __stdcall EgtSetKey( const wchar_t* sKey) ;
EIN_EXPORT BOOL __stdcall EgtSetFont( const wchar_t* sNfeFontDir, const wchar_t* sDefaultFont) ;
EIN_EXPORT BOOL __stdcall EgtGetNfeFontDir( wchar_t*& wsNfeFontDir) ;
EIN_EXPORT BOOL __stdcall EgtGetDefaultFont( wchar_t*& wsDefaultFont) ;
EIN_EXPORT BOOL __stdcall EgtSetLuaLibs( const wchar_t* sLuaLibsDir) ;
EIN_EXPORT BOOL __stdcall EgtSetCommandLogger( const wchar_t* sLogFile) ;
EIN_EXPORT void __stdcall EgtEnableCommandLogger( void) ;
EIN_EXPORT void __stdcall EgtDisableCommandLogger( void) ;
EIN_EXPORT BOOL __stdcall EgtGetVersionInfo( wchar_t*& wsVer) ;
EIN_EXPORT BOOL __stdcall EgtFreeMemory( void* pMem) ;
@@ -104,6 +109,7 @@ EIN_EXPORT BOOL __stdcall EgtSetGridFrame( const double ptOrig[3], const double
EIN_EXPORT BOOL __stdcall EgtGetGridFrame( double ptOrig[3], double vX[3], double vY[3], double vZ[3]) ;
EIN_EXPORT BOOL __stdcall EgtNewFile( void) ;
EIN_EXPORT BOOL __stdcall EgtOpenFile( const wchar_t* wsFilePath) ;
EIN_EXPORT BOOL __stdcall EgtImportFile( const wchar_t* wsFilePath) ;
EIN_EXPORT BOOL __stdcall EgtSaveFile( const wchar_t* wsFilePath, int nFlag) ;
// GeomDB Create
@@ -113,11 +119,13 @@ EIN_EXPORT int __stdcall EgtCreateGeoPoint( int nParentId, const double ptP[3])
EIN_EXPORT int __stdcall EgtCreateGeoVector( int nParentId, const double vtV[3], const double ptB[3]) ;
EIN_EXPORT int __stdcall EgtCreateGeoFrame( int nParentId, const double ptOrig[3],
const double vX[3], const double vY[3], const double vZ[3]) ;
EIN_EXPORT int __stdcall EgtCreateText( int nParentId, const wchar_t* wsText,
const double ptP[3], double dAngRotDeg, double dH) ;
EIN_EXPORT int __stdcall EgtCreateTextEx( int nParentId, const wchar_t* wsText,
const double ptP[3], double dAngRotDeg, const wchar_t* wsFont,
int nW, BOOL bItalic, double dH, double dRat, double dAddAdv, int nInsPos) ;
EIN_EXPORT int __stdcall EgtCreateText( int nParentId, const double ptP[3], double dAngRotDeg,
const wchar_t* wsText, double dH) ;
EIN_EXPORT int __stdcall EgtCreateTextEx( int nParentId, const double ptP[3], const double vtN[3], const double vtD[3],
const wchar_t* wsText, const wchar_t* wsFont, BOOL bItalic, double dH) ;
EIN_EXPORT int __stdcall EgtCreateTextAdv( int nParentId, const double ptP[3], const double vtN[3], const double vtD[3],
const wchar_t* wsText, const wchar_t* wsFont,
int nW, BOOL bItalic, double dH, double dRat, double dAddAdv, int nInsPos) ;
// GeomDB Create Curve
EIN_EXPORT int __stdcall EgtCreateCurveLine( int nParentId,
@@ -141,10 +149,10 @@ EIN_EXPORT int __stdcall EgtCreateCurveArc( int nParentId,
EIN_EXPORT int __stdcall EgtCreateCurveArcXY( int nParentId,
const double ptCen[3], double dRad,
double dAngStartDeg, double dAngCenDeg, double dDeltaZ) ;
EIN_EXPORT int __stdcall EgtCreateCurveArc3P( int nParentId,
const double ptP1[3], const double ptP2[3], const double ptP3[3]) ;
EIN_EXPORT int __stdcall EgtCreateCurveArcC2PN( int nParentId, const double ptCen[3],
const double ptStart[3], const double ptNearEnd[3], const double vtNorm[3]) ;
EIN_EXPORT int __stdcall EgtCreateCurveArc3P( int nParentId,
const double ptP1[3], const double ptP2[3], const double ptP3[3]) ;
EIN_EXPORT int __stdcall EgtCreateCurveArc2PVN( int nParentId, const double ptStart[3],
const double ptEnd[3], const double vtDirS[3], const double vtNorm[3]) ;
EIN_EXPORT int __stdcall EgtCreateCurveBezier( int nParentId, int nDegree,
@@ -153,13 +161,15 @@ EIN_EXPORT int __stdcall EgtCreateCurveBezierRational( int nParentId, int nDegr
const double ptCtrlWs[/*4x(nDegree+1)*/]) ;
EIN_EXPORT int __stdcall EgtCreateCurveBezierFromArc( int nParentId, int nArcId, BOOL bErase) ;
EIN_EXPORT int __stdcall EgtCreateCurveCompo( int nParentId, int nNumId, const int nIds[], BOOL bErase) ;
EIN_EXPORT int __stdcall EgtCreateCurveCompoByChain( int nParentId, int nNumId, const int nIds[], const double ptNear[3], BOOL bErase) ;
EIN_EXPORT int __stdcall EgtCreateCurveCompoByChain( int nParentId,
int nNumId, const int nIds[], const double ptNear[3], BOOL bErase) ;
EIN_EXPORT int __stdcall EgtCreateCurveCompoFromPoints( int nParentId, int nP, const double ptPs[/*3 x nP*/]) ;
EIN_EXPORT int __stdcall EgtCreateCurveCompoFromPointBulges( int nParentId, int nPB, const double ptPBs[/*4 x nPB*/]) ;
EIN_EXPORT int __stdcall EgtCreateCurveCompoFromCurveApprox( int nParentId, int nSouId, BOOL bArcsVsLines, double dLinTol) ;
EIN_EXPORT int __stdcall EgtCreateCurveCompoFromRectangle( int nParentId, const double ptIni[3], const double ptFin[3]) ;
EIN_EXPORT int __stdcall EgtCreateCurveCompoFromPolygonSide( int nParentId, int nNumSides,
const double ptIni[3], const double ptFin[3]) ;
EIN_EXPORT int __stdcall EgtCreateCurveCompoByApprox( int nParentId, int nSouId, BOOL bArcsVsLines, double dLinTol) ;
EIN_EXPORT int __stdcall EgtCreateRectangle3P( int nParentId,
const double ptIni[3], const double ptCross[3], const double ptDir[3]) ;
EIN_EXPORT int __stdcall EgtCreatePolygonFromSide( int nParentId, int nNumSides,
const double ptIni[3], const double ptFin[3]) ;
// GeomDB Create Surf
EIN_EXPORT int __stdcall EgtCreateSurfTriMeshByContour( int nParentId, int nCrvId, double dLinTol) ;
@@ -252,15 +262,15 @@ EIN_EXPORT BOOL __stdcall EgtModifyText( int nId, const wchar_t* wsNewText) ;
EIN_EXPORT BOOL __stdcall EgtChangeTextFont( int nId, const wchar_t* wsNewFont) ;
EIN_EXPORT BOOL __stdcall EgtFlipText( int nId) ;
EIN_EXPORT BOOL __stdcall EgtMirrorText( int nId, BOOL bOnL) ;
EIN_EXPORT BOOL __stdcall EgtTextToOutline( int nId, int nDestGroupId) ;
EIN_EXPORT BOOL __stdcall EgtExplodeText( int nId) ;
EIN_EXPORT BOOL __stdcall EgtSplitText( int nId, int nDestGroupId) ;
EIN_EXPORT BOOL __stdcall EgtSplitText( int nId) ;
// GeomDb CurveModif
EIN_EXPORT BOOL __stdcall EgtInvertCurve( int nId) ;
EIN_EXPORT BOOL __stdcall EgtModifyCurveStartPoint( int nId, const double ptP[3]) ;
EIN_EXPORT BOOL __stdcall EgtModifyCurveEndPoint( int nId, const double ptP[3]) ;
EIN_EXPORT BOOL __stdcall EgtModifyCurveExtrusion( int nId, const double vtExtr[3]) ;
EIN_EXPORT BOOL __stdcall EgtSetCurveExtrusionFromGrid( int nId) ;
EIN_EXPORT BOOL __stdcall EgtModifyCurveThickness( int nId, double dThick) ;
EIN_EXPORT BOOL __stdcall EgtTrimCurveStartAtLen( int nId, double dLen) ;
EIN_EXPORT BOOL __stdcall EgtTrimCurveEndAtLen( int nId, double dLen) ;
@@ -276,7 +286,7 @@ EIN_EXPORT BOOL __stdcall EgtModifyCurveCircleCPN( int nId, const double ptOn[3]
EIN_EXPORT BOOL __stdcall EgtModifyCurveArcRadius( int nId, double dRad) ;
EIN_EXPORT BOOL __stdcall EgtModifyCurveArcC2PN( int nId, const double ptEnd[3]) ;
EIN_EXPORT BOOL __stdcall EgtModifyCurveArc3P( int nId, const double ptMid[3]) ;
EIN_EXPORT BOOL __stdcall EgtSeparateCurveCompo( int nId) ;
EIN_EXPORT BOOL __stdcall EgtExplodeCurveCompo( int nId) ;
EIN_EXPORT BOOL __stdcall EgtExplodeCurveBezier( int nId, double dLinTol, BOOL bArcsVsLines) ;
// Geo Snap Vector/Point/Frame
@@ -392,8 +402,11 @@ EIN_EXPORT BOOL __stdcall EgtTscExecFile( const wchar_t* wsFilePath) ;
EIN_EXPORT BOOL __stdcall EgtTscExecLine( const wchar_t* wsLine) ;
// LUA Executor
EIN_EXPORT BOOL __stdcall EgtLuaEvalNumExpr( const wchar_t* wsExpr, double* pdVal) ;
EIN_EXPORT BOOL __stdcall EgtLuaEvalStringExpr( const wchar_t* wsExpr, wchar_t*& wsVal) ;
EIN_EXPORT BOOL __stdcall EgtLuaExecLine( const wchar_t* wsLine) ;
EIN_EXPORT BOOL __stdcall EgtLuaExecFile( const wchar_t* wsFilePath) ;
EIN_EXPORT BOOL __stdcall EgtLuaRequire( const wchar_t* wsFilePath) ;
EIN_EXPORT BOOL __stdcall EgtLuaGetLastError( wchar_t*& wsError) ;