From fab142571003927ded6237d0b59e75779bfbd8ba Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 7 Oct 2014 07:03:26 +0000 Subject: [PATCH] Include : - aggiornamenti vari. --- EGkGeoCollection.h | 8 +-- EGkGeoVector3d.h | 1 + EGkPoint3d.h | 2 + EGkPolyLine.h | 4 +- EGkVector3d.h | 2 + EInAPI.h | 124 ++++++++++++++++++++++++++++++++++++++++++++- 6 files changed, 133 insertions(+), 8 deletions(-) diff --git a/EGkGeoCollection.h b/EGkGeoCollection.h index 3f1fce0..b93431d 100644 --- a/EGkGeoCollection.h +++ b/EGkGeoCollection.h @@ -23,10 +23,10 @@ typedef std::vector PNTVECTOR ; // vettore di punti typedef std::list PNTLIST ; // lista di punti //---------------------------------------------------------------------------- -// Raccolte di coppie dU,Point3d -typedef std::pair UPOINT ; // coppia parametro, punto -typedef std::vector UPNTVECTOR ; // vettore di coppie parametro, punto -typedef std::list UPNTLIST ; // lista di coppie parametro, punto +// Raccolte di coppie Point3d,dU +typedef std::pair POINTU ; // coppia punto, parametro (o altro) +typedef std::vector PNTUVECTOR ; // vettore di coppie punto, parametro +typedef std::list PNTULIST ; // lista di coppie punto, parametro //---------------------------------------------------------------------------- // Raccolte di coppie Point3d,Point3d diff --git a/EGkGeoVector3d.h b/EGkGeoVector3d.h index b7ab079..2805422 100644 --- a/EGkGeoVector3d.h +++ b/EGkGeoVector3d.h @@ -26,6 +26,7 @@ class __declspec( novtable) IGeoVector3d : public IGeoObj virtual bool Set( const Vector3d& vtV, const Point3d& ptBase) = 0 ; virtual const Vector3d& GetVector( void) const = 0 ; virtual const Point3d& GetBase( void) const = 0 ; + virtual bool ChangeVector( const Vector3d& vtV) = 0 ; virtual bool ChangeBase( const Point3d& ptBase) = 0 ; virtual bool GetDrawWithArrowHead( double dFrazLenAH, double dMaxDimA, PolyLine& PL) const = 0 ; } ; diff --git a/EGkPoint3d.h b/EGkPoint3d.h index ad8cba7..6be29bc 100644 --- a/EGkPoint3d.h +++ b/EGkPoint3d.h @@ -32,6 +32,8 @@ class EGK_EXPORT Point3d public : //! Costruttore del punto con tre componenti X, Y e Z Point3d( double dX, double dY, double dZ) : x( dX), y( dY), z( dZ) {} + //! Costruttore del punto da un array di tre componenti + Point3d( const double V[3]) : x( V[0]), y( V[1]), z( V[2]) {} //! Costruttore del punto con due componenti X e Y, Z = 0 Point3d( double dX, double dY) : x( dX), y( dY), z( 0) {} //! Costruttore del punto origine X = Y = Z = 0 diff --git a/EGkPolyLine.h b/EGkPolyLine.h index 1718015..f73f169 100644 --- a/EGkPolyLine.h +++ b/EGkPolyLine.h @@ -106,8 +106,8 @@ class PolyLine private : int m_nRejected ; int m_nCount ; - UPNTLIST m_lUPoints ; - mutable UPNTLIST::const_iterator m_iter ; + PNTULIST m_lUPoints ; + mutable PNTULIST::const_iterator m_iter ; } ; //---------------------------------------------------------------------------- diff --git a/EGkVector3d.h b/EGkVector3d.h index 8752c97..6a30617 100644 --- a/EGkVector3d.h +++ b/EGkVector3d.h @@ -33,6 +33,8 @@ class EGK_EXPORT Vector3d public : //! Costruttore del vettore con tre componenti X, Y e Z Vector3d( double dX, double dY, double dZ) : x( dX), y( dY), z( dZ) {} + //! Costruttore del vettore da un array di tre componenti + Vector3d( const double V[3]) : x( V[0]), y( V[1]), z( V[2]) {} //! Costruttore del vettore con due componenti X e Y, Z = 0 Vector3d( double dX, double dY) : x( dX), y( dY), z( 0) {} //! Costruttore del vettore nullo X = Y = Z = 0 diff --git a/EInAPI.h b/EInAPI.h index 0633048..45da963 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -44,6 +44,57 @@ EIN_EXPORT BOOL __stdcall EgtNewFile( int nGseCtx) ; EIN_EXPORT BOOL __stdcall EgtOpenFile( int nGseCtx, const wchar_t* wsFilePath) ; EIN_EXPORT BOOL __stdcall EgtSaveFile( int nGseCtx, const wchar_t* wsFilePath, int nFlag) ; +// GeomDB Create +EIN_EXPORT int __stdcall EgtCreateGroup( int nGseCtx, int nParentId, const double vOrig[3], + const double vX[3], const double vY[3], const double vZ[3]) ; +EIN_EXPORT int __stdcall EgtCreateGeoPoint( int nGseCtx, int nParentId, const double ptP[3]) ; +EIN_EXPORT int __stdcall EgtCreateGeoVector( int nGseCtx, int nParentId, const double vtV[3], const double ptB[3]) ; +EIN_EXPORT int __stdcall EgtCreateGeoFrame( int nGseCtx, int nParentId, const double ptOrig[3], + const double vX[3], const double vY[3], const double vZ[3]) ; +EIN_EXPORT int __stdcall EgtCreateCurveLine( int nGseCtx, int nParentId, + const double ptIni[3], const double ptFin[3]) ; +EIN_EXPORT int __stdcall EgtCreateCurveLineMinPointCurve( int nGseCtx, int nParentId, + const double ptStart[3], int nCrvId, double dNearPar) ; +EIN_EXPORT int __stdcall EgtCreateCurveCircle( int nGseCtx, int nParentId, + const double ptCen[3], const double vtN[3], double dRad) ; +EIN_EXPORT int __stdcall EgtCreateCurveCircle3P( int nGseCtx, int nParentId, + const double ptP1[3], const double ptP2[3], const double ptP3[3]) ; +EIN_EXPORT int __stdcall EgtCreateCurveCircleXY( int nGseCtx, int nParentId, + const double ptCen[3], double dRad) ; +EIN_EXPORT int __stdcall EgtCreateCurveArc( int nGseCtx, int nParentId, + const double ptCen[3], const double vtN[3], double dRad, + const double vtS[3], double dAngCenDeg, double dDeltaN) ; +EIN_EXPORT int __stdcall EgtCreateCurveArcXY( int nGseCtx, int nParentId, + const double ptCen[3], double dRad, + double dAngStartDeg, double dAngCenDeg, double dDeltaZ) ; +EIN_EXPORT int __stdcall EgtCreateCurveArc3P( int nGseCtx, int nParentId, + const double ptP1[3], const double ptP2[3], const double ptP3[3]) ; +EIN_EXPORT int __stdcall EgtCreateCurveBezier( int nGseCtx, int nParentId, int nDegree, + const double ptCtrls[/*3x(nDegree+1)*/]) ; +EIN_EXPORT int __stdcall EgtCreateCurveBezierRational( int nGseCtx, int nParentId, int nDegree, + const double ptCtrlWs[/*4x(nDegree+1)*/]) ; +EIN_EXPORT int __stdcall EgtCreateCurveBezierFromArc( int nGseCtx, int nParentId, int nArcId, BOOL bErase) ; +EIN_EXPORT int __stdcall EgtCreateCurveCompo( int nGseCtx, int nParentId, int nNumId, const int nIds[], BOOL bErase) ; +EIN_EXPORT int __stdcall EgtCreateCurveCompoFromPoints( int nGseCtx, int nParentId, int nP, const double ptPs[/*3 x nP*/]) ; +EIN_EXPORT int __stdcall EgtCreateCurveCompoFromPointBulges( int nGseCtx, int nParentId, int nPB, const double ptPBs[/*4 x nPB*/]) ; +EIN_EXPORT int __stdcall EgtCreateCurveCompoFromPolygonSide( int nGseCtx, int nParentId, int nNumSides, + const double ptIni[3], const double ptFin[3]) ; +EIN_EXPORT int __stdcall EgtCreateSurfTriMeshByContour( int nGseCtx, int nParentId, int nCrvId, double dLinTol) ; +EIN_EXPORT int __stdcall EgtCreateText( int nGseCtx, int nParentId, const wchar_t* wsText, + const double ptP[3], double dAngRotDeg, double dH) ; +EIN_EXPORT int __stdcall EgtCreateTextEx( int nGseCtx, 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) ; + +// GeomDB Modify +EIN_EXPORT BOOL __stdcall EgtChangeVectorBase( int nGseCtx, int nId, const double ptB[3]) ; +EIN_EXPORT BOOL __stdcall EgtModifyText( int nGseCtx, int nId, const wchar_t* wsNewText) ; +EIN_EXPORT BOOL __stdcall EgtChangeTextFont( int nGseCtx, int nId, const wchar_t* wsNewFont) ; +EIN_EXPORT BOOL __stdcall EgtFlipText( int nGseCtx, int nId) ; +EIN_EXPORT BOOL __stdcall EgtMirrorText( int nGseCtx, int nId, BOOL bOnL) ; +EIN_EXPORT BOOL __stdcall EgtTextToOutline( int nGseCtx, int nId, int nDestGroupId) ; +EIN_EXPORT BOOL __stdcall EgtSplitText( int nGseCtx, int nId, int nDestGroupId) ; + // GeomDB Objects EIN_EXPORT BOOL __stdcall EgtExistsObj( int nGseCtx, int nId) ; EIN_EXPORT int __stdcall EgtGetGroupObjs( int nGseCtx, int nId) ; @@ -51,6 +102,11 @@ EIN_EXPORT int __stdcall EgtGetFirstInGroup( int nGseCtx, int nGroupId) ; EIN_EXPORT int __stdcall EgtGetNext( int nGseCtx, int nId) ; EIN_EXPORT int __stdcall EgtGetLastInGroup( int nGseCtx, int nGroupId) ; EIN_EXPORT int __stdcall EgtGetPrev( int nGseCtx, int nId) ; +EIN_EXPORT int __stdcall EgtCopy( int nGseCtx, int nSouId, int nRefId, int nSonBeforeAfter) ; +EIN_EXPORT int __stdcall EgtCopyGlob( int nGseCtx, int nSouId, int nRefId, int nSonBeforeAfter) ; +EIN_EXPORT BOOL __stdcall EgtRelocate( int nGseCtx, int nSouId, int nRefId, int nSonBeforeAfter) ; +EIN_EXPORT BOOL __stdcall EgtRelocateGlob( int nGseCtx, int nSouId, int nRefId, int nSonBeforeAfter) ; +EIN_EXPORT BOOL __stdcall EgtErase( int nGseCtx, int nId) ; EIN_EXPORT int __stdcall EgtGetType( int nGseCtx, int nId) ; EIN_EXPORT BOOL __stdcall EgtGetTitle( int nGseCtx, int nId, wchar_t*& wsTitle) ; EIN_EXPORT BOOL __stdcall EgtGroupDump( int nGseCtx, int nId, wchar_t*& wsDump) ; @@ -73,6 +129,10 @@ EIN_EXPORT BOOL __stdcall EgtSetMark( int nGseCtx, int nId) ; EIN_EXPORT BOOL __stdcall EgtResetMark( int nGseCtx, int nId) ; EIN_EXPORT BOOL __stdcall EgtGetMark( int nGseCtx, int nId, BOOL* pnMark) ; EIN_EXPORT BOOL __stdcall EgtGetCalcMark( int nGseCtx, int nId, BOOL* pnMark) ; +EIN_EXPORT BOOL __stdcall EgtStdColor( const wchar_t* wsName, int& nRed, int& nGreen, int& nBlue, int& nAlpha) ; +EIN_EXPORT BOOL __stdcall EgtSetColor( int nGseCtx, int nId, int nRed, int nGreen, int nBlue, int nAlpha) ; +EIN_EXPORT BOOL __stdcall EgtGetColor( int nGseCtx, int nId, int& nRed, int& nGreen, int& nBlue, int& nAlpha) ; +EIN_EXPORT BOOL __stdcall EgtGetCalcColor( int nGseCtx, int nId, int& nRed, int& nGreen, int& nBlue, int& nAlpha) ; EIN_EXPORT BOOL __stdcall EgtSetName( int nGseCtx, int nId, const wchar_t* wsName) ; EIN_EXPORT BOOL __stdcall EgtGetName( int nGseCtx, int nId, wchar_t*& wsName) ; EIN_EXPORT BOOL __stdcall EgtExistsName( int nGseCtx, int nId) ; @@ -82,6 +142,57 @@ EIN_EXPORT BOOL __stdcall EgtGetInfo( int nGseCtx, int nId, const wchar_t* wsKey EIN_EXPORT BOOL __stdcall EgtExistsInfo( int nGseCtx, int nId, const wchar_t* wsKey) ; EIN_EXPORT BOOL __stdcall EgtRemoveInfo( int nGseCtx, int nId, const wchar_t* wsKey) ; +// GeomDb CurveModif +EIN_EXPORT BOOL __stdcall EgtInvertCurve( int nGseCtx, int nId) ; +EIN_EXPORT BOOL __stdcall EgtModifyCurveStartPoint( int nGseCtx, int nId, const double ptP[3]) ; +EIN_EXPORT BOOL __stdcall EgtModifyCurveEndPoint( int nGseCtx, int nId, const double ptP[3]) ; +EIN_EXPORT BOOL __stdcall EgtModifyCurveExtrusion( int nGseCtx, int nId, const double vtExtr[3]) ; +EIN_EXPORT BOOL __stdcall EgtModifyCurveThickness( int nGseCtx, int nId, double dThick) ; +EIN_EXPORT BOOL __stdcall EgtTrimCurveStartAtLen( int nGseCtx, int nId, double dLen) ; +EIN_EXPORT BOOL __stdcall EgtTrimCurveEndAtLen( int nGseCtx, int nId, double dLen) ; +EIN_EXPORT BOOL __stdcall EgtTrimCurveStartAtParam( int nGseCtx, int nId, double dPar) ; +EIN_EXPORT BOOL __stdcall EgtTrimCurveEndAtParam( int nGseCtx, int nId, double dPar) ; +EIN_EXPORT BOOL __stdcall EgtTrimCurveStartEndAtParam( int nGseCtx, int nId, double dParS, double dParE) ; + +// Geo Snap Points +EIN_EXPORT BOOL __stdcall EgtStartPoint( int nGseCtx, int nId, double ptP[3]) ; +EIN_EXPORT BOOL __stdcall EgtEndPoint( int nGseCtx, int nId, double ptP[3]) ; +EIN_EXPORT BOOL __stdcall EgtMidPoint( int nGseCtx, int nId, double ptP[3]) ; +EIN_EXPORT BOOL __stdcall EgtCenterPoint( int nGseCtx, int nId, double ptP[3]) ; +EIN_EXPORT BOOL __stdcall EgtAtParamPoint( int nGseCtx, int nId, double dU, double ptP[3]) ; +EIN_EXPORT BOOL __stdcall EgtStartVector( int nGseCtx, int nId, double vtV[3]) ; +EIN_EXPORT BOOL __stdcall EgtEndVector( int nGseCtx, int nId, double vtV[3]) ; +EIN_EXPORT BOOL __stdcall EgtMidVector( int nGseCtx, int nId, double vtV[3]) ; +EIN_EXPORT BOOL __stdcall EgtAtParamVector( int nGseCtx, int nId, double dU, int nSide, double vtV[3]) ; +EIN_EXPORT BOOL __stdcall EgtFrame( int nGseCtx, int nId, double ptOrig[3], + double vtX[3], double vtY[3], double vtZ[3]) ; + +// Geo Transform +EIN_EXPORT BOOL __stdcall EgtMove( int nGseCtx, int nId, double vVtMove[3]) ; +EIN_EXPORT BOOL __stdcall EgtMoveGlob( int nGseCtx, int nId, double vVtMove[3]) ; +EIN_EXPORT BOOL __stdcall EgtMoveGroup( int nGseCtx, int nId, double vVtMove[3]) ; +EIN_EXPORT BOOL __stdcall EgtRotate( int nGseCtx, int nId, double vPtAx[3], double vVtAx[3], double dAngRotDeg) ; +EIN_EXPORT BOOL __stdcall EgtRotateGlob( int nGseCtx, int nId, double vPtAx[3], double vVtAx[3], double dAngRotDeg) ; +EIN_EXPORT BOOL __stdcall EgtRotateGroup( int nGseCtx, int nId, double vPtAx[3], double vVtAx[3], double dAngRotDeg) ; +EIN_EXPORT BOOL __stdcall EgtScale( int nGseCtx, int nId, const double vOrig[3], + const double vX[3], const double vY[3], const double vZ[3], + double dCoeffX, double dCoeffY, double dCoeffZ) ; +EIN_EXPORT BOOL __stdcall EgtScaleGlob( int nGseCtx, int nId, const double vOrig[3], + const double vX[3], const double vY[3], const double vZ[3], + double dCoeffX, double dCoeffY, double dCoeffZ) ; +EIN_EXPORT BOOL __stdcall EgtScaleGroup( int nGseCtx, int nId, const double vOrig[3], + const double vX[3], const double vY[3], const double vZ[3], + double dCoeffX, double dCoeffY, double dCoeffZ) ; +EIN_EXPORT BOOL __stdcall EgtMirror( int nGseCtx, int nId, const double vPnt[3], const double vN[3]) ; +EIN_EXPORT BOOL __stdcall EgtMirrorGlob( int nGseCtx, int nId, const double vPnt[3], const double vN[3]) ; +EIN_EXPORT BOOL __stdcall EgtMirrorGroup( int nGseCtx, int nId, const double vPnt[3], const double vN[3]) ; +EIN_EXPORT BOOL __stdcall EgtShear( int nGseCtx, int nId, const double vPnt[3], const double vN[3], + const double vDir[3], double dCoeff) ; +EIN_EXPORT BOOL __stdcall EgtShearGlob( int nGseCtx, int nId, const double vPnt[3], const double vN[3], + const double vDir[3], double dCoeff) ; +EIN_EXPORT BOOL __stdcall EgtShearGroup( int nGseCtx, int nId, const double vPnt[3], const double vN[3], + const double vDir[3], double dCoeff) ; + // Scene EIN_EXPORT BOOL __stdcall EgtInitScene( int nGseCtx, HWND hWnd, int nDriver, int b2Buff, int nColorBits, int nDepthBits) ; EIN_EXPORT BOOL __stdcall EgtSetBackground( int nGseCtx, int nTopRed, int nTopGreen, int nTopBlue, @@ -96,6 +207,8 @@ EIN_EXPORT BOOL __stdcall EgtSetWinRect( int nGseCtx, int nPrevX, int nPrevY, in EIN_EXPORT BOOL __stdcall EgtResetWinRect( int nGseCtx, BOOL bRedraw) ; EIN_EXPORT BOOL __stdcall EgtZoomWin( int nGseCtx, int nPrevX, int nPrevY, int nCurrX, int nCurrY, BOOL bRedraw) ; EIN_EXPORT BOOL __stdcall EgtSetView( int nGseCtx, int nView, BOOL bRedraw) ; +EIN_EXPORT BOOL __stdcall EgtSetGenericView( int nGseCtx, double dAngVertDeg, double dAngHorizDeg, BOOL bRedraw) ; +EIN_EXPORT BOOL __stdcall EgtSetViewCenter( int nGseCtx, double ptP[3], BOOL bRedraw) ; EIN_EXPORT BOOL __stdcall EgtPanCamera( int nGseCtx, int nPrevX, int nPrevY, int nCurrX, int nCurrY, BOOL bRedraw) ; EIN_EXPORT BOOL __stdcall EgtRotateCamera( int nGseCtx, int nPrevX, int nPrevY, int nCurrX, int nCurrY, BOOL bRedraw) ; EIN_EXPORT BOOL __stdcall EgtGetCameraDir( int nGseCtx, int* pnDir) ; @@ -111,8 +224,15 @@ EIN_EXPORT BOOL __stdcall EgtExportStl( int nGseCtx, int nId, const wchar_t* wsF // Tsc Executor EIN_EXPORT BOOL __stdcall EgtInitTscExec( int nGseCtx) ; -EIN_EXPORT BOOL __stdcall EgtTscFileExec( int nGseCtx, const wchar_t* wsFilePath) ; -EIN_EXPORT BOOL __stdcall EgtTscLineExec( int nGseCtx, const wchar_t* wsLine) ; +EIN_EXPORT BOOL __stdcall EgtTscExecFile( int nGseCtx, const wchar_t* wsFilePath) ; +EIN_EXPORT BOOL __stdcall EgtTscExecLine( int nGseCtx, const wchar_t* wsLine) ; + +// LUA Executor +EIN_EXPORT BOOL __stdcall EgtLuaSetContext( int nGseCtx) ; +EIN_EXPORT BOOL __stdcall EgtLuaExecLine( const wchar_t* wsLine) ; +EIN_EXPORT BOOL __stdcall EgtLuaExecFile( const wchar_t* wsFilePath) ; +EIN_EXPORT BOOL __stdcall EgtLuaGetLastError( wchar_t*& wsError) ; + #ifdef __cplusplus }