EgtExecutor :

- allineati nomi EXE con nomi Lua (CurveLine->Line, CurveArc->Arc e ExtText->Text)
- aggiunte ModifyArcToExplementary e ModifyArcByFlip a EXE e Lua
- aggiunte ArcAngCenter e ArcDeltaN a EXE e Lua.
This commit is contained in:
Dario Sassi
2015-07-31 10:19:06 +00:00
parent 0ab77038ed
commit 7a6b1c0096
7 changed files with 249 additions and 116 deletions
+33 -37
View File
@@ -64,7 +64,7 @@ static Vector3d CalcExtrusion( IGeomDB* pGeomDB, int nParentId, int nRefType) ;
//-------------------------------------------------------------------------------
int
ExeCreateCurveLine( int nParentId, const Point3d& ptIni, const Point3d& ptFin, int nRefType)
ExeCreateLine( int nParentId, const Point3d& ptIni, const Point3d& ptFin, int nRefType)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
@@ -104,7 +104,7 @@ ExeCreateCurveLine( int nParentId, const Point3d& ptIni, const Point3d& ptFin, i
//-------------------------------------------------------------------------------
int
ExeCreateCurveLineEx( int nParentId, const Point3d& ptIni, int nSepI, int nIdI,
ExeCreateLineEx( int nParentId, const Point3d& ptIni, int nSepI, int nIdI,
const Point3d& ptFin, int nSepF, int nIdF, int nRefType)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
@@ -479,8 +479,8 @@ CreateLineTgCurvePerpCurve( IGeomDB* pGeomDB, int nParentId,
//-------------------------------------------------------------------------------
int
ExeCreateCurveLinePDL( int nParentId, const Point3d& ptIni,
double dDirDeg, double dLen, int nRefType)
ExeCreateLinePDL( int nParentId, const Point3d& ptIni,
double dDirDeg, double dLen, int nRefType)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
@@ -521,8 +521,8 @@ ExeCreateCurveLinePDL( int nParentId, const Point3d& ptIni,
//-------------------------------------------------------------------------------
int
ExeCreateCurveLinePVL( int nParentId, const Point3d& ptIni,
const Vector3d& vtDir, double dLen, int nRefType)
ExeCreateLinePVL( int nParentId, const Point3d& ptIni,
const Vector3d& vtDir, double dLen, int nRefType)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
@@ -563,8 +563,8 @@ ExeCreateCurveLinePVL( int nParentId, const Point3d& ptIni,
//-------------------------------------------------------------------------------
int
ExeCreateCurveLineMinPointCurve( int nParentId,
const Point3d& ptStart, int nCrvId, double dNearPar, int nRefType)
ExeCreateLineMinPointCurve( int nParentId,
const Point3d& ptStart, int nCrvId, double dNearPar, int nRefType)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
@@ -623,7 +623,7 @@ ExeCreateCurveLineMinPointCurve( int nParentId,
//-------------------------------------------------------------------------------
int
ExeCreateCurveCircle( int nParentId, const Point3d& ptCen, double dRad, int nRefType)
ExeCreateCircle( int nParentId, const Point3d& ptCen, double dRad, int nRefType)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
@@ -663,8 +663,8 @@ ExeCreateCurveCircle( int nParentId, const Point3d& ptCen, double dRad, int nRef
//-------------------------------------------------------------------------------
int
ExeCreateCurveCircleCP( int nParentId, const Point3d& ptCen,
const Point3d& ptOn, int nRefType)
ExeCreateCircleCP( int nParentId, const Point3d& ptCen,
const Point3d& ptOn, int nRefType)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
@@ -704,8 +704,8 @@ ExeCreateCurveCircleCP( int nParentId, const Point3d& ptCen,
//-------------------------------------------------------------------------------
int
ExeCreateCurveCircleCPEx( int nParentId, const Point3d& ptCen,
const Point3d& ptOn, int nSepO, int nIdO, int nRefType)
ExeCreateCircleCPEx( int nParentId, const Point3d& ptCen,
const Point3d& ptOn, int nSepO, int nIdO, int nRefType)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
@@ -763,8 +763,8 @@ ExeCreateCurveCircleCPEx( int nParentId, const Point3d& ptCen,
//-------------------------------------------------------------------------------
int
ExeCreateCurveCircle3P( int nParentId, const Point3d& ptP1,
const Point3d& ptP2, const Point3d& ptP3, int nRefType)
ExeCreateCircle3P( int nParentId, const Point3d& ptP1,
const Point3d& ptP2, const Point3d& ptP3, int nRefType)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
@@ -806,8 +806,8 @@ ExeCreateCurveCircle3P( int nParentId, const Point3d& ptP1,
//-------------------------------------------------------------------------------
int
ExeCreateCurveArc( int nParentId, const Point3d& ptCen, double dRad,
double dAngIniDeg, double dAngCenDeg, double dDeltaN, int nRefType)
ExeCreateArc( int nParentId, const Point3d& ptCen, double dRad,
double dAngIniDeg, double dAngCenDeg, double dDeltaN, int nRefType)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
@@ -851,8 +851,8 @@ ExeCreateCurveArc( int nParentId, const Point3d& ptCen, double dRad,
//-------------------------------------------------------------------------------
int
ExeCreateCurveArcC2P( int nParentId, const Point3d& ptCen, const Point3d& ptStart,
const Point3d& ptNearEnd, int nRefType)
ExeCreateArcC2P( int nParentId, const Point3d& ptCen, const Point3d& ptStart,
const Point3d& ptNearEnd, int nRefType)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
@@ -895,9 +895,9 @@ ExeCreateCurveArcC2P( int nParentId, const Point3d& ptCen, const Point3d& ptStar
//-------------------------------------------------------------------------------
int
ExeCreateCurveArcC2PEx( int nParentId, const Point3d& ptCen,
const Point3d& ptStart, int nSepS, int nIdS,
const Point3d& ptNearEnd, int nRefType)
ExeCreateArcC2PEx( int nParentId, const Point3d& ptCen,
const Point3d& ptStart, int nSepS, int nIdS,
const Point3d& ptNearEnd, int nRefType)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
@@ -956,8 +956,8 @@ ExeCreateCurveArcC2PEx( int nParentId, const Point3d& ptCen,
//-------------------------------------------------------------------------------
int
ExeCreateCurveArc3P( int nParentId, const Point3d& ptP1,
const Point3d& ptP2, const Point3d& ptP3, int nRefType)
ExeCreateArc3P( int nParentId, const Point3d& ptP1,
const Point3d& ptP2, const Point3d& ptP3, int nRefType)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
@@ -1003,8 +1003,8 @@ ExeCreateCurveArc3P( int nParentId, const Point3d& ptP1,
//-------------------------------------------------------------------------------
int
ExeCreateCurveArc2PD( int nParentId, const Point3d& ptStart, const Point3d& ptEnd,
double dDirSDeg, int nRefType)
ExeCreateArc2PD( int nParentId, const Point3d& ptStart, const Point3d& ptEnd,
double dDirSDeg, int nRefType)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
@@ -1045,9 +1045,9 @@ ExeCreateCurveArc2PD( int nParentId, const Point3d& ptStart, const Point3d& ptEn
//-------------------------------------------------------------------------------
int
ExeCreateCurveArc2PDEx( int nParentId, const Point3d& ptStart,
const Point3d& ptEnd, int nSep, int nId,
double dDirSDeg, int nRefType)
ExeCreateArc2PDEx( int nParentId, const Point3d& ptStart,
const Point3d& ptEnd, int nSep, int nId,
double dDirSDeg, int nRefType)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
@@ -1119,8 +1119,8 @@ ExeCreateCurveArc2PDEx( int nParentId, const Point3d& ptStart,
//-------------------------------------------------------------------------------
int
ExeCreateCurveArc2PV( int nParentId, const Point3d& ptStart, const Point3d& ptEnd,
const Vector3d& vtDirS, int nRefType)
ExeCreateArc2PV( int nParentId, const Point3d& ptStart, const Point3d& ptEnd,
const Vector3d& vtDirS, int nRefType)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
@@ -1168,8 +1168,8 @@ ExeCreateCurveArc2PV( int nParentId, const Point3d& ptStart, const Point3d& ptEn
//-------------------------------------------------------------------------------
int
ExeCreateCurveBiArc( int nParentId, const Point3d& ptStart, const Point3d& ptEnd,
double dDirSDeg, double dDirEDeg, double dPar, int nRefType)
ExeCreateBiArc( int nParentId, const Point3d& ptStart, const Point3d& ptEnd,
double dDirSDeg, double dDirEDeg, double dPar, int nRefType)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
@@ -1580,10 +1580,6 @@ MyCreateCurveCompoByChain( int nParentId, const INTVECTOR& vIds,
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
nParentId = AdjustId( nParentId) ;
// creo la curva composita
PtrOwner<ICurveComposite> pCrvCompo( CreateCurveComposite()) ;
if ( IsNull( pCrvCompo))
return GDB_ID_NULL ;
// recupero il riferimento del gruppo destinazione
Frame3d frDest ;
if ( ! pGeomDB->GetGroupGlobFrame( nParentId, frDest))