From bc41830c67a3f672be6a7989fa28cafefee882b7 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 19 Jan 2015 18:22:40 +0000 Subject: [PATCH] Include : - aggiornamenti vari. --- EGkGeomDB.h | 1 + EGrScene.h | 3 ++ EInAPI.h | 77 +++++++++++++++++++++++---------------------- EInConst.h | 10 ++++-- EgkCurveComposite.h | 6 ++-- 5 files changed, 54 insertions(+), 43 deletions(-) diff --git a/EGkGeomDB.h b/EGkGeomDB.h index 30d53cd..18ddaef 100644 --- a/EGkGeomDB.h +++ b/EGkGeomDB.h @@ -70,6 +70,7 @@ class __declspec( novtable) IGeomDB virtual int CopyGlob( int nIdSou, int nIdDest, int nRefId, int nSonBeforeAfter = GDB_SON) = 0 ; virtual bool Relocate( int nId, int nRefId, int nSonBeforeAfter = GDB_SON) = 0 ; virtual bool RelocateGlob( int nId, int nRefId, int nSonBeforeAfter = GDB_SON) = 0 ; + virtual bool ChangeId( int nId, int nNewId) = 0 ; virtual bool Erase( int nId) = 0 ; virtual bool Translate( int nId, const Vector3d& vtMove) = 0 ; virtual bool TranslateGlob( int nId, const Vector3d& vtMove) = 0 ; diff --git a/EGrScene.h b/EGrScene.h index e46fe07..0d09b34 100644 --- a/EGrScene.h +++ b/EGrScene.h @@ -96,6 +96,9 @@ class IEGrScene virtual bool SetGeoLineAttribs( Color GLcol) = 0 ; virtual bool SetGeoLine( const Point3d& ptP1, const Point3d& ptP2) = 0 ; virtual bool ResetGeoLine( void) = 0 ; + virtual bool SetGeoTriaAttribs( Color GTcol) = 0 ; + virtual bool SetGeoTria( const Point3d& ptP1, const Point3d& ptP2, const Point3d& ptP3) = 0 ; + virtual bool ResetGeoTria( void) = 0 ; virtual bool SetWinRectAttribs( bool bOutline, Color WRcol) = 0 ; virtual bool SetWinRect( const Point3d& ptWinRectP1, const Point3d& ptWinRectP2) = 0 ; virtual bool ResetWinRect( void) = 0 ; diff --git a/EInAPI.h b/EInAPI.h index f747406..d4634b5 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -114,47 +114,43 @@ EIN_EXPORT BOOL __stdcall EgtSaveFile( const wchar_t* wsFilePath, int nFlag) ; // GeomDB Create EIN_EXPORT int __stdcall EgtCreateGroup( int nParentId, const double vOrig[3], - const double vX[3], const double vY[3], const double vZ[3]) ; -EIN_EXPORT int __stdcall EgtCreateGeoPoint( int nParentId, const double ptP[3]) ; -EIN_EXPORT int __stdcall EgtCreateGeoVector( int nParentId, const double vtV[3], const double ptB[3]) ; + const double vX[3], const double vY[3], const double vZ[3], int nRefType) ; +EIN_EXPORT int __stdcall EgtCreateGeoPoint( int nParentId, const double ptP[3], int nRefType) ; +EIN_EXPORT int __stdcall EgtCreateGeoVector( int nParentId, const double vtV[3], const double ptB[3], int nRefType) ; EIN_EXPORT int __stdcall EgtCreateGeoFrame( int nParentId, const double ptOrig[3], - const double vX[3], const double vY[3], const double vZ[3]) ; + const double vX[3], const double vY[3], const double vZ[3], int nRefType) ; EIN_EXPORT int __stdcall EgtCreateText( int nParentId, const double ptP[3], double dAngRotDeg, - const wchar_t* wsText, double dH) ; + const wchar_t* wsText, double dH, int nRefType) ; EIN_EXPORT int __stdcall EgtCreateTextEx( int nParentId, const double ptP[3], const double vtN[3], const double vtD[3], - const wchar_t* wsText, const wchar_t* wsFont, BOOL bItalic, double dH) ; + const wchar_t* wsText, const wchar_t* wsFont, BOOL bItalic, double dH, int nRefType) ; EIN_EXPORT int __stdcall EgtCreateTextAdv( int nParentId, const double ptP[3], const double vtN[3], const double vtD[3], const wchar_t* wsText, const wchar_t* wsFont, - int nW, BOOL bItalic, double dH, double dRat, double dAddAdv, int nInsPos) ; + int nW, BOOL bItalic, double dH, double dRat, double dAddAdv, int nInsPos, int nRefType) ; // GeomDB Create Curve EIN_EXPORT int __stdcall EgtCreateCurveLine( int nParentId, - const double ptIni[3], const double ptFin[3]) ; + const double ptIni[3], const double ptFin[3], int nRefType) ; EIN_EXPORT int __stdcall EgtCreateCurveLineEx( int nParentId, const double ptIni[3], int nSepI, int nIdI, - const double ptFin[3], int nSepF, int nIdF) ; -EIN_EXPORT int __stdcall EgtCreateCurveLinePVL( int nParentId, const double ptIni[3], const double vtDir[3], double dLen) ; -EIN_EXPORT int __stdcall EgtCreateCurveLineMinPointCurve( int nParentId, - const double ptStart[3], int nCrvId, double dNearPar) ; -EIN_EXPORT int __stdcall EgtCreateCurveCircle( int nParentId, - const double ptCen[3], const double vtN[3], double dRad) ; -EIN_EXPORT int __stdcall EgtCreateCurveCircleXY( int nParentId, - const double ptCen[3], double dRad) ; -EIN_EXPORT int __stdcall EgtCreateCurveCircleCPN( int nParentId, - const double ptCen[3], const double ptOn[3], const double vtN[3]) ; -EIN_EXPORT int __stdcall EgtCreateCurveCircle3P( int nParentId, - const double ptP1[3], const double ptP2[3], const double ptP3[3]) ; -EIN_EXPORT int __stdcall EgtCreateCurveArc( 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 nParentId, - const double ptCen[3], double dRad, - double dAngStartDeg, double dAngCenDeg, double dDeltaZ) ; -EIN_EXPORT int __stdcall EgtCreateCurveArcC2PN( int nParentId, const double ptCen[3], - const double ptStart[3], const double ptNearEnd[3], const double vtNorm[3]) ; -EIN_EXPORT int __stdcall EgtCreateCurveArc3P( int nParentId, - const double ptP1[3], const double ptP2[3], const double ptP3[3]) ; -EIN_EXPORT int __stdcall EgtCreateCurveArc2PVN( int nParentId, const double ptStart[3], - const double ptEnd[3], const double vtDirS[3], const double vtNorm[3]) ; + const double ptFin[3], int nSepF, int nIdF, int nRefType) ; +EIN_EXPORT int __stdcall EgtCreateCurveLinePVL( int nParentId, const double ptIni[3], + const double vtDir[3], double dLen, int nRefType) ; +EIN_EXPORT int __stdcall EgtCreateCurveLineMinPointCurve( int nParentId, const double ptStart[3], + int nCrvId, double dNearPar, int nRefType) ; +EIN_EXPORT int __stdcall EgtCreateCurveCircle( int nParentId, const double ptCen[3], + const double vtN[3], double dRad, int nRefType) ; +EIN_EXPORT int __stdcall EgtCreateCurveCircleCPN( int nParentId, const double ptCen[3], + const double ptOn[3], const double vtN[3], int nRefType) ; +EIN_EXPORT int __stdcall EgtCreateCurveCircle3P( int nParentId, const double ptP1[3], + const double ptP2[3], const double ptP3[3], int nRefType) ; +EIN_EXPORT 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) ; +EIN_EXPORT int __stdcall EgtCreateCurveArcC2PN( int nParentId, const double ptCen[3], const double ptStart[3], + const double ptNearEnd[3], const double vtNorm[3], int nRefType) ; +EIN_EXPORT int __stdcall EgtCreateCurveArc3P( int nParentId, const double ptP1[3], + const double ptP2[3], const double ptP3[3], int nRefType) ; +EIN_EXPORT int __stdcall EgtCreateCurveArc2PVN( int nParentId, const double ptStart[3], const double ptEnd[3], + const double vtDirS[3], const double vtNorm[3], int nRefType) ; EIN_EXPORT int __stdcall EgtCreateCurveBezier( int nParentId, int nDegree, const double ptCtrls[/*3x(nDegree+1)*/]) ; EIN_EXPORT int __stdcall EgtCreateCurveBezierRational( int nParentId, int nDegree, @@ -166,17 +162,18 @@ EIN_EXPORT int __stdcall EgtCreateCurveCompoByChain( int nParentId, EIN_EXPORT int __stdcall EgtCreateCurveCompoFromPoints( int nParentId, int nP, const double ptPs[/*3 x nP*/]) ; EIN_EXPORT int __stdcall EgtCreateCurveCompoFromPointBulges( int nParentId, int nPB, const double ptPBs[/*4 x nPB*/]) ; EIN_EXPORT int __stdcall EgtCreateCurveCompoByApprox( int nParentId, int nSouId, BOOL bArcsVsLines, double dLinTol) ; -EIN_EXPORT int __stdcall EgtCreateRectangle3P( int nParentId, - const double ptIni[3], const double ptCross[3], const double ptDir[3]) ; -EIN_EXPORT int __stdcall EgtCreatePolygonFromSide( int nParentId, int nNumSides, - const double ptIni[3], const double ptFin[3]) ; +EIN_EXPORT int __stdcall EgtCreateRectangle3P( int nParentId, const double ptIni[3], + const double ptCross[3], const double ptDir[3], int nRefType) ; +EIN_EXPORT int __stdcall EgtCreatePolygonFromSide( int nParentId, int nNumSides, const double ptIni[3], + const double ptFin[3], const double vtN[3], int nRefType) ; // GeomDB Create Surf EIN_EXPORT int __stdcall EgtCreateSurfTriMeshByContour( int nParentId, int nCrvId, double dLinTol) ; -EIN_EXPORT int __stdcall EgtCreateSurfTriMeshByExtrusion( int nParentId, int nCrvId, const double vtExtr[3], double dLinTol) ; +EIN_EXPORT int __stdcall EgtCreateSurfTriMeshByExtrusion( int nParentId, int nCrvId, const double vtExtr[3], + double dLinTol, int nRefType) ; EIN_EXPORT int __stdcall EgtCreateSurfTriMeshByScrewing( int nParentId, int nCrvId, const double ptAx[3], const double vtAx[3], - double dAngRotDeg, double dMove, double dLinTol) ; + double dAngRotDeg, double dMove, double dLinTol, int nRefType) ; EIN_EXPORT int __stdcall EgtCreateSurfTriMeshRuled( int nParentId, int nCrvId1, int nCrvId2, double dLinTol) ; // GeomDB Objects @@ -198,6 +195,7 @@ EIN_EXPORT int __stdcall EgtCopy( int nSouId, int nRefId, int nSonBeforeAfter) EIN_EXPORT int __stdcall EgtCopyGlob( int nSouId, int nRefId, int nSonBeforeAfter) ; EIN_EXPORT BOOL __stdcall EgtRelocate( int nSouId, int nRefId, int nSonBeforeAfter) ; EIN_EXPORT BOOL __stdcall EgtRelocateGlob( int nSouId, int nRefId, int nSonBeforeAfter) ; +EIN_EXPORT BOOL __stdcall EgtChangeId( int nId, int nNewId) ; EIN_EXPORT BOOL __stdcall EgtErase( int nId) ; EIN_EXPORT int __stdcall EgtGetType( int nId) ; EIN_EXPORT BOOL __stdcall EgtGetTitle( int nId, wchar_t*& wsTitle) ; @@ -350,6 +348,7 @@ EIN_EXPORT BOOL __stdcall EgtSetBackground( const int nTopCol[4], const int nBot EIN_EXPORT BOOL __stdcall EgtSetMarkAttribs( const int MarkCol[4]) ; EIN_EXPORT BOOL __stdcall EgtSetSelSurfAttribs( const int SelSurfCol[4]) ; EIN_EXPORT BOOL __stdcall EgtSetGeoLineAttribs( const int GlCol[4]) ; +EIN_EXPORT BOOL __stdcall EgtSetGeoTriaAttribs( const int GtCol[4]) ; EIN_EXPORT BOOL __stdcall EgtSetWinRectAttribs( BOOL bOutline, const int WrCol[4]) ; EIN_EXPORT BOOL __stdcall EgtSetGlobFrameShow( BOOL bShow) ; EIN_EXPORT BOOL __stdcall EgtSetGridShow( BOOL bShowGrid, BOOL bShowFrame) ; @@ -376,6 +375,8 @@ EIN_EXPORT BOOL __stdcall EgtZoom( int nZoom, BOOL bRedraw) ; EIN_EXPORT BOOL __stdcall EgtZoomOnPoint( int nWinX, int nWinY, double dCoeff, BOOL bRedraw) ; EIN_EXPORT BOOL __stdcall EgtSetGeoLine( const double ptP1[3], const double ptP2[3], BOOL bRedraw) ; EIN_EXPORT BOOL __stdcall EgtResetGeoLine( BOOL bRedraw) ; +EIN_EXPORT BOOL __stdcall EgtSetGeoTria( const double ptP1[3], const double ptP2[3], const double ptP3[3], BOOL bRedraw) ; +EIN_EXPORT BOOL __stdcall EgtResetGeoTria( BOOL bRedraw) ; EIN_EXPORT BOOL __stdcall EgtSetWinRect( int nPrevX, int nPrevY, int nCurrX, int nCurrY, BOOL bRedraw) ; EIN_EXPORT BOOL __stdcall EgtResetWinRect( BOOL bRedraw) ; EIN_EXPORT BOOL __stdcall EgtZoomWin( int nPrevX, int nPrevY, int nCurrX, int nCurrY, BOOL bRedraw) ; diff --git a/EInConst.h b/EInConst.h index 6838f5b..db9756e 100644 --- a/EInConst.h +++ b/EInConst.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2014-2014 +// EgalTech 2014-2015 //---------------------------------------------------------------------------- -// File : EInConst.h Data : 24.11.14 Versione : 1.5k5 +// File : EInConst.h Data : 16.01.15 Versione : 1.6a3 // Contenuto : Costanti generali per EgtInterface. // // @@ -19,3 +19,9 @@ enum EinSep { SEP_STD = 0, SEP_TG = 1, SEP_PERP = 2, SEP_MINDIST = 3} ; + +//----------------- Costanti tipo di riferimento di input ---------------------- +enum RefType{ RTY_GLOB = 0, + RTY_LOC = 1, + RTY_GRID = 2} ; +const int RTY_DEFAULT = RTY_LOC ; \ No newline at end of file diff --git a/EgkCurveComposite.h b/EgkCurveComposite.h index 5841516..736d872 100644 --- a/EgkCurveComposite.h +++ b/EgkCurveComposite.h @@ -26,9 +26,9 @@ class __declspec( novtable) ICurveComposite : public ICurve virtual bool FromSplit( const ICurve& cCrv, int nParts) = 0 ; virtual bool FromPolyLine( const PolyLine& PL) = 0 ; virtual bool FromPolyArc( const PolyArc& PA) = 0 ; - virtual bool PolygonCenterCorner( int nSides, const Point3d& ptCen, const Point3d& ptCorner) = 0 ; - virtual bool PolygonCenterMidSide( int nSides, const Point3d& ptCen, const Point3d& ptMidSide) = 0 ; - virtual bool PolygonSide( int nSides, const Point3d& ptStart, const Point3d& ptEnd) = 0 ; + virtual bool PolygonCenterCorner( int nSides, const Point3d& ptCen, const Point3d& ptCorner, const Vector3d& vtN) = 0 ; + virtual bool PolygonCenterMidSide( int nSides, const Point3d& ptCen, const Point3d& ptMidSide, const Vector3d& vtN) = 0 ; + virtual bool PolygonSide( int nSides, const Point3d& ptStart, const Point3d& ptEnd, const Vector3d& vtN) = 0 ; virtual int GetCurveNumber( void) const = 0 ; virtual const ICurve* GetFirstCurve( void) const = 0 ; virtual const ICurve* GetNextCurve( void) const = 0 ;