EgtGeomKernel 1.6a2 :

- aggiunte GetNfeFontDir e GetDefaultFont
- modifiche a Set di ExtText
- migliorata gestione materiali
- GeomDB::Load ora può funzionare aggiungendo a DB già carico per Insert.
This commit is contained in:
Dario Sassi
2015-01-14 21:54:34 +00:00
parent bea7644551
commit 2e4b67f9e9
16 changed files with 124 additions and 60 deletions
+12 -13
View File
@@ -40,7 +40,7 @@ ExtText::~ExtText( void)
//----------------------------------------------------------------------------
bool
ExtText::Set( const string& sText, const Point3d& ptP, double dAngDeg, double dH)
ExtText::Set( const Point3d& ptP, double dAngDeg, const string& sText, double dH)
{
// controllo testo non vuoto
if ( sText.empty())
@@ -66,9 +66,8 @@ ExtText::Set( const string& sText, const Point3d& ptP, double dAngDeg, double dH
//----------------------------------------------------------------------------
bool
ExtText::Set( const string& sText, const Point3d& ptP, double dAngDeg,
const string& sFont, int nW, bool bItl, double dH, double dRat, double dAddAdv,
int nInsPos)
ExtText::Set( const Point3d& ptP, const Vector3d& vtN, const Vector3d& vtD,
const string& sText, const string& sFont, bool bItl, double dH)
{
// controllo testo non vuoto
if ( sText.empty())
@@ -78,16 +77,16 @@ ExtText::Set( const string& sText, const Point3d& ptP, double dAngDeg,
return false ;
// assegno i dati
m_ptP = ptP ;
m_vtN = Z_AX ;
m_vtD = FromPolar( 1, dAngDeg) ;
m_vtN = vtN ;
m_vtD = vtD ;
m_sText = sText ;
m_sFont = sFont ;
m_nWeight = nW ;
m_nWeight = 400 ;
m_bItalic = bItl ;
m_dHeight = dH ;
m_dRatio = dRat ;
m_dAddAdvance = dAddAdv ;
m_nInsPos = (( nInsPos >= ETXT_IPTL && nInsPos <= ETXT_IPBR) ? nInsPos : ETXT_IPBL) ;
m_dRatio = 1 ;
m_dAddAdvance = 0 ;
m_nInsPos = ETXT_IPBL ;
// imposto ricalcolo della grafica
m_OGrMgr.Reset() ;
@@ -97,9 +96,9 @@ ExtText::Set( const string& sText, const Point3d& ptP, double dAngDeg,
//----------------------------------------------------------------------------
bool
ExtText::Set( const string& sText, const Point3d& ptP, const Vector3d& vtN, const Vector3d& vtD,
const string& sFont, int nW, bool bItl, double dH, double dRat, double dAddAdv,
int nInsPos)
ExtText::Set( const Point3d& ptP, const Vector3d& vtN, const Vector3d& vtD,
const string& sText, const string& sFont, int nW, bool bItl, double dH,
double dRat, double dAddAdv, int nInsPos)
{
// controllo testo non vuoto
if ( sText.empty())