diff --git a/API_GdbCreateCurve.cpp b/API_GdbCreateCurve.cpp index c62f886..3aa4720 100644 --- a/API_GdbCreateCurve.cpp +++ b/API_GdbCreateCurve.cpp @@ -21,132 +21,140 @@ using namespace std ; //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveLine( int nParentId, const double ptIni[3], const double ptFin[3], int nRefType) +__stdcall EgtCreateLine( int nParentId, const double ptIni[3], const double ptFin[3], int nRefType) { - return ExeCreateCurveLine( nParentId, ptIni, ptFin, nRefType) ; + return ExeCreateLine( nParentId, ptIni, ptFin, nRefType) ; } //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveLineEx( int nParentId, const double ptIni[3], int nSepI, int nIdI, +__stdcall EgtCreateLineEx( int nParentId, const double ptIni[3], int nSepI, int nIdI, const double ptFin[3], int nSepF, int nIdF, int nRefType) { - return ExeCreateCurveLineEx( nParentId, ptIni, nSepI, nIdI, ptFin, nSepF, nIdF, nRefType) ; + return ExeCreateLineEx( nParentId, ptIni, nSepI, nIdI, ptFin, nSepF, nIdF, nRefType) ; } //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveLinePDL( int nParentId, const double ptIni[3], +__stdcall EgtCreateLinePDL( int nParentId, const double ptIni[3], double dDirDeg, double dLen, int nRefType) { - return ExeCreateCurveLinePDL( nParentId, ptIni, dDirDeg, dLen, nRefType) ; + return ExeCreateLinePDL( nParentId, ptIni, dDirDeg, dLen, nRefType) ; } //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveLinePVL( int nParentId, const double ptIni[3], +__stdcall EgtCreateLinePVL( int nParentId, const double ptIni[3], const double vtDir[3], double dLen, int nRefType) { - return ExeCreateCurveLinePVL( nParentId, ptIni, vtDir, dLen, nRefType) ; + return ExeCreateLinePVL( nParentId, ptIni, vtDir, dLen, nRefType) ; } //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveLineMinPointCurve( int nParentId, +__stdcall EgtCreateLineMinPointCurve( int nParentId, const double ptStart[3], int nCrvId, double dNearPar, int nRefType) { - return ExeCreateCurveLineMinPointCurve( nParentId, ptStart, nCrvId, dNearPar, nRefType) ; + return ExeCreateLineMinPointCurve( nParentId, ptStart, nCrvId, dNearPar, nRefType) ; } //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveCircle( int nParentId, const double ptCen[3], +__stdcall EgtCreateCircle( int nParentId, const double ptCen[3], double dRad, int nRefType) { - return ExeCreateCurveCircle( nParentId, ptCen, dRad, nRefType) ; + return ExeCreateCircle( nParentId, ptCen, dRad, nRefType) ; } //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveCircleCP( int nParentId, const double ptCen[3], +__stdcall EgtCreateCircleCP( int nParentId, const double ptCen[3], const double ptOn[3], int nRefType) { - return ExeCreateCurveCircleCP( nParentId, ptCen, ptOn, nRefType) ; + return ExeCreateCircleCP( nParentId, ptCen, ptOn, nRefType) ; } //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveCircleCPEx( int nParentId, const double ptCen[3], +__stdcall EgtCreateCircleCPEx( int nParentId, const double ptCen[3], const double ptOn[3], int nSepO, int nIdO, int nRefType) { - return ExeCreateCurveCircleCPEx( nParentId, ptCen, ptOn, nSepO, nIdO, nRefType) ; + return ExeCreateCircleCPEx( nParentId, ptCen, ptOn, nSepO, nIdO, nRefType) ; } //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveCircle3P( int nParentId, const double ptP1[3], +__stdcall EgtCreateCircle3P( int nParentId, const double ptP1[3], const double ptP2[3], const double ptP3[3], int nRefType) { - return ExeCreateCurveCircle3P( nParentId, ptP1, ptP2, ptP3, nRefType) ; + return ExeCreateCircle3P( nParentId, ptP1, ptP2, ptP3, nRefType) ; } //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveArc( int nParentId, const double ptCen[3], double dRad, +__stdcall EgtCreateArc( int nParentId, const double ptCen[3], double dRad, double dAngIniDeg, double dAngCenDeg, double dDeltaN, int nRefType) { - return ExeCreateCurveArc( nParentId, ptCen, dRad, dAngIniDeg, dAngCenDeg, dDeltaN, nRefType) ; + return ExeCreateArc( nParentId, ptCen, dRad, dAngIniDeg, dAngCenDeg, dDeltaN, nRefType) ; } //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveArcC2P( int nParentId, const double ptCen[3], const double ptStart[3], +__stdcall EgtCreateArcC2P( int nParentId, const double ptCen[3], const double ptStart[3], const double ptNearEnd[3], int nRefType) { - return ExeCreateCurveArcC2P( nParentId, ptCen, ptStart, ptNearEnd, nRefType) ; + return ExeCreateArcC2P( nParentId, ptCen, ptStart, ptNearEnd, nRefType) ; } //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveArcC2PEx( int nParentId, const double ptCen[3], +__stdcall EgtCreateArcC2PEx( int nParentId, const double ptCen[3], const double ptStart[3], int nSepS, int nIdS, const double ptNearEnd[3], int nRefType) { - return ExeCreateCurveArcC2PEx( nParentId, ptCen, ptStart, nSepS, nIdS, ptNearEnd, nRefType) ; + return ExeCreateArcC2PEx( nParentId, ptCen, ptStart, nSepS, nIdS, ptNearEnd, nRefType) ; } //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveArc3P( int nParentId, const double ptP1[3], +__stdcall EgtCreateArc3P( int nParentId, const double ptP1[3], const double ptP2[3], const double ptP3[3], int nRefType) { - return ExeCreateCurveArc3P( nParentId, ptP1, ptP2, ptP3, nRefType) ; + return ExeCreateArc3P( nParentId, ptP1, ptP2, ptP3, nRefType) ; } //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveArc2PD( int nParentId, const double ptStart[3], const double ptEnd[3], +__stdcall EgtCreateArc2PD( int nParentId, const double ptStart[3], const double ptEnd[3], double dDirSDeg, int nRefType) { - return ExeCreateCurveArc2PD( nParentId, ptStart, ptEnd, dDirSDeg, nRefType) ; + return ExeCreateArc2PD( nParentId, ptStart, ptEnd, dDirSDeg, nRefType) ; } //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveArc2PDEx( int nParentId, const double ptStart[3], - const double ptEnd[3], int nSep, int nId, - double dDirSDeg, int nRefType) +__stdcall EgtCreateArc2PDEx( int nParentId, const double ptStart[3], + const double ptEnd[3], int nSep, int nId, + double dDirSDeg, int nRefType) { - return ExeCreateCurveArc2PDEx( nParentId, ptStart, ptEnd, nSep, nId, dDirSDeg, nRefType) ; + return ExeCreateArc2PDEx( nParentId, ptStart, ptEnd, nSep, nId, dDirSDeg, nRefType) ; } //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveArc2PV( int nParentId, const double ptStart[3], const double ptEnd[3], - const double vtDirS[3], int nRefType) +__stdcall EgtCreateArc2PV( int nParentId, const double ptStart[3], const double ptEnd[3], + const double vtDirS[3], int nRefType) { - return ExeCreateCurveArc2PV( nParentId, ptStart, ptEnd, vtDirS, nRefType) ; + return ExeCreateArc2PV( nParentId, ptStart, ptEnd, vtDirS, nRefType) ; +} + +//------------------------------------------------------------------------------- +int +__stdcall EgtCreateBiArc( int nParentId, const double ptStart[3], const double ptEnd[3], + double dDirSDeg, double dDirEDeg, double dPar, int nRefType) +{ + return ExeCreateBiArc( nParentId, ptStart, ptEnd, dDirSDeg, dDirEDeg, dPar, nRefType) ; } //------------------------------------------------------------------------------- diff --git a/API_GdbModifyCurve.cpp b/API_GdbModifyCurve.cpp index 06706e7..d0607c3 100644 --- a/API_GdbModifyCurve.cpp +++ b/API_GdbModifyCurve.cpp @@ -146,30 +146,30 @@ __stdcall EgtSplitCurveAtPoint( int nId, const double ptOn[3], int nRefType) //------------------------------------------------------------------------------- BOOL -__stdcall EgtModifyCurveCircleCPN( int nId, const double ptOn[3], int nRefType) +__stdcall EgtModifyCircleCP( int nId, const double ptOn[3], int nRefType) { - return ( ExeModifyCurveCircleCPN( nId, ptOn, nRefType) ? TRUE : FALSE) ; + return ( ExeModifyCircleCP( nId, ptOn, nRefType) ? TRUE : FALSE) ; } //------------------------------------------------------------------------------- BOOL -__stdcall EgtModifyCurveArcRadius( int nId, double dRad) +__stdcall EgtModifyArcRadius( int nId, double dRad) { - return ( ExeModifyCurveArcRadius( nId, dRad) ? TRUE : FALSE) ; + return ( ExeModifyArcRadius( nId, dRad) ? TRUE : FALSE) ; } //------------------------------------------------------------------------------- BOOL -__stdcall EgtModifyCurveArcC2PN( int nId, const double ptEnd[3], int nRefType) +__stdcall EgtModifyArcC2P( int nId, const double ptEnd[3], int nRefType) { - return ( ExeModifyCurveArcC2PN( nId, ptEnd, nRefType) ? TRUE : FALSE) ; + return ( ExeModifyArcC2P( nId, ptEnd, nRefType) ? TRUE : FALSE) ; } //------------------------------------------------------------------------------- BOOL -__stdcall EgtModifyCurveArc3P( int nId, const double ptMid[3], int nRefType) +__stdcall EgtModifyArc3P( int nId, const double ptMid[3], int nRefType) { - return ( ExeModifyCurveArc3P( nId, ptMid, nRefType) ? TRUE : FALSE) ; + return ( ExeModifyArc3P( nId, ptMid, nRefType) ? TRUE : FALSE) ; } //------------------------------------------------------------------------------- diff --git a/API_GeoSnap.cpp b/API_GeoSnap.cpp index 4b750dd..9aaa090 100644 --- a/API_GeoSnap.cpp +++ b/API_GeoSnap.cpp @@ -269,18 +269,32 @@ __stdcall EgtGetMinDistPntSidePointCurve( const double ptP[3], int nId, const do //---------------------------------------------------------------------------- BOOL -__stdcall EgtCurveArcRadius( int nId, double* pdRad) +__stdcall EgtArcRadius( int nId, double* pdRad) { - return ( ExeCurveArcRadius( nId, pdRad) ? TRUE : FALSE) ; + return ( ExeArcRadius( nId, pdRad) ? TRUE : FALSE) ; } //---------------------------------------------------------------------------- BOOL -__stdcall EgtCurveArcNormVersor( int nId, int nRefId, double vtNorm[3]) +__stdcall EgtArcAngCenter( int nId, double* pdAngDeg) +{ + return ( ExeArcAngCenter( nId, pdAngDeg) ? TRUE : FALSE) ; +} + +//---------------------------------------------------------------------------- +BOOL +__stdcall EgtArcDeltaN( int nId, double* pdDeltaN) +{ + return ( ExeArcDeltaN( nId, pdDeltaN) ? TRUE : FALSE) ; +} + +//---------------------------------------------------------------------------- +BOOL +__stdcall EgtArcNormVersor( int nId, int nRefId, double vtNorm[3]) { // recupero il vettore normale Vector3d vtTmp ; - if ( ! ExeCurveArcNormVersor( nId, nRefId, vtTmp)) + if ( ! ExeArcNormVersor( nId, nRefId, vtTmp)) return FALSE ; // lo assegno VEC_FROM_3D( vtNorm, vtTmp) @@ -376,11 +390,11 @@ __stdcall EgtSurfTmFacetNormVersor( int nId, int nFacet, int nRefId, double vtNo //---------------------------------------------------------------------------- BOOL -__stdcall EgtExtTextNormVersor( int nId, int nRefId, double vtNorm[3]) +__stdcall EgtTextNormVersor( int nId, int nRefId, double vtNorm[3]) { // recupero il vettore normale Vector3d vtTmp ; - if ( ! ExeExtTextNormVersor( nId, nRefId, vtTmp)) + if ( ! ExeTextNormVersor( nId, nRefId, vtTmp)) return FALSE ; // lo assegno VEC_FROM_3D( vtNorm, vtTmp)