From 5c65e2666093da1a2fd2d12b397755c5312d6626 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Fri, 2 Aug 2019 17:36:03 +0000 Subject: [PATCH] Include : - aggiornamento prototipi. --- EGkExtText.h | 2 ++ EInAPI.h | 9 +++++++-- EXeExecutor.h | 4 ++++ 3 files changed, 13 insertions(+), 2 deletions(-) diff --git a/EGkExtText.h b/EGkExtText.h index 6be2038..f06c515 100644 --- a/EGkExtText.h +++ b/EGkExtText.h @@ -53,6 +53,8 @@ class __declspec( novtable) IExtText : public IGeoObj virtual bool Mir( bool bOnLen) = 0 ; virtual bool ModifyText( const std::string& sText) = 0 ; virtual bool ChangeFont( const std::string& sFont) = 0 ; + virtual bool ChangeHeight( double dH) = 0 ; + virtual bool ChangeItalic( bool bItl) = 0 ; } ; //----------------------------------------------------------------------------- diff --git a/EInAPI.h b/EInAPI.h index 13af8a4..6bd3684 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -386,6 +386,8 @@ EIN_EXPORT BOOL __stdcall EgtChangeVectorBase( int nId, const double ptB[3], int EIN_EXPORT BOOL __stdcall EgtInvertVector( int nNumId, const int nIds[]) ; 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 EgtChangeTextHeight( int nId, double dH) ; +EIN_EXPORT BOOL __stdcall EgtChangeTextItalic( int nId, BOOL bItl) ; EIN_EXPORT BOOL __stdcall EgtFlipText( int nId) ; EIN_EXPORT BOOL __stdcall EgtMirrorText( int nId, BOOL bOnL) ; EIN_EXPORT int __stdcall EgtExplodeText( int nId, int* pnCount) ; @@ -489,10 +491,13 @@ EIN_EXPORT BOOL __stdcall EgtSurfTmFacetNormVersor( int nId, int nFacet, int nRe EIN_EXPORT BOOL __stdcall EgtSurfTmFacetOppositeSide( int nId, int nFacet, const double vtDir[3], int nRefId, double ptP1[3], double ptP2[3]) ; EIN_EXPORT BOOL __stdcall EgtSurfTmFacetAdjacencies( int nId, int nFacet, int*& vAdj, int* pnCount) ; -EIN_EXPORT BOOL __stdcall EgtSurfTmFacetsContact( int nId, int nF1, int nF2, int nRefId, bool* pbAdjac, double ptP1[3], double ptP2[3], double* pdAng) ; +EIN_EXPORT BOOL __stdcall EgtSurfTmFacetsContact( int nId, int nF1, int nF2, int nRefId, + BOOL* pbAdjac, double ptP1[3], double ptP2[3], double* pdAng) ; EIN_EXPORT BOOL __stdcall EgtTextNormVersor( int nId, int nRefId, double vtNorm[3]) ; EIN_EXPORT BOOL __stdcall EgtTextGetContent( int nId, wchar_t*& wsText) ; EIN_EXPORT BOOL __stdcall EgtTextGetFont( int nId, wchar_t*& wsFont) ; +EIN_EXPORT BOOL __stdcall EgtTextGetHeight( int nId, double* pdH) ; +EIN_EXPORT BOOL __stdcall EgtTextGetItalic( int nId, BOOL* pbItl) ; EIN_EXPORT BOOL __stdcall EgtPointToIdGlob( double ptP[3], int nId) ; EIN_EXPORT BOOL __stdcall EgtPointToIdLoc( double ptP[3], int nId) ; EIN_EXPORT BOOL __stdcall EgtVectorToIdGlob( double vtV[3], int nId) ; @@ -632,7 +637,7 @@ EIN_EXPORT BOOL __stdcall EgtGetTableName( wchar_t*& wsTableName) ; EIN_EXPORT BOOL __stdcall EgtGetTableRef( int nInd, double ptPos[3]) ; EIN_EXPORT BOOL __stdcall EgtGetTableArea( int nInd, double ptMin[3], double ptMax[3]) ; EIN_EXPORT BOOL __stdcall EgtGetTableAreaOffset( int nInd, double ptMinOffs[3], double ptMaxOffs[3]) ; -EIN_EXPORT BOOL __stdcall EgtShowOnlyTable( bool bVal) ; +EIN_EXPORT BOOL __stdcall EgtShowOnlyTable( BOOL bVal) ; EIN_EXPORT int __stdcall EgtAddFixture( const wchar_t* wsName, const double ptPos[3], double dAngRotDeg, double dMov) ; EIN_EXPORT BOOL __stdcall EgtKeepFixture( int nFxtId, int nSouPhase) ; EIN_EXPORT BOOL __stdcall EgtRemoveFixture( int nFxtId) ; diff --git a/EXeExecutor.h b/EXeExecutor.h index f706194..54402cf 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -419,6 +419,8 @@ EXE_EXPORT bool ExeChangeVectorBase( int nId, const Point3d& ptB, int nRefType) EXE_EXPORT bool ExeInvertVector( const INTVECTOR& vIds) ; EXE_EXPORT bool ExeModifyText( int nId, const std::string& sNewText) ; EXE_EXPORT bool ExeChangeTextFont( int nId, const std::string& sNewFont) ; +EXE_EXPORT bool ExeChangeTextHeight( int nId, double dH) ; +EXE_EXPORT bool ExeChangeTextItalic( int nId, bool bItl) ; EXE_EXPORT bool ExeFlipText( int nId) ; EXE_EXPORT bool ExeMirrorText( int nId, bool bOnL) ; EXE_EXPORT int ExeExplodeText( int nId, int* pnCount) ; @@ -577,6 +579,8 @@ EXE_EXPORT bool ExeVolZmapPartVolume( int nId, int nPart, double& dVol) ; EXE_EXPORT bool ExeTextNormVersor( int nId, int nRefId, Vector3d& vtNorm) ; EXE_EXPORT bool ExeTextGetContent( int nId, std::string& sText) ; EXE_EXPORT bool ExeTextGetFont( int nId, std::string& sFont) ; +EXE_EXPORT bool ExeTextGetHeight( int nId, double& dH) ; +EXE_EXPORT bool ExeTextGetItalic( int nId, bool& bItl) ; EXE_EXPORT bool ExePointToIdGlob( Point3d& ptP, int nId) ; EXE_EXPORT bool ExePointToIdLoc( Point3d& ptP, int nId) ; EXE_EXPORT bool ExeVectorToIdGlob( Vector3d& vtV, int nId) ;