diff --git a/API_GdbCreate.cpp b/API_GdbCreate.cpp index 892695e..dfe7c28 100644 --- a/API_GdbCreate.cpp +++ b/API_GdbCreate.cpp @@ -58,28 +58,28 @@ __stdcall EgtCreateGeoFrame( int nParentId, const double ptOrig[3], //------------------------------------------------------------------------------- int -__stdcall EgtCreateText( int nParentId, const double ptP[3], double dAngRotDeg, +__stdcall EgtCreateText( int nParentId, const double ptP[3], const wchar_t* wsText, double dH, int nRefType) { - return ExeCreateText( nParentId, ptP, dAngRotDeg, wstrztoA( wsText), dH, nRefType) ; + return ExeCreateText( nParentId, ptP, wstrztoA( wsText), dH, nRefType) ; } //------------------------------------------------------------------------------- int -__stdcall EgtCreateTextEx( int nParentId, const double ptP[3], const double vtN[3], const double vtD[3], +__stdcall EgtCreateTextEx( int nParentId, const double ptP[3], double dAngRotDeg, const wchar_t* wsText, const wchar_t* wsFont, BOOL bItalic, double dH, int nRefType) { - return ExeCreateTextEx( nParentId, ptP, vtN, vtD, + return ExeCreateTextEx( nParentId, ptP, dAngRotDeg, wstrztoA( wsText), wstrztoA( wsFont), (bItalic != FALSE), dH, nRefType) ; } //------------------------------------------------------------------------------- int -__stdcall EgtCreateTextAdv( int nParentId, const double ptP[3], const double vtN[3], const double vtD[3], +__stdcall EgtCreateTextAdv( int nParentId, const double ptP[3], double dAngRotDeg, const wchar_t* wsText, const wchar_t* wsFont, int nW, BOOL bItalic, double dH, double dRat, double dAddAdv, int nInsPos, int nRefType) { - return ExeCreateTextAdv( nParentId, ptP, vtN, vtD, + return ExeCreateTextAdv( nParentId, ptP, dAngRotDeg, wstrztoA( wsText), wstrztoA( wsFont), nW, ( bItalic != FALSE), dH, dRat, dAddAdv, nInsPos, nRefType) ; } diff --git a/API_GdbCreateCurve.cpp b/API_GdbCreateCurve.cpp index 5ee175b..c62f886 100644 --- a/API_GdbCreateCurve.cpp +++ b/API_GdbCreateCurve.cpp @@ -34,6 +34,14 @@ __stdcall EgtCreateCurveLineEx( int nParentId, const double ptIni[3], int nSepI, return ExeCreateCurveLineEx( nParentId, ptIni, nSepI, nIdI, ptFin, nSepF, nIdF, nRefType) ; } +//------------------------------------------------------------------------------- +int +__stdcall EgtCreateCurveLinePDL( int nParentId, const double ptIni[3], + double dDirDeg, double dLen, int nRefType) +{ + return ExeCreateCurveLinePDL( nParentId, ptIni, dDirDeg, dLen, nRefType) ; +} + //------------------------------------------------------------------------------- int __stdcall EgtCreateCurveLinePVL( int nParentId, const double ptIni[3], @@ -53,26 +61,26 @@ __stdcall EgtCreateCurveLineMinPointCurve( int nParentId, //------------------------------------------------------------------------------- int __stdcall EgtCreateCurveCircle( int nParentId, const double ptCen[3], - const double vtN[3], double dRad, int nRefType) + double dRad, int nRefType) { - return ExeCreateCurveCircle( nParentId, ptCen, vtN, dRad, nRefType) ; + return ExeCreateCurveCircle( nParentId, ptCen, dRad, nRefType) ; } //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveCircleCPN( int nParentId, const double ptCen[3], - const double ptOn[3], const double vtN[3], int nRefType) +__stdcall EgtCreateCurveCircleCP( int nParentId, const double ptCen[3], + const double ptOn[3], int nRefType) { - return ExeCreateCurveCircleCPN( nParentId, ptCen, ptOn, vtN, nRefType) ; + return ExeCreateCurveCircleCP( nParentId, ptCen, ptOn, nRefType) ; } //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveCircleCPNEx( int nParentId, const double ptCen[3], - const double ptOn[3], int nSepO, int nIdO, const double vtN[3], int nRefType) +__stdcall EgtCreateCurveCircleCPEx( int nParentId, const double ptCen[3], + const double ptOn[3], int nSepO, int nIdO, int nRefType) { - return ExeCreateCurveCircleCPNEx( nParentId, ptCen, ptOn, nSepO, nIdO, vtN, nRefType) ; + return ExeCreateCurveCircleCPEx( nParentId, ptCen, ptOn, nSepO, nIdO, nRefType) ; } //------------------------------------------------------------------------------- @@ -85,26 +93,27 @@ __stdcall EgtCreateCurveCircle3P( int nParentId, const double ptP1[3], //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveArc( int nParentId, - const double ptCen[3], const double vtN[3], double dRad, - const double vtS[3], double dAngCenDeg, double dDeltaN, int nRefType) +__stdcall EgtCreateCurveArc( int nParentId, const double ptCen[3], double dRad, + double dAngIniDeg, double dAngCenDeg, double dDeltaN, int nRefType) { - return ExeCreateCurveArc( nParentId, ptCen, vtN, dRad, vtS, dAngCenDeg, dDeltaN, nRefType) ; + return ExeCreateCurveArc( nParentId, ptCen, dRad, dAngIniDeg, dAngCenDeg, dDeltaN, nRefType) ; } //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveArcC2PN( int nParentId, const double ptCen[3], const double ptStart[3], - const double ptNearEnd[3], const double vtNorm[3], int nRefType) +__stdcall EgtCreateCurveArcC2P( int nParentId, const double ptCen[3], const double ptStart[3], + const double ptNearEnd[3], int nRefType) { - return ExeCreateCurveArcC2PN( nParentId, ptCen, ptStart, ptNearEnd, vtNorm, nRefType) ; + return ExeCreateCurveArcC2P( nParentId, ptCen, ptStart, ptNearEnd, nRefType) ; } + +//------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveArcC2PNEx( int nParentId, const double ptCen[3], - const double ptStart[3], int nSepS, int nIdS, - const double ptNearEnd[3], const double vtNorm[3], int nRefType) +__stdcall EgtCreateCurveArcC2PEx( int nParentId, const double ptCen[3], + const double ptStart[3], int nSepS, int nIdS, + const double ptNearEnd[3], int nRefType) { - return ExeCreateCurveArcC2PNEx( nParentId, ptCen, ptStart, nSepS, nIdS, ptNearEnd, vtNorm, nRefType) ; + return ExeCreateCurveArcC2PEx( nParentId, ptCen, ptStart, nSepS, nIdS, ptNearEnd, nRefType) ; } //------------------------------------------------------------------------------- @@ -117,37 +126,45 @@ __stdcall EgtCreateCurveArc3P( int nParentId, const double ptP1[3], //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveArc2PVN( int nParentId, const double ptStart[3], const double ptEnd[3], - const double vtDirS[3], const double vtNorm[3], int nRefType) +__stdcall EgtCreateCurveArc2PD( int nParentId, const double ptStart[3], const double ptEnd[3], + double dDirSDeg, int nRefType) { - return ExeCreateCurveArc2PVN( nParentId, ptStart, ptEnd, vtDirS, vtNorm, nRefType) ; + return ExeCreateCurveArc2PD( nParentId, ptStart, ptEnd, dDirSDeg, nRefType) ; } //------------------------------------------------------------------------------- int -__stdcall EgtCreateCurveArc2PVNEx( int nParentId, const double ptStart[3], - const double ptEnd[3], int nSep, int nId, - const double vtDirS[3], const double vtNorm[3], int nRefType) +__stdcall EgtCreateCurveArc2PDEx( int nParentId, const double ptStart[3], + const double ptEnd[3], int nSep, int nId, + double dDirSDeg, int nRefType) { - return ExeCreateCurveArc2PVNEx( nParentId, ptStart, ptEnd, nSep, nId, vtDirS, vtNorm, nRefType) ; + return ExeCreateCurveArc2PDEx( 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) +{ + return ExeCreateCurveArc2PV( nParentId, ptStart, ptEnd, vtDirS, nRefType) ; } //------------------------------------------------------------------------------- int __stdcall EgtCreateCurveFillet( int nParentId, int nCrv1, const double ptNear1[3], int nCrv2, const double ptNear2[3], - const double vtNorm[3], double dRad, BOOL bTrim, int nRefType) + double dRad, BOOL bTrim, int nRefType) { - return ExeCreateCurveFillet( nParentId, nCrv1, ptNear1, nCrv2, ptNear2, vtNorm, dRad, ( bTrim != FALSE), nRefType) ; + return ExeCreateCurveFillet( nParentId, nCrv1, ptNear1, nCrv2, ptNear2, dRad, ( bTrim != FALSE), nRefType) ; } //------------------------------------------------------------------------------- int __stdcall EgtCreateCurveChamfer( int nParentId, int nCrv1, const double ptNear1[3], int nCrv2, const double ptNear2[3], - const double vtNorm[3], double dDist, BOOL bTrim, int nRefType) + double dDist, BOOL bTrim, int nRefType) { - return ExeCreateCurveChamfer( nParentId, nCrv1, ptNear1, nCrv2, ptNear2, vtNorm, dDist, ( bTrim != FALSE), nRefType) ; + return ExeCreateCurveChamfer( nParentId, nCrv1, ptNear1, nCrv2, ptNear2, dDist, ( bTrim != FALSE), nRefType) ; } //------------------------------------------------------------------------------- @@ -228,6 +245,14 @@ __stdcall EgtCreateCurveCompoFromPointBulges( int nParentId, int nPB, const doub return ExeCreateCurveCompoFromPointBulges( nParentId, PA, nRefType) ; } +//------------------------------------------------------------------------------- +int +__stdcall EgtCreateRectangle2P( int nParentId, const double ptIni[3], + const double ptCross[3], int nRefType) +{ + return ExeCreateRectangle2P( nParentId, ptIni, ptCross, nRefType) ; +} + //------------------------------------------------------------------------------- int __stdcall EgtCreateRectangle3P( int nParentId, const double ptIni[3], @@ -239,23 +264,23 @@ __stdcall EgtCreateRectangle3P( int nParentId, const double ptIni[3], //------------------------------------------------------------------------------- int __stdcall EgtCreatePolygonFromRadius( int nParentId, int nNumSides, const double ptCen[3], - const double ptCorn[3], const double vtN[3], int nRefType) + const double ptCorn[3], int nRefType) { - return ExeCreatePolygonFromRadius( nParentId, nNumSides, ptCen, ptCorn, vtN, nRefType) ; + return ExeCreatePolygonFromRadius( nParentId, nNumSides, ptCen, ptCorn, nRefType) ; } //------------------------------------------------------------------------------- int __stdcall EgtCreatePolygonFromApothem( int nParentId, int nNumSides, const double ptCen[3], - const double ptMid[3], const double vtN[3], int nRefType) + const double ptMid[3], int nRefType) { - return ExeCreatePolygonFromApothem( nParentId, nNumSides, ptCen, ptMid, vtN, nRefType) ; + return ExeCreatePolygonFromApothem( nParentId, nNumSides, ptCen, ptMid, nRefType) ; } //------------------------------------------------------------------------------- int __stdcall EgtCreatePolygonFromSide( int nParentId, int nNumSides, const double ptIni[3], - const double ptFin[3], const double vtN[3], int nRefType) + const double ptFin[3], int nRefType) { - return ExeCreatePolygonFromSide( nParentId, nNumSides, ptIni, ptFin, vtN, nRefType) ; + return ExeCreatePolygonFromSide( nParentId, nNumSides, ptIni, ptFin, nRefType) ; } diff --git a/EgtInterface.rc b/EgtInterface.rc index d4c8b2a..dd91c67 100644 Binary files a/EgtInterface.rc and b/EgtInterface.rc differ