Include :

- aggiornamenti.

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 ;
 } ;
 

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 ;
    }

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) ;

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 ;

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,

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,

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) ;