EgtExecutor 1.6g5 :

- in creazione curve eliminata la normale (si deduce dal riferimento indicato)
- in creazione gruppo di inserimento è layer corrente da costante
- gestino carattere ' nelle stringhe per lua.
This commit is contained in:
Dario Sassi
2015-07-20 13:07:09 +00:00
parent fece5ea9fb
commit b14c634bc3
12 changed files with 793 additions and 311 deletions
+27 -33
View File
@@ -121,22 +121,20 @@ LuaCreateGeoFrame( lua_State* L)
static int
LuaCreateText( lua_State* L)
{
// 5 o 6 parametri : ParentId, ptP, AngRotDeg, Text, H [, nRefType]
// 4 o 5 parametri : ParentId, ptP, Text, H [, nRefType]
int nParentId ;
LuaCheckParam( L, 1, nParentId)
Point3d ptP ;
LuaCheckParam( L, 2, ptP) ;
double dAngRotDeg ;
LuaCheckParam( L, 3, dAngRotDeg) ;
string sText ;
LuaCheckParam( L, 4, sText)
LuaCheckParam( L, 3, sText)
double dH ;
LuaCheckParam( L, 5, dH) ;
LuaCheckParam( L, 4, dH) ;
int nRefType = RTY_DEFAULT ;
LuaGetParam( L, 6, nRefType) ;
LuaGetParam( L, 5, nRefType) ;
LuaClearStack( L) ;
// creo il testo
int nId = ExeCreateText( nParentId, ptP, dAngRotDeg, sText, dH, nRefType) ;
int nId = ExeCreateText( nParentId, ptP, sText, dH, nRefType) ;
// restituisco il risultato
if ( nId != GDB_ID_NULL)
LuaSetParam( L, nId) ;
@@ -149,30 +147,28 @@ LuaCreateText( lua_State* L)
static int
LuaCreateTextEx( lua_State* L)
{
// 8 o 9 parametri : ParentId, ptP, vtN, vtD, Text, Font, bItalic, H [, nRefType]
// 7 o 8 parametri : ParentId, ptP, dAngRotDeg, Text, Font, bItalic, H [, nRefType]
int nParentId ;
LuaCheckParam( L, 1, nParentId)
Point3d ptP ;
LuaCheckParam( L, 2, ptP) ;
Vector3d vtN ;
LuaCheckParam( L, 3, vtN) ;
Vector3d vtD ;
LuaCheckParam( L, 4, vtD) ;
double dAngRotDeg ;
LuaCheckParam( L, 3, dAngRotDeg) ;
string sText ;
LuaCheckParam( L, 5, sText)
LuaCheckParam( L, 4, sText)
string sFont ;
LuaCheckParam( L, 6, sFont) ;
LuaCheckParam( L, 5, sFont) ;
string sItalic ;
LuaCheckParam( L, 7, sItalic)
LuaCheckParam( L, 6, sItalic)
ToUpper( sItalic) ;
bool bItalic = ( sItalic == "I") ;
double dH ;
LuaCheckParam( L, 8, dH) ;
LuaCheckParam( L, 7, dH) ;
int nRefType = RTY_DEFAULT ;
LuaGetParam( L, 9, nRefType) ;
LuaGetParam( L, 8, nRefType) ;
LuaClearStack( L) ;
// creo il testo in modo esteso
int nId = ExeCreateTextEx( nParentId, ptP, vtN, vtD, sText, sFont, bItalic, dH, nRefType) ;
int nId = ExeCreateTextEx( nParentId, ptP, dAngRotDeg, sText, sFont, bItalic, dH, nRefType) ;
// restituisco il risultato
if ( nId != GDB_ID_NULL)
LuaSetParam( L, nId) ;
@@ -185,38 +181,36 @@ LuaCreateTextEx( lua_State* L)
static int
LuaCreateTextAdv( lua_State* L)
{
// 12 o 13 parametri : ParentId, ptP, vtN, vtD, Text, Font, W, sItalic, H, Rat, AddAdv, InsPos [, nRefType]
// 11 o 12 parametri : ParentId, ptP, dAngRotDeg, Text, Font, W, sItalic, H, Rat, AddAdv, InsPos [, nRefType]
int nParentId ;
LuaCheckParam( L, 1, nParentId)
Point3d ptP ;
LuaCheckParam( L, 2, ptP) ;
Vector3d vtN ;
LuaCheckParam( L, 3, vtN) ;
Vector3d vtD ;
LuaCheckParam( L, 4, vtD) ;
double dAngRotDeg ;
LuaCheckParam( L, 3, dAngRotDeg) ;
string sText ;
LuaCheckParam( L, 5, sText)
LuaCheckParam( L, 4, sText)
string sFont ;
LuaCheckParam( L, 6, sFont)
LuaCheckParam( L, 5, sFont)
int nW ;
LuaCheckParam( L, 7, nW)
LuaCheckParam( L, 6, nW)
string sItalic ;
LuaCheckParam( L, 8, sItalic)
LuaCheckParam( L, 7, sItalic)
ToUpper( sItalic) ;
bool bItalic = ( sItalic == "I") ;
double dH ;
LuaCheckParam( L, 9, dH)
LuaCheckParam( L, 8, dH)
double dRat ;
LuaCheckParam( L, 10, dRat)
LuaCheckParam( L, 9, dRat)
double dAddAdv ;
LuaCheckParam( L, 11, dAddAdv)
LuaCheckParam( L, 10, dAddAdv)
int nInsPos ;
LuaCheckParam( L, 12, nInsPos)
LuaCheckParam( L, 11, nInsPos)
int nRefType = RTY_DEFAULT ;
LuaGetParam( L, 13, nRefType) ;
LuaGetParam( L, 12, nRefType) ;
LuaClearStack( L) ;
// creo il testo in modo avanzato
int nId = ExeCreateTextAdv( nParentId, ptP, vtN, vtD,
int nId = ExeCreateTextAdv( nParentId, ptP, dAngRotDeg,
sText, sFont, nW, bItalic, dH, dRat, dAddAdv, nInsPos, nRefType) ;
// restituisco il risultato
if ( nId != GDB_ID_NULL)