From 5201676bb189832a730d6375f966d3c31423fafb Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 2 Jun 2016 07:03:42 +0000 Subject: [PATCH] Include : - aggiornamenti. --- EGkCurveComposite.h | 2 +- EGkLuaAux.h | 1 - EInAPI.h | 2 +- EMkMachMgr.h | 2 +- EMkMachiningConst.h | 4 +++- EMkSimuGenConst.h | 19 +++++++++++++++++++ EXeExecutor.h | 2 +- 7 files changed, 26 insertions(+), 6 deletions(-) diff --git a/EGkCurveComposite.h b/EGkCurveComposite.h index a0c65ab..35fd3c7 100644 --- a/EGkCurveComposite.h +++ b/EGkCurveComposite.h @@ -47,7 +47,7 @@ class __declspec( novtable) ICurveComposite : public ICurve virtual bool RemoveJoint( int nU) = 0 ; virtual bool ArcsToBezierCurves( void) = 0 ; virtual bool ArcsBezierCurvesToArcsPerpExtr( double dLinTol, double dAngTolDeg) = 0 ; - virtual bool MergeCurves( double dLinTol, double dAngTolDeg) = 0 ; + virtual bool MergeCurves( double dLinTol, double dAngTolDeg, bool bStartEnd = true) = 0 ; virtual bool RemoveUndercutOnY( double dLinTol, double dAngTolDeg) = 0 ; } ; diff --git a/EGkLuaAux.h b/EGkLuaAux.h index d31bbf3..39117a2 100644 --- a/EGkLuaAux.h +++ b/EGkLuaAux.h @@ -240,7 +240,6 @@ LuaGetParam( lua_State* L, int nInd, SELVECTOR& vSel) vSel.emplace_back( Id) ; lua_pop( L, 1) ; } - POINTU ptPW ; } return true ; } diff --git a/EInAPI.h b/EInAPI.h index 77889b9..6fd0606 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -390,7 +390,7 @@ EIN_EXPORT BOOL __stdcall EgtModifyCurveCompoJoint( int nId, int nU, const doubl EIN_EXPORT int __stdcall EgtGetCurveCompoJointCount( int nId) ; EIN_EXPORT BOOL __stdcall EgtRemoveCurveCompoJoint( int nId, int nU) ; EIN_EXPORT int __stdcall EgtExplodeCurveCompo( int nId, int* pnCount) ; -EIN_EXPORT BOOL __stdcall EgtMergeCurvesInCurveCompo( int nId, double dLinTol) ; +EIN_EXPORT BOOL __stdcall EgtMergeCurvesInCurveCompo( int nId, double dLinTol, BOOL bStartEnd) ; // GeomDb Surf Modify EIN_EXPORT BOOL __stdcall EgtInvertSurface( int nId) ; diff --git a/EMkMachMgr.h b/EMkMachMgr.h index b62255f..51b55dd 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -205,7 +205,7 @@ class __declspec( novtable) IMachMgr virtual bool GetCalcPositions( const Point3d& ptP, double dAngA, double dAngB, int& nStat, double& dX, double& dY, double& dZ) = 0 ; virtual bool GetCalcTipFromPositions( double dX, double dY, double dZ, double dAngA, double dAngB, - bool bBottom, Point3d& ptTip) = 0 ; + bool bOverall, bool bBottom, Point3d& ptTip) = 0 ; virtual bool GetCalcToolDirFromAngles( double dAngA, double dAngB, Vector3d& vtDir) = 0 ; virtual bool GetNearestAngleInStroke( int nId, double dAngRef, double& dAng) = 0 ; virtual bool VerifyOutstroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat) = 0 ; diff --git a/EMkMachiningConst.h b/EMkMachiningConst.h index 5135a45..5d79427 100644 --- a/EMkMachiningConst.h +++ b/EMkMachiningConst.h @@ -65,6 +65,7 @@ enum MpaType { MPA_NONE = 0, MPA_STEPTYPE = ( MPA_INT + 7), MPA_SUBTYPE = ( MPA_INT + 8), MPA_LEADLINKTYPE = ( MPA_INT + 9), + MPA_SCC = ( MPA_INT + 10), MPA_SPEED = ( MPA_DOU + 0), MPA_FEED = ( MPA_DOU + 1), MPA_STARTFEED = ( MPA_DOU + 2), @@ -165,7 +166,8 @@ enum { MILL_ST_ZIGZAG = 0, enum { MILL_LI_NONE = 0, MILL_LI_LINEAR = 1, MILL_LI_TANGENT = 2, - MILL_LI_GLIDE = 3} ; + MILL_LI_GLIDE = 3, + MILL_LI_HELIX = 4} ; // Tipo di uscita enum { MILL_LO_NONE = 0, MILL_LO_LINEAR = 1, diff --git a/EMkSimuGenConst.h b/EMkSimuGenConst.h index c5b3903..4a4ed83 100644 --- a/EMkSimuGenConst.h +++ b/EMkSimuGenConst.h @@ -15,6 +15,8 @@ //------------------------ Criterio di scelta della soluzione ----------------- enum SolChoiseCriterion { MCH_SCC_NONE = 0, + MCH_SCC_STD = 1, // solo nelle lavorazioni + MCH_SCC_OPPOSITE = 2, // solo nelle lavorazioni MCH_SCC_ADIR_XP = 11, MCH_SCC_ADIR_XM = 12, MCH_SCC_ADIR_YP = 13, @@ -23,6 +25,23 @@ enum SolChoiseCriterion { MCH_SCC_NONE = 0, MCH_SCC_ADIR_ZM = 16, MCH_SCC_ADIR_NEAR = 21, MCH_SCC_ADIR_FAR = 22} ; +//----------------------------------------------------------------------------- +inline bool +IsValidHeadScc( int nScc) +{ + return ( nScc == MCH_SCC_NONE || + nScc == MCH_SCC_ADIR_XP || nScc == MCH_SCC_ADIR_XM || + nScc == MCH_SCC_ADIR_YP || nScc == MCH_SCC_ADIR_YM || + nScc == MCH_SCC_ADIR_ZP || nScc == MCH_SCC_ADIR_ZM || + nScc == MCH_SCC_ADIR_NEAR || nScc == MCH_SCC_ADIR_FAR) ; +} +//----------------------------------------------------------------------------- +inline bool +IsValidOperationScc( int nScc) +{ + return ( IsValidHeadScc( nScc) || + nScc == MCH_SCC_STD || nScc == MCH_SCC_OPPOSITE) ; +} //------------------------ Stato del movimento di simulazione ----------------- enum SimuStat { MCH_SIM_OK = 0, diff --git a/EXeExecutor.h b/EXeExecutor.h index 7a705c3..7f9d096 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -417,7 +417,7 @@ EXE_EXPORT bool ExeModifyCurveCompoJoint( int nId, int nU, const Point3d& ptP, i EXE_EXPORT int ExeGetCurveCompoJointCount( int nId) ; EXE_EXPORT bool ExeRemoveCurveCompoJoint( int nId, int nU) ; EXE_EXPORT int ExeExplodeCurveCompo( int nId, int* pnCount) ; -EXE_EXPORT bool ExeMergeCurvesInCurveCompo( int nId, double dLinTol) ; +EXE_EXPORT bool ExeMergeCurvesInCurveCompo( int nId, double dLinTol, bool bStartEnd) ; EXE_EXPORT bool ExeRemoveCurveCompoUndercutOnY( int nId, double dLinTol) ; EXE_EXPORT bool ExeChainCurvesInGroup( int nGroupId, const Point3d& ptNear, int nRefType) ; EXE_EXPORT bool ExeReorderCurvesInGroup( int nGroupId, const Point3d& ptNear, int nRefType) ;