EgtInterface 1.5j5 :

- aggiunte funzioni di trasformazione elementi geometrici base (Point, Vector, Frame).
This commit is contained in:
Dario Sassi
2014-10-20 14:02:10 +00:00
parent 46c5fce044
commit 4b52489cf8
11 changed files with 478 additions and 37 deletions
+15 -15
View File
@@ -43,7 +43,7 @@ __stdcall EgtCreateGroup( int nParentId, const double ptOrig[3],
VERIFY_GEOMDB( pGeomDB, GDB_ID_NULL)
// costruisco il riferimento
Frame3d frFrame ;
if ( ! frFrame.Set( Point3d( ptOrig), Vector3d( vX), Vector3d( vY), Vector3d( vZ)))
if ( ! frFrame.Set( ptOrig, vX, vY, vZ))
return GDB_ID_NULL ;
// creo il gruppo
return pGeomDB->AddGroup( GDB_ID_NULL, nParentId, frFrame) ;
@@ -60,7 +60,7 @@ __stdcall EgtCreateGeoPoint( int nParentId, const double ptP[3])
if ( IsNull( pGeoPnt))
return GDB_ID_NULL ;
// setto il punto
if ( ! pGeoPnt->Set( Point3d( ptP)))
if ( ! pGeoPnt->Set( ptP))
return GDB_ID_NULL ;
// inserisco il punto nel DB
return pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pGeoPnt)) ;
@@ -77,7 +77,7 @@ __stdcall EgtCreateGeoVector( int nParentId, const double vtV[3], const double p
if ( IsNull( pGeoVct))
return GDB_ID_NULL ;
// setto il vettore (con il punto base)
if ( ! pGeoVct->Set( Vector3d( vtV), Point3d( ptB)))
if ( ! pGeoVct->Set( vtV, ptB))
return GDB_ID_NULL ;
// inserisco il vettore nel DB
return pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pGeoVct)) ;
@@ -95,7 +95,7 @@ __stdcall EgtCreateGeoFrame( int nParentId, const double ptOrig[3],
if ( IsNull( pGeoFrm))
return GDB_ID_NULL ;
// setto il riferimento
if ( ! pGeoFrm->Set( Point3d( ptOrig), Vector3d( vX), Vector3d( vY), Vector3d( vZ)))
if ( ! pGeoFrm->Set( ptOrig, vX, vY, vZ))
return GDB_ID_NULL ;
// inserisco il vettore nel DB
return pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pGeoFrm)) ;
@@ -112,7 +112,7 @@ __stdcall EgtCreateCurveLine( int nParentId, const double ptIni[3], const double
if ( IsNull( pCrvLine))
return GDB_ID_NULL ;
// setto la linea
if ( ! pCrvLine->Set( Point3d( ptIni), Point3d( ptFin)))
if ( ! pCrvLine->Set( ptIni, ptFin))
return GDB_ID_NULL ;
// inserisco la linea nel DB
return pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pCrvLine)) ;
@@ -153,7 +153,7 @@ __stdcall EgtCreateCurveLineMinPointCurve( int nParentId,
if ( IsNull( pCrvLine))
return GDB_ID_NULL ;
// setto la linea
if ( ! pCrvLine->Set( Point3d( ptStart), ptEnd))
if ( ! pCrvLine->Set( ptStart, ptEnd))
return GDB_ID_NULL ;
// inserisco la linea nel DB
return pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pCrvLine)) ;
@@ -171,7 +171,7 @@ __stdcall EgtCreateCurveCircle( int nParentId,
if ( IsNull( pCrvArc))
return GDB_ID_NULL ;
// setto la circonferenza
if ( ! pCrvArc->Set( Point3d( ptCen), Vector3d( vtN), dRad))
if ( ! pCrvArc->Set( ptCen, vtN, dRad))
return GDB_ID_NULL ;
// inserisco l'arco nel DB
return pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pCrvArc)) ;
@@ -189,7 +189,7 @@ __stdcall EgtCreateCurveCircleXY( int nParentId,
if ( IsNull( pCrvArc))
return GDB_ID_NULL ;
// setto la circonferenza
if ( ! pCrvArc->SetXY( Point3d( ptCen), dRad))
if ( ! pCrvArc->SetXY( ptCen, dRad))
return GDB_ID_NULL ;
// inserisco l'arco nel DB
return pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pCrvArc)) ;
@@ -207,7 +207,7 @@ __stdcall EgtCreateCurveCircle3P( int nParentId,
if ( IsNull( pCrvArc))
return GDB_ID_NULL ;
// setto l'arco
if ( ! pCrvArc->Set3P( Point3d( ptP1), Point3d( ptP2), Point3d( ptP3), true))
if ( ! pCrvArc->Set3P( ptP1, ptP2, ptP3, true))
return GDB_ID_NULL ;
// inserisco l'arco nel DB
return pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pCrvArc)) ;
@@ -226,7 +226,7 @@ __stdcall EgtCreateCurveArc( int nParentId,
if ( IsNull( pCrvArc))
return GDB_ID_NULL ;
// setto l'arco
if ( ! pCrvArc->Set( Point3d( ptCen), Vector3d( vtN), dRad, Vector3d( vtS), dAngCenDeg, dDeltaN))
if ( ! pCrvArc->Set( ptCen, vtN, dRad, vtS, dAngCenDeg, dDeltaN))
return GDB_ID_NULL ;
// inserisco l'arco nel DB
return pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pCrvArc)) ;
@@ -245,7 +245,7 @@ __stdcall EgtCreateCurveArcXY( int nParentId,
if ( IsNull( pCrvArc))
return GDB_ID_NULL ;
// setto l'arco
if ( ! pCrvArc->SetXY( Point3d( ptCen), dRad, dAngStartDeg, dAngCenDeg, dDeltaZ))
if ( ! pCrvArc->SetXY( ptCen, dRad, dAngStartDeg, dAngCenDeg, dDeltaZ))
return GDB_ID_NULL ;
// inserisco l'arco nel DB
return pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pCrvArc)) ;
@@ -263,7 +263,7 @@ __stdcall EgtCreateCurveArc3P( int nParentId,
if ( IsNull( pCrvArc))
return GDB_ID_NULL ;
// setto l'arco
if ( ! pCrvArc->Set3P( Point3d( ptP1), Point3d( ptP2), Point3d( ptP3), false))
if ( ! pCrvArc->Set3P( ptP1, ptP2, ptP3, false))
return GDB_ID_NULL ;
// inserisco l'arco nel DB
return pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pCrvArc)) ;
@@ -533,7 +533,7 @@ __stdcall EgtCreateCurveCompoFromPolygonSide( int nParentId, int nNumSides,
if ( IsNull( pCrvCompo))
return GDB_ID_NULL ;
// setto la curva
if ( ! pCrvCompo->PolygonSide( nNumSides, Point3d( ptIni), Point3d( ptFin)))
if ( ! pCrvCompo->PolygonSide( nNumSides, ptIni, ptFin))
return GDB_ID_NULL ;
// inserisco la curva nel DB
return pGeomDB->AddGeoObj( GDB_ID_NULL, nParentId, Release( pCrvCompo)) ;
@@ -569,7 +569,7 @@ int
__stdcall EgtCreateText( int nParentId, const wchar_t* wsText,
const double ptP[3], double dAngRotDeg, double dH)
{
return EgtCreateText( nParentId, wstrztoA( wsText), Point3d( ptP), dAngRotDeg, dH) ;
return EgtCreateText( nParentId, wstrztoA( wsText), ptP, dAngRotDeg, dH) ;
}
//-------------------------------------------------------------------------------
@@ -596,7 +596,7 @@ __stdcall EgtCreateTextEx( int nParentId, const wchar_t* wsText,
const double ptP[3], double dAngRotDeg, const wchar_t* wsFont,
int nW, BOOL bItalic, double dH, double dRat, double dAddAdv, int nInsPos)
{
return EgtCreateTextEx( nParentId, wstrztoA( wsText), Point3d( ptP), dAngRotDeg,
return EgtCreateTextEx( nParentId, wstrztoA( wsText), ptP, dAngRotDeg,
wstrztoA( wsFont), nW, ( bItalic != FALSE), dH, dRat, dAddAdv, nInsPos) ;
}