From 04882c2326bcd62ff61c15847022c6e8910dba10 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Fri, 6 Jun 2014 08:54:10 +0000 Subject: [PATCH] Include : - aggiornamento interfacce. --- EGkExtText.h | 24 +++++++++++++++++++++++- EgnFileUtils.h | 1 + 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/EGkExtText.h b/EGkExtText.h index 47c262e..4def6a1 100644 --- a/EGkExtText.h +++ b/EGkExtText.h @@ -23,7 +23,11 @@ class __declspec( novtable) IExtText : public IGeoObj virtual bool Copy( 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) = 0 ; + 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 const Point3d& GetPoint( void) const = 0 ; virtual const Vector3d& GetNormVersor( void) const = 0 ; virtual const Vector3d& GetDirVersor( void) const = 0 ; @@ -34,8 +38,12 @@ class __declspec( novtable) IExtText : public IGeoObj virtual double GetHeight( void) const = 0 ; virtual double GetRatio( void) const = 0 ; virtual double GetAddAdvance( void) const = 0 ; + virtual int GetInsPosition( void) const = 0 ; + virtual bool GetHeightVersor( Vector3d& vtH) const = 0 ; virtual bool GetStartPoint( Point3d& ptStart) const = 0 ; + virtual bool GetOverStartPoint( Point3d& ptStart) const = 0 ; virtual bool GetEndPoint( Point3d& ptEnd) const = 0 ; + virtual bool GetOverEndPoint( Point3d& ptEnd) const = 0 ; virtual bool GetMidPoint( Point3d& ptMid) const = 0 ; virtual bool GetCenterPoint( Point3d& ptCen) const = 0 ; virtual bool GetOutline( ICURVEPLIST& lstPC) const = 0 ; @@ -59,3 +67,17 @@ inline IExtText* GetExtText( IGeoObj* pGObj) { if ( pGObj == nullptr || pGObj->GetType() != EXT_TEXT) return nullptr ; return (static_cast(pGObj)) ; } + +//------------------------ Costanti per posizione di inserimento ------------- +// indica la posizione del punto di inserimento rispetto al testo +enum ExtTextInsPosition { ETXT_IPTL = 1, // top left + ETXT_IPTC = 2, // top center + ETXT_IPTR = 3, // top right + ETXT_IPML = 4, // middle left + ETXT_IPMC = 5, // middle center + ETXT_IPMR = 6, // middle right + ETXT_IPBL = 7, // bottom left + ETXT_IPBC = 8, // bottom center + ETXT_IPBR = 9} ; // bottom right +// stringa per interruzione di riga +const std::string ETXT_LINEBREAK = "
" ; \ No newline at end of file diff --git a/EgnFileUtils.h b/EgnFileUtils.h index 1aca6e7..4299cd5 100644 --- a/EgnFileUtils.h +++ b/EgnFileUtils.h @@ -28,4 +28,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 EmptyDirectory( const std::string& sDir) ;