Include :

- aggioramento prototipi.

EGkCAvSimpleSurfFrMove.h

@@ -35,20 +35,27 @@ const int SCI_LINE_LINE = 4 ;             // tra linea di mobile e linea di fiss
 struct SCollInfo
 {
    int nType ;                    // tipo di collisione
+
    int nChunkM ;                  // indice del chunk della regione mobile
-   int nCrvM ;                    // indice della curva nel loop esterno del chunk
+   int nLoopM ;                   // indice del loop del chunk della regione mobile
+   int nCrvM ;                    // indice della curva nel loop del chunk
+
    int nChunkF ;                  // indice del chunk della regione fissa
-   int nCrvF ;                    // indice della curva nel loop esterno del chunk
+   int nLoopF ;                   // indice del loop del chunk della regione fissa
+   int nCrvF ;                    // indice della curva nel loop del chunk
+
    Point3d ptP1 ;                 // punto di contatto
    Point3d ptP2 ;                 // se contatto linea-linea, secondo punto di contatto
    Vector3d vtDirM ;              // se contatto del mobile con linea, sua direzione
    Vector3d vtDirF ;              // se contatto del fisso con linea, sua direzione
+
    // costruttori
-   SCollInfo() : nType( SCI_NONE), nChunkM( -1), nCrvM( -1), nChunkF( -1), nCrvF( -1),
+   SCollInfo() : nType( SCI_NONE), nChunkM( -1), nLoopM( -1), nCrvM( -1), nChunkF( -1), nLoopF( -1), nCrvF( -1),
                  ptP1(), ptP2(), vtDirM(), vtDirF() {}
-   SCollInfo( const SCollInfo& Sou) : nType( Sou.nType), nChunkM( Sou.nChunkM), nCrvM( Sou.nCrvM),
+   SCollInfo( const SCollInfo& Sou) : nType( Sou.nType),
-                                      nChunkF( Sou.nChunkF), nCrvF( Sou.nCrvF), ptP1( Sou.ptP1),
+                                      nChunkM( Sou.nChunkM), nLoopM( Sou.nLoopM), nCrvM( Sou.nCrvM),
-                                      ptP2( Sou.ptP2), vtDirM( Sou.vtDirM), vtDirF( Sou.vtDirF) {} 
+                                      nChunkF( Sou.nChunkF), nLoopF( Sou.nLoopF), nCrvF( Sou.nCrvF),
+                                      ptP1( Sou.ptP1), ptP2( Sou.ptP2), vtDirM( Sou.vtDirM), vtDirF( Sou.vtDirF) {}
 } ;
 
 //----------------------------------------------------------------------------
@@ -67,4 +74,4 @@ class CAvSimpleSurfFrMove
       const ISurfFlatRegion* m_pRegM ;
       const ISurfFlatRegion* m_pRegF ;
       SCollInfo m_SCollInfo ;
-} ;
+} ;

EGkCAvSurfFrMove.h

@@ -0,0 +1,41 @@
+//----------------------------------------------------------------------------
+//  EgalTech 2015-2018
+//----------------------------------------------------------------------------
+// File : EGkCAvSurfFrMove.h      Data : 26.03.2026    Versione : 3.1c7
+// Contenuto : Dichiarazione classe per movimento di superfici flat region
+//             nel loro piano evitando collisioni
+//
+// Modifiche : 26.03.26 RE Creazione modulo.
+//
+//
+//----------------------------------------------------------------------------
+
+#pragma once
+
+#include "/EgtDev/Include/EGkCAvSimpleSurfFrMove.h"
+
+//----------------------- Macro per import/export ----------------------------
+#undef EGK_EXPORT
+#if defined( I_AM_EGK)            // da definirsi solo nella DLL
+   #define EGK_EXPORT __declspec( dllexport)
+#else
+   #define EGK_EXPORT __declspec( dllimport)
+#endif
+
+//----------------------------------------------------------------------------
+class CAvSurfFrMove
+{
+   public :
+      EGK_EXPORT CAvSurfFrMove( const ISurfFlatRegion& SfrM, const ISurfFlatRegion& SfrF) ;
+
+   public :
+      EGK_EXPORT bool Translate( const Vector3d& vtDir, double& dLen) ;
+      EGK_EXPORT bool Rotate( const Point3d& ptCen, double& dAng) ;
+      EGK_EXPORT const SCollInfo& GetCollInfo()
+                           { return m_CollInfo ; }
+
+   private :
+      const ISurfFlatRegion* m_pRegM ;
+      const ISurfFlatRegion* m_pRegF ;
+      SCollInfo m_CollInfo ;
+} ;

EGkCalcPocketing.h

@@ -25,10 +25,15 @@
 #endif
 
 //-----------------------------------------------------------------------------
-EGK_EXPORT bool CalcPocketing( const ISurfFlatRegion* pSfr, double dRad, double dRadOffs, double dStep,
+// Per calcolo percorso di Svuotatura o di Lucidatura
+EGK_EXPORT bool CalcPocketing( const ISurfFlatRegion* pSfr, double dRad, double dRadialOffs, double dStep,
                                double dAngle, double dOpenMinSafe, int nType, bool bSmooth, bool bCalcUnclReg, bool bInvert, bool bAvoidOpt,
-                               bool bAllowZigZagOneWayBorders, bool bCalcFeed, const Point3d& ptEndPrec, const ISurfFlatRegion* pSfrLimit,
+                               bool bConventionalMilling, bool bAllowZigZagOneWayBorders, bool bCalcFeed, const Point3d& ptEndPrec,
-                               bool bAllOffs, double dMaxOptSize, double dLiTang, int nLiType, ICRVCOMPOPOVECTOR& vCrv) ;
+                               const ISurfFlatRegion* pSfrLimit, bool bAllOffs, double dMaxOptSize,
+                               int nLiType, double dLiTang, double dLiElev, int nLoType, double dLoTang,
+                               bool bPolishing, double dEpicyclesRad, double dEpicyclesDist, bool bContour, ICRVCOMPOPOVECTOR& vCrv) ;
+EGK_EXPORT bool IsPocketingHole( const ISurfFlatRegion* pSfr, double dRad, double dRadialOffs, double dStep, int nType,
+                                 int nLiType, double dLiTang, double dRatioSfrTool) ;
 EGK_EXPORT bool CalcSmoothCurve( ICurveComposite* pCrv, double dRightLen, double dLeftLen, bool bAsParam) ;
 EGK_EXPORT bool CalcZigZagInfill( const ISurfFlatRegion* pSfr, double dStep, bool bSmooth, bool bRemoveOverlapLink,
                                   ICRVCOMPOPOVECTOR& vCrvCompoRes) ;
@@ -52,31 +57,32 @@ enum {
 
 // Definizione di curva invalida
 enum {
-   TEMP_PROP_INVALID = - 1
+   TEMP_PROP_INVALID = -1
 } ;
 
 // Definizione curva di raccordo per smussi
 enum {
-   TEMP_PROP_SMOOTH = - 2
+   TEMP_PROP_SMOOTH = -2
 } ;
 
 // Definizione tipo di curva per casi speciali
 enum {
-   TEMP_PROP_SINGLE_CURVE = - 3,
+   TEMP_PROP_SINGLE_CURVE = -3,
-   TEMP_PROP_OPT_TRAPEZOID = - 4,
+   TEMP_PROP_OPT_TRAPEZOID = -4,
-   TEMP_PROP_BORDER_CURVE =  - 5,
+   TEMP_PROP_BORDER_CURVE =  -5,
-   TEMP_PROP_OPT_CIRCLE = - 9
+   TEMP_PROP_OPT_CIRCLE = -9,
+   TEMP_PROP_CONTOUR_BORDER = -10
 } ;
 
 // Definizione tipo di curva per entrate da fuori
 enum {
-   TEMP_PROP_OUT_START = - 6
+   TEMP_PROP_OUT_START = -6
 } ;
 
 // Definizione di curva attiva/non attiva
 enum {
-   TEMP_PROP_CURVE_ACTIVE = - 7,
+   TEMP_PROP_CURVE_ACTIVE = -7,
-   TEMP_PROP_CURVE_INACTIVE = - 8
+   TEMP_PROP_CURVE_INACTIVE = -8
 } ;
 
 // Definizione tipo LeadIn
@@ -86,3 +92,9 @@ enum {
    LEAD_IN_ZIGZAG = 2,
    LEAD_IN_HELIX = 3
 } ;
+
+// Definizione tipo LeadOut
+enum {
+   LEAD_OUT_NONE = 0,
+   LEAD_OUT_GLIDE = 1
+} ;

EGkCurveAux.h

@@ -45,7 +45,7 @@ struct CNurbsData
    CNurbsData( void) : nDeg( 0), bRat( false), bPeriodic( false), bClosed( false), bClamped( true), bExtraKnotes(false) {}
 } ;
 
-// N.B. : in caso la curva sia razionale i punti di controllo sono in forma NON OMOGENEA [ x, y, z, w]  ( dove la forma OMOGENEA è [ w*x, w*y, w*z, w])
+// N.B. : in caso la curva sia razionale i punti di controllo sono in forma NON OMOGENEA [ x, y, z, w]  ( dove la forma OMOGENEA � [ w*x, w*y, w*z, w])
 // tutte le operazioni richiedono la forma OMOGENEA, finite le quali posso riportarmi alla forma NON OMOGENEA
 
 //----------------------------------------------------------------------------
@@ -65,7 +65,7 @@ EGK_EXPORT ICurve* ArcToBezierCurve( const ICurveArc* pArc, int nDeg = 3, bool b
 EGK_EXPORT ICurve* CompositeToBezierCurve( const ICurveComposite* pCrv, int nDeg = 3, bool bMakeRatOrNot = false) ;
 
 //----------------------------------------------------------------------------
-//! Trasforma una curva bezier in una nuova curva di Bezier semplice o composta della razionalità e  grado desiderato ( minimo 3)
+//! Trasforma una curva bezier in una nuova curva di Bezier semplice o composta della razionalit� e  grado desiderato ( minimo 3)
 EGK_EXPORT ICurve* EditBezierCurve( const ICurveBezier* pCrv, int nDeg = 3, bool bMakeRatOrNot = false, double dTol = 10 * EPS_SMALL) ;
 
 //----------------------------------------------------------------------------
@@ -77,11 +77,11 @@ EGK_EXPORT ICurve* ApproxBezierWithCubics( const ICurve* pCrv, double dTol) ;
 EGK_EXPORT ICurveBezier* ApproxArcCurveBezierWithSingleCubic( const ICurve* pCrv, const Point3d& ptCen, const Vector3d& vtN) ;
 
 //----------------------------------------------------------------------------
-//! Campiona una serie di punti dalla curva e li approssima con una o più curve di bezier
+//! Campiona una serie di punti dalla curva e li approssima con una o pi� curve di bezier
-EGK_EXPORT ICurve* ApproxCurveWithBezier( const ICurve* pCrv, double dTol) ;
+EGK_EXPORT ICurve* ApproxCurveWithBezier( const ICurve* pCrv, double dTol, const Vector3d& vtStart = V_NULL, const Vector3d& vtEnd = V_NULL) ;
 
 //----------------------------------------------------------------------------
-//! Interpola un set di punti e li approssima con una o più curve di bezier cubiche
+//! Interpola un set di punti e li approssima con una o pi� curve di bezier cubiche
 EGK_EXPORT ICurve* InterpolatePointSetWithBezier( const PNTVECTOR& vPnt, double dLinTol, double dMaxLen) ;
 
 //----------------------------------------------------------------------------
@@ -169,5 +169,11 @@ EGK_EXPORT bool CalcFatOffsetCurves( const ICURVEPVECTOR& vpCrvs, ICURVEPOVECTOR
 //! Resetta l'oggetto voronoi associato alla curva liberandone la memoria
 EGK_EXPORT void ResetCurveVoronoi( const ICurve& crvC) ;
 
+//----------------------------------------------------------------------------
 //! fa il join delle curve passate in input
-EGK_EXPORT bool GetChainedCurves( ICRVCOMPOPOVECTOR& vCrv, double dChainTol = 5 * EPS_SMALL, bool bAllowInvert = false) ;
+EGK_EXPORT bool GetChainedCurves( ICRVCOMPOPOVECTOR& vCrv, double dChainTol = 5 * EPS_SMALL, bool bAllowInvert = false) ;
+
+//----------------------------------------------------------------------------
+//! dato un punto su una curva trova il corrispondente sulla seconda curva
+EGK_EXPORT bool GetIsoPointOnSecondCurve( const ICurve* pCrv1, const ICurve* pCrv2, double dUCurr1, double& dUCurr2, double dMyDist, double dUPrev2,
+                                          double dLenPrev2, double& dLenCurr2, double dLen2) ;

EGkCurveComposite.h

@@ -50,6 +50,7 @@ class __declspec( novtable) ICurveComposite : public ICurve
       virtual bool AddArcTg( const Point3d& ptNew, bool bEndOrStart = true) = 0 ;
       virtual bool AddJoint( double dU) = 0 ;
       virtual bool ModifyJoint( int nU, const Point3d& ptNewJoint) = 0 ;
+      virtual bool ModifyJoint( int nU, const Point3d& ptNewJoint, double dTol) = 0 ;
       virtual bool RemoveJoint( int nU) = 0 ;
       virtual bool MoveCurve( int nCrv, const Vector3d& vtMove) = 0 ;
       virtual bool ModifyCurveToArc( int nCrv, const Point3d& ptMid) = 0 ;
@@ -71,6 +72,7 @@ class __declspec( novtable) ICurveComposite : public ICurve
       virtual bool SetCurveTempParam( int nCrv, double dParam, int nParamInd = 0) = 0 ;
       virtual bool GetCurveTempParam( int nCrv, double& dParam, int nParamInd = 0) const = 0 ;
       virtual bool GetOnlyPoint( Point3d& ptStart) const = 0 ;
+      virtual bool ReplaceSingleCurve( int nSubCrv, ICurve* pNewCurve, double dTolStartEnd, double dTolAlong = INFINITO) = 0 ;
 } ;
 
 //-----------------------------------------------------------------------------

EGkCurveLocal.h

@@ -23,7 +23,7 @@ class CurveLocal
       CurveLocal( IGeomDB* pGeomDB, int nCrvId, const Frame3d& frLoc)
          : m_pCrv( nullptr), m_pCopy( nullptr)
          { // verifica dei parametri
-            if ( pGeomDB == nullptr  ||  &frLoc == nullptr)
+            if ( pGeomDB == nullptr)
                return ;
            // recupero riferimento della curva
             Frame3d frCrv ;
@@ -76,7 +76,7 @@ class CurveLocal
                return ;
             m_pCrv = m_pCopy ;
          }
-      CurveLocal( CurveLocal&& Other)
+      CurveLocal( CurveLocal&& Other) noexcept
          : m_pCrv( Other.m_pCrv), m_pCopy( Other.m_pCopy)
          { // annullo gli originali
             Other.m_pCrv = nullptr ;

EGkCurvePointDiffGeom.h

@@ -40,7 +40,8 @@ class CrvPointDiffGeom
       double   dCurv ;
 
    public :
-      CrvPointDiffGeom( void) { nStatus = NONE ; nFlag = STD ; }
+      CrvPointDiffGeom( void)
+         : nStatus( NONE), nFlag( STD), dU( -1), dCurv( -1) {}
 } ;
 
 //----------------------------------------------------------------------------

EGkDistPointCurve.h

@@ -63,8 +63,8 @@ class DistPointCurve
       EGK_EXPORT bool GetMinDistPoint( double dNearParam, Point3d& ptMinDist, int& nFlag) const ;
       EGK_EXPORT bool GetParamAtMinDistPoint( int nInd, double& dParam, int& nFlag) const ;
       EGK_EXPORT bool GetParamAtMinDistPoint( double dNearParam, double& dParam, int& nFlag) const ;
-      EGK_EXPORT bool GetSideAtMinDistPoint( int nInd, const Vector3d& vtN, int& nSide) const ;
+      EGK_EXPORT bool GetSideAtMinDistPoint( int nInd, const Vector3d& vtN, int& nSide, double dTol = EPS_SMALL) const ;
-      EGK_EXPORT bool GetSideAtMinDistPoint( double dNearParam, const Vector3d& vtN, int& nSide) const ;
+      EGK_EXPORT bool GetSideAtMinDistPoint( double dNearParam, const Vector3d& vtN, int& nSide, double dTol = EPS_SMALL) const ;
       EGK_EXPORT bool GetMinDistInfo( int nInd, MinDistPCInfo& aInfo) const ;
 
    private :

EGkIntersCurves.h

@@ -44,7 +44,7 @@ struct IntCrvCrvInfo {
    IntCrvInfo IciB[2] ;     //!< IciB[0] intersez. isolata o inizio overlap, IciB[1] fine overlap 
   // costruttore
    IntCrvCrvInfo( void)
-      : bOverlap( false) {}
+      : bOverlap( false), bCBOverEq( false) {}
 } ;
 //! vettore di IntCrvCrvInfo
 typedef std::vector<IntCrvCrvInfo>  ICCIVECTOR ;

EGkIntersLineSurfBez.h

@@ -46,9 +46,9 @@ enum IntLineTriaAuxType { ILTA_NO_TRIA = -1,       // l'intersezione è stata ca
                           ILTA_IN = 5} ;          // intersezione in interno del triangolo
 
 //-----------------------------------------------------------------------------
-//! dati di intersezione linea - superficie trimesh
+//! dati di intersezione linea - superficie bezier
 struct IntLinSbzInfo {
-   int     nILTA ;          //!< tipo di intersezione linea-triangolo   // se -1 vuol dire che l'intersezione � stata calcolata direttamente, senza usare la trimesh
+   int     nILSB ;          //!< tipo di intersezione linea-bezier
    double  dU ;             //!< parametro sulla linea
    double  dU2 ;            //!< secondo parametro sulla linea
    int     nT ;             //!< indice del triangolo della superficie trimesh  // se -1 vuol dire che l'intersezione � stata calcolata direttamente, senza usare la trimesh
@@ -58,11 +58,11 @@ struct IntLinSbzInfo {
    Point3d ptUV ;            //!< coordinate del punto nello spazio parametrico
    Point3d ptUV2 ;           //!< coordinate del secondo punto nello spazio parametrico
    // costruttori
-   IntLinSbzInfo( void) : nILTA( ILTA_NO), dU( 0), dU2( 0), nT(0), dCosDN(0), ptI(), ptI2(), ptUV(), ptUV2(){}
+   IntLinSbzInfo( void) : nILSB( LSBT_NONE), dU( 0), dU2( 0), nT(0), dCosDN(0), ptI(), ptI2(), ptUV(), ptUV2(){}
-   IntLinSbzInfo( int nILT, double dUU, int nTT, double dCos, const Point3d& ptP, const Point3d ptSP)
+   IntLinSbzInfo( int nILS, double dUU, int nTT, double dCos, const Point3d& ptP, const Point3d ptSP)
-      : nILTA( nILT), dU( dUU), dU2( 0), nT( nTT), dCosDN( dCos), ptI( ptP), ptI2(), ptUV( ptSP), ptUV2() {}
+      : nILSB( nILS), dU( dUU), dU2( 0), nT( nTT), dCosDN( dCos), ptI( ptP), ptI2(), ptUV( ptSP), ptUV2() {}
-   IntLinSbzInfo( int nILT, double dUU, double dUU2, int nTT, double dCos, const Point3d& ptP, const Point3d& ptP2, const Point3d& ptSP, const Point3d& ptSP2)
+   IntLinSbzInfo( int nILS, double dUU, double dUU2, int nTT, double dCos, const Point3d& ptP, const Point3d& ptP2, const Point3d& ptSP, const Point3d& ptSP2)
-      : nILTA( nILT), dU( dUU), dU2( dUU2), nT( nTT), dCosDN( dCos), ptI( ptP), ptI2( ptP2), ptUV( ptSP), ptUV2( ptSP2) {}
+      : nILSB( nILS), dU( dUU), dU2( dUU2), nT( nTT), dCosDN( dCos), ptI( ptP), ptI2( ptP2), ptUV( ptSP), ptUV2( ptSP2) {}
 } ;
 //! vettore di IntLinSbzInfo
 typedef std::vector<IntLinSbzInfo>  ILSBIVECTOR ;

EGkProjectCurveSurf.h

@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2023-2023
+//  EgalTech 2023-2026
 //----------------------------------------------------------------------------
-// File : EGkProjectCurveSurfTm.h     Data : 31.08.23      Versione : 2.5h3
+// File : EGkProjectCurveSurfTm.h     Data : 14.04.26      Versione : 3.1d3
 // Contenuto : Dichiarazione funzioni proiezione curve su superficie Trimesh.
 //
 //
@@ -50,15 +50,15 @@ typedef std::vector<Point5ax>        PNT5AXVECTOR ;    // vettore di Punti 5assi
 // Proiezione di una curva su una o più superfici a distanza minima
 EGK_EXPORT bool ProjectCurveOnSurf( const ICurve& crCrv, const CISURFPVECTOR& vpSurf,
                                     double dLinTol, double dMaxSegmLen, bool bSharpEdges, PNT5AXVECTOR& vPt5ax) ;
-// Proiezione di una curva su una o più superfici lungo la direzione data
+// Proiezione di una curva su una o più superfici lungo la direzione data (da o verso)
 EGK_EXPORT bool ProjectCurveOnSurf( const ICurve& crCrv, const CISURFPVECTOR& vpSurf, const Vector3d& vtDir,
-                                    double dLinTol, double dMaxSegmLen, bool bSharpEdges, PNT5AXVECTOR& vPt5ax) ;
+                                    double dLinTol, double dMaxSegmLen, bool bSharpEdges, bool bFromVsTo, PNT5AXVECTOR& vPt5ax) ;
-// Proiezione di una curva su una o più superfici in direzione del punto
+// Proiezione di una curva su una o più superfici in direzione del punto (da o verso)
 EGK_EXPORT bool ProjectCurveOnSurf( const ICurve& crCrv, const CISURFPVECTOR& vpSurf, const IGeoPoint3d& gpRef,
-                                    double dLinTol, double dMaxSegmLen, bool bSharpEdges, PNT5AXVECTOR& vPt5ax) ;
+                                    double dLinTol, double dMaxSegmLen, bool bSharpEdges, bool bFromVsTo, PNT5AXVECTOR& vPt5ax) ;
-// Proiezione di una curva su una o più superfici in direzione della curva
+// Proiezione di una curva su una o più superfici in direzione della curva (da o verso)
 EGK_EXPORT bool ProjectCurveOnSurf( const ICurve& crCrv, const CISURFPVECTOR& vpSurf, const ICurve& crRef,
-                                    double dLinTol, double dMaxSegmLen, bool bSharpEdges, PNT5AXVECTOR& vPt5ax) ;
+                                    double dLinTol, double dMaxSegmLen, bool bSharpEdges, bool bFromVsTo, PNT5AXVECTOR& vPt5ax) ;
-// Proiezione di una curva su una o più superfici in direzione della superficie
+// Proiezione di una curva su una o più superfici in direzione della superficie (da o verso)
 EGK_EXPORT bool ProjectCurveOnSurf( const ICurve& crCrv, const CISURFPVECTOR& vpSurf, const ISurf& sfRef,
-                                    double dLinTol, double dMaxSegmLen, bool bSharpEdges, PNT5AXVECTOR& vPt5ax) ;
+                                    double dLinTol, double dMaxSegmLen, bool bSharpEdges, bool bFromVsTo, PNT5AXVECTOR& vPt5ax) ;

EGkSbzFromCurves.h

@@ -44,6 +44,7 @@ EGK_EXPORT ISurfBezier* GetSurfBezierByScrewing( const ICurve* pCurve, const Poi
 //EGK_EXPORT ISurfBezier* GetSurfBezierTransSwept( const ICurve* pSect, const ICurve* pGuide, bool bCapEnds, double dLinTol = 10 * EPS_SMALL) ;
 EGK_EXPORT ISurfBezier* GetSurfBezierRuled( const Point3d& ptP, const ICurve* pCurve, double dLinTol = 10 * EPS_SMALL) ;
 EGK_EXPORT ISurfBezier* GetSurfBezierRuled( const ICurve* pCurve1, const ICurve* pCurve2, int nType, double dLinTol = 10 * EPS_SMALL) ;
+EGK_EXPORT ISurfBezier* GetSurfBezierRuledSmooth( const ICurve* pCurve1, const ICurve* pCurve2, BIPNTVECTOR& vSyncLines, double dSampleLen = 10) ;
 EGK_EXPORT ISurfBezier* GetSurfBezierRuledGuided( const ICurve* pCurve1, const ICurve* pCurve2, const BIPNTVECTOR& vCrv, double dLinTol = 10 * EPS_SMALL) ;
 EGK_EXPORT ISurfBezier* GetSurfBezierSkinned( const CICURVEPVECTOR& vCrv, double dLinTol = 10 * EPS_SMALL) ;
 EGK_EXPORT ISurfBezier* GetSurfBezierSweptInPlane( const ICurve* pSect, const ICurve* pGuide, const Vector3d& vtNorm, bool bCapEnds, double dLinTol = 10 * EPS_SMALL) ;

EGkSurfBezier.h

@@ -102,6 +102,10 @@ class __declspec( novtable) ISurfBezier : public ISurf
       virtual bool CreateByTwoCurves( const ICurve* pCurve1, const ICurve* pCurve2, int nType) = 0 ;
       virtual bool CreateBySetOfCurves( const ICURVEPOVECTOR& vCrvBez, bool bReduceToDeg3 = true) = 0 ;
       virtual bool RemoveCollapsedSpans() = 0 ;
+      virtual PNTVECTOR GetAllControlPoints( void) const = 0 ;
+      virtual bool LimitSurfToTrimmedRegion( void) = 0 ;
+      virtual bool CreateSmoothRuledByTwoCurves( const ICurve* pCurve0, const ICurve* pCurve1, double dSampleLen) = 0 ;
+      virtual bool CreateSmoothRuledByTwoCurves( const ICurve* pCurve0, const ICurve* pCurve1, double dSampleLen, BIPNTVECTOR& vSyncLines) = 0 ;
 } ;
 
 //-----------------------------------------------------------------------------

EGkSurfFlatRegion.h

@@ -52,7 +52,8 @@ class __declspec( novtable) ISurfFlatRegion : public ISurf
       virtual bool GetChunkCentroid( int nChunk, Point3d& ptCen) const = 0 ;
       virtual bool GetChunkArea( int nChunk, double& dArea) const = 0 ;
       virtual bool GetChunkPerimeter( int nChunk, double& dLen) const = 0 ;
-      virtual int  GetChunkSimpleClassification( int nChunk, const ISurfFlatRegion& Other, int nOthChunk) const ;   // compare only outsides
+      virtual int  GetChunkSimpleClassification( int nChunk, const ISurfFlatRegion& Other, int nOthChunk) const = 0 ;   // compare only outsides
+      virtual bool CheckChunkInterference( int nChunk, const ISurfFlatRegion& Other, int nOthChunk, bool& bInterference) const = 0 ;
       virtual bool GetChunkMaxOffset( int nChunk, double& dOffs) const = 0 ;
       virtual int  GetLoopCount( int nChunk) const = 0 ;
       virtual int  GetLoopCurveCount( int nChunk, int nLoop) const = 0 ;

EGkSurfLocal.h

@@ -23,7 +23,7 @@ class SurfLocal
       SurfLocal( IGeomDB* pGeomDB, int nSrfId, const Frame3d& frLoc)
          : m_pSrf( nullptr), m_pCopy( nullptr)
          { // verifica dei parametri
-            if ( pGeomDB == nullptr  ||  &frLoc == nullptr)
+            if ( pGeomDB == nullptr)
                return ;
            // recupero riferimento della superficie
             Frame3d frSrf ;
@@ -48,7 +48,7 @@ class SurfLocal
       SurfLocal( const ISurf* pSurf, const Frame3d& frSrf, const Frame3d& frLoc)
          : m_pSrf( nullptr), m_pCopy( nullptr)
          { // verifica dei parametri
-            if ( pSurf == nullptr  ||  &frSrf == nullptr  ||  &frLoc == nullptr)
+            if ( pSurf == nullptr)
                return ;
            // assegno la superficie originale
             m_pSrf = pSurf ;
@@ -76,7 +76,7 @@ class SurfLocal
                return ;
             m_pSrf = m_pCopy ;
          }
-      SurfLocal( SurfLocal&& Other)
+      SurfLocal( SurfLocal&& Other) noexcept
          : m_pSrf( Other.m_pSrf), m_pCopy( Other.m_pCopy)
          { // annullo gli originali
             Other.m_pSrf = nullptr ;

EGkSurfTriMesh.h

@@ -138,6 +138,7 @@ class __declspec( novtable) ISurfTriMesh : public ISurf
       virtual bool GetPartLoops( int nPart, POLYLINEVECTOR& vPL) const = 0 ;
       virtual bool RemovePart( int nPart) = 0 ;
       virtual ISurfTriMesh* ClonePart( int nPart) const = 0 ;
+      virtual bool GetPartAndShellFromFacet( int nFacet, int& nPart, int& nShell) const = 0 ;
       virtual bool SetTFlag( int nId, int nTFlag) = 0 ;
       virtual bool GetTFlag( int nId, int& nFlag) const = 0 ;
       virtual int  GetMaxTFlag( void) const = 0 ;

EGkTrimming.h

@@ -30,6 +30,9 @@
 typedef std::vector<ISURFPOVECTOR> ISURFPOMATRIX ;
 typedef std::vector<ICRVCOMPOPOVECTOR> ICRVCOMPOPOMATRIX ;
 
+enum RegolarizeType { STD = 0,  // standard, con modifiche dirette ai punti di controllo
+                      RMF = 1}; // ricostruendo le curve usando il rotation minimizing frame
+
 //-----------------------------------------------------------------------------
 EGK_EXPORT bool GetTrimmingStmAdjTria( const ISurfTriMesh* pStm, int nStartTria, const Point3d& ptStartTria,
                                        double dAngTol, double dSize, double dSizeTol, ISurfTriMesh* pStmAdjTria) ;
@@ -56,3 +59,5 @@ EGK_EXPORT bool GetTrimmingSyncInterpolation( const ICurve* pCrvEdge1, const ICu
 EGK_EXPORT bool GetTrimmingHoleBorders( const CISURFPVECTOR& vpSurf, const Point3d& ptRef, double dSurfLinTol,
                                         double dSurfAngTol, double dEdgeLinTol, double dEdgeAngTol,
                                         double dEdgeThick, ICRVCOMPOPOVECTOR& vHoleBorders) ;
+EGK_EXPORT ISurfBezier* RegolarizeBordersLocally( const ISurfBezier* pSurfBz, const BIPOINT& bpIsoStart,
+                                                  const BIPOINT& bpIsoEnd, double dTol, int nType = RegolarizeType::STD) ;

EGkVolZmap.h

@@ -29,10 +29,10 @@ class __declspec( novtable) IVolZmap : public IGeoObj
    public :
       virtual bool CopyFrom( const IGeoObj* pGObjSrc) = 0 ;
       virtual bool Clear( void) = 0 ;
-      virtual bool Create( const Point3d& ptO, double dDimX, double dDimY, double dDimZ, double dStep, bool bTriDex) = 0 ;
+      virtual bool Create( const Point3d& ptO, double dDimX, double dDimY, double dDimZ, double dStep, bool bTriDex, int* nError = nullptr) = 0 ;
-      virtual bool CreateEmpty( const Point3d& ptO, double dDimX, double dDimY, double dDimZ, double dStep, bool bTriDex) = 0 ;
+      virtual bool CreateEmpty( const Point3d& ptO, double dDimX, double dDimY, double dDimZ, double dStep, bool bTriDex, int* nError = nullptr) = 0 ;
-      virtual bool CreateFromFlatRegion( const ISurfFlatRegion& Surf, double dDimZ, double dStep, bool bTriDex) = 0 ;
+      virtual bool CreateFromFlatRegion( const ISurfFlatRegion& Surf, double dDimZ, double dStep, bool bTriDex, int* nError = nullptr) = 0 ;
-      virtual bool CreateFromTriMesh( const ISurfTriMesh& Surf, double dStep, bool bTriDex, double dExtraBox = 0) = 0 ;
+      virtual bool CreateFromTriMesh( const ISurfTriMesh& Surf, double dStep, bool bTriDex, double dExtraBox = 0, int* nError = nullptr) = 0 ;
       virtual int  GetBlockCount( void) const = 0 ;
       virtual int  GetBlockUpdatingCounter( int nBlock) const = 0 ;
       virtual bool GetBlockTriangles( int nBlock, TRIA3DEXVECTOR& vTria) const = 0 ;
@@ -94,6 +94,7 @@ class __declspec( novtable) IVolZmap : public IGeoObj
       virtual bool AddSurfTm( const ISurfTriMesh* pStm) = 0 ;
       virtual bool SubtractSurfTm( const ISurfTriMesh* pStm) = 0 ;
       virtual bool MakeUniform( double dToler, bool bIsExtensionFirst = true, int nToolNum = 0) = 0 ;
+      virtual bool RemoveFins( const Vector3d& vtDir, double dThick) = 0 ;
       virtual bool Offset( double dOffs, int nType) = 0 ;
 } ;
 

EInAPI.h

@@ -297,6 +297,8 @@ EIN_EXPORT int  __stdcall EgtCreatePolygonFromApothem( int nParentId, int nNumSi
                                                        const double ptMid[3], int nRefType) ;
 EIN_EXPORT int  __stdcall EgtCreatePolygonFromSide( int nParentId, int nNumSides, const double ptIni[3],
                                                     const double ptFin[3], int nRefType) ;
+EIN_EXPORT int  __stdcall EgtSurfBezierGetCurveU( int nSurfId, double dU, int nDestGroup) ;
+EIN_EXPORT int  __stdcall EgtSurfBezierGetCurveV( int nSurfId, double dV, int nDestGroup) ;
 
 // GeomDB Create Surf
 EIN_EXPORT int  __stdcall EgtCreateSurfFrRectangle( int nParentId, const double ptIni[3], const double ptCross[3], int nRefType) ;
@@ -634,6 +636,9 @@ EIN_EXPORT int  __stdcall EgtExtractSurfTmLoops( int nId, int nDestGrpId, int* p
 EIN_EXPORT int  __stdcall EgtExtractSurfTmFacetLoops( int nId, int nFacet, int nDestGrpId, int* pnCount) ;
 EIN_EXPORT int  __stdcall EgtCopySurfTmFacet( int nId, int nFacet, int nDestGrpId) ;
 EIN_EXPORT int  __stdcall EgtExtractSurfTmTriaLoop( int nId, int nT, int nDestGrpId) ;
+EIN_EXPORT BOOL __stdcall EgtSurfBezierParamsFromPoint( int nSurfId, const double ptOnSurf[3], int nRefId, double* pdU, double* pdV) ;
+EIN_EXPORT BOOL __stdcall EgtSurfBezierGetPointNrmD1( int nSurfId, double dU, double dV, int nUsd, int nVsd, int nRefId,
+                                                      double ptP[3], double vtNorm[3], double vtDerU[3], double vtDerV[3]) ;
 EIN_EXPORT int  __stdcall EgtExtractSurfBezierLoops( int nId, int nDestGrpId, int* pnCount) ;
 
 // Geo Snap Vector/Point/Frame
@@ -945,6 +950,7 @@ EIN_EXPORT BOOL __stdcall EgtSetMachiningGeometry( int nNumId, const int nIds[],
 EIN_EXPORT BOOL __stdcall EgtPreviewMachining( BOOL bRecalc) ;
 EIN_EXPORT BOOL __stdcall EgtApplyMachining( BOOL bRecalc) ;
 EIN_EXPORT BOOL __stdcall EgtUpdateMachining( void) ;
+EIN_EXPORT BOOL __stdcall EgtChangePreviewMachiningToolShow( int nLookFlag) ;
 EIN_EXPORT BOOL __stdcall EgtPreparePreviewMachiningTool( void) ;
 EIN_EXPORT BOOL __stdcall EgtRemovePreviewMachiningTool( void) ;
 EIN_EXPORT int  __stdcall EgtGetPreviewMachiningToolStepCount( void) ;
@@ -1030,6 +1036,7 @@ EIN_EXPORT BOOL __stdcall EgtSetGridGeoAdv( double dSnapStep, int nMinLineSstep,
 EIN_EXPORT BOOL __stdcall EgtSetGridColor( const int nMinCol[4], const int nMajCol[4]) ;
 EIN_EXPORT BOOL __stdcall EgtResize( int nW, int nH) ;
 EIN_EXPORT BOOL __stdcall EgtDraw( void) ;
+EIN_EXPORT BOOL __stdcall EgtRedraw( void) ;
 EIN_EXPORT BOOL __stdcall EgtSelect( int nWinX, int nWinY, int nSelW, int nSelH, int* pnSel) ;
 EIN_EXPORT BOOL __stdcall EgtSetObjFilterForSelWin( BOOL bZerodim, BOOL bCurve, BOOL bSurf, BOOL bVolume, BOOL bExtra) ;
 EIN_EXPORT BOOL __stdcall EgtUnselectableAdd( int nId) ;

EMkMachMgr.h

@@ -85,6 +85,7 @@ class __declspec( novtable) IMachMgr
       virtual int  GetNextRawPart( int nId) const = 0 ;
       virtual bool IsRawPart( int nId) const = 0 ;
       virtual int  AddRawPart( const Point3d& ptOrig, double dLen, double dWidth, double dHeight, Color cCol) = 0 ;
+      virtual int  AddRawPart( int nCrvSrfId, double dOverMat, Color cCol) = 0 ;
       virtual int  AddRawPartWithPart( int nPartId, int nCrvSrfId, double dOverMat, Color cCol) = 0 ;
       virtual bool ModifyRawPart( int nRawId, const Point3d& ptOrig, double dLen, double dWidth, double dHeight, Color cCol) = 0 ;
       virtual bool ModifyRawPart( int nRawId, int nCrvId, double dOverMat, double dHeight, Color cCol) = 0 ;
@@ -266,6 +267,7 @@ class __declspec( novtable) IMachMgr
       virtual bool RemoveMachiningPreview( void) = 0 ;
       virtual bool MachiningApply( bool bRecalc, bool bPostApply = true) = 0 ;
       virtual bool MachiningUpdate( bool bPostApply = true) = 0 ;
+      virtual bool ChangePreviewMachiningToolShow( int nLookFlag) = 0 ;
       virtual bool PreparePreviewMachiningTool( void) const = 0 ;
       virtual bool RemovePreviewMachiningTool( void) const = 0 ;
       virtual int  GetPreviewMachiningToolStepCount( void) const = 0 ; 
@@ -289,6 +291,9 @@ class __declspec( novtable) IMachMgr
       virtual bool GetClEntAxesStatus( int nEntId, int& nStatus) const = 0 ;
       virtual bool GetClEntAxesMask( int nEntId, int& nMask) const = 0 ;
       virtual bool GetClEntAxesVal( int nEntId, DBLVECTOR& vAxes) const = 0 ;
+      virtual bool GetClEntTDir( int nEntId, Vector3d& vtTDir) const = 0 ;
+      virtual bool GetClEntCDir( int nEntId, Vector3d& vtCDir) const = 0 ;
+      virtual bool GetClEntADir( int nEntId, Vector3d& vtADir) const = 0 ;
      // Simulation
       virtual bool SimInit( void) = 0 ;
       virtual bool SimStart( bool bFirst) = 0 ;
@@ -336,6 +341,7 @@ class __declspec( novtable) IMachMgr
       virtual bool GetNearestAngleInStroke( int nInd, double dAngRef, double& dAng) const = 0 ;
       virtual bool LimitAngleToStroke( int nInd, double& dAng) const = 0 ;
       virtual bool VerifyOutstroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat) const = 0 ;
+      virtual bool VerifyOutstroke( double dX, double dY, double dZ, const DBLVECTOR& vAng, bool bClear, int& nStat) const = 0 ;
       virtual std::string GetOutstrokeInfo( bool bMM = true) const = 0 ;
      // Machine
       virtual int  GetBaseId( const std::string& sBase) const = 0 ;

EMkMachiningGeoConst.h

@@ -37,6 +37,7 @@ static std::string MCH_ST = "ST" ;
 static std::string MCH_ST_DBL = "STDBL" ;
 static std::string MCH_CL = "CL" ;
 static std::string MCH_DBL = "DBL" ;
+static std::string MCH_HOME = "HOME" ;
 static std::string MCH_PATH = "P" ;
 // Nomi di entità CL speciali
 static std::string MCH_CL_CLIMB = "CLIMB" ;
@@ -50,7 +51,7 @@ static std::string MCH_CL_AGB_DWN = "AGBD" ;
 static std::string MCH_CL_AGB_IN = "AGBI" ;
 static std::string MCH_CL_AGB_OUT = "AGBO" ;
 static std::string MCH_CL_AGB_UP = "AGBU" ;
-static std::string MCH_CL_DBP = "DBP" ;
+static std::string MCH_CL_PARALLEL_DBL = "DBP" ;
 // Nomi di entità di preview
 static std::string MCH_PV_CUT = "CUT" ;
 static std::string MCH_PV_PRE_CUT = "PRC" ;
@@ -114,6 +115,8 @@ static std::string KEY_MMAX = "MMAX" ;
 // Chiavi info in gruppo CL per punti assi minimo e massimo di ingombro di tutta la lavorazione
 static std::string KEY_MAXMIN = "MAXMIN" ;
 static std::string KEY_MAXMAX = "MAXMAX" ;
+// Chiave info in gruppo CL per indicare il tipo di catena cinematica
+static std::string KEY_KINTYPE = "KINTYPE" ;
 // Chiave info in sottogruppo di CL per uscite attivate (per forature con gang drill)
 static std::string KEY_DRACEX = "DRACEX" ;
 // Chiave info in sottogruppo di testa per abilitarne visualizzazione in Preview (0/1 default) 
@@ -121,6 +124,8 @@ static std::string KEY_PREVIEWSHOW = "PreviewShow" ;
 // Chiavi info in entità di CL e DBL per riferimenti reciproci
 static std::string KEY_DBL_MAIN = "Main" ;
 static std::string KEY_CL_DOUBLE = "Double" ;
+// Chiavi Info per entità CamData da eseguire in compensazione utensile
+static std::string KEY_TRC = "TRC" ;       // Tool Radius Compensation
 
 //----------------- Costanti posizione per preview utensile in lavorazione ------
 enum MchToolShow { MCH_TPM_CURR = 0,

EXeExecutor.h

@@ -667,14 +667,14 @@ EXE_EXPORT bool ExeMergeCurvesInCurveCompo( int nId, double dLinTol, bool bStart
 EXE_EXPORT bool ExeRemoveCurveCompoUndercutOnY( int nId, double dLinTol) ;
 EXE_EXPORT bool ExeCurveCompoSetTempProp( int nId, int nCrv, int nProp, int nPropInd = 0) ;
 EXE_EXPORT bool ExeCurveCompoSetTempParam( int nId, int nCrv, double dParam, int nParamInd = 0) ;
-EXE_EXPORT bool ExeChainCurvesInGroup( int nGroupId, const Point3d& ptNear, int nRefType) ;
+EXE_EXPORT bool ExeChainCurvesInGroup( int nGroupId, const Point3d& ptNear, int nRefType, double dToler = 10 * EPS_SMALL) ;
-EXE_EXPORT bool ExeReorderCurvesInGroup( int nGroupId, const Point3d& ptNear, int nRefType) ;
+EXE_EXPORT bool ExeReorderCurvesInGroup( int nGroupId, const Point3d& ptNear, int nRefType, double dToler = 10 * EPS_SMALL) ;
 EXE_EXPORT bool ExeProjectCurveOnSurf( int nCurveId, const INTVECTOR& vnSurfId, int nDestGrpId,
                                        double dLinTol, double dMaxSegmLen) ;
 EXE_EXPORT bool ExeProjectCurveOnSurfDir( int nCurveId, const INTVECTOR& vnSurfId, const Vector3d& vtProj, int nDestGrpId,
-                                          double dLinTol, double dMaxSegmLen, bool bDirFromProj, int nRefType) ;
+                                          double dLinTol, double dMaxSegmLen, bool bDirFromProj, bool bFromVsTo, int nRefType) ;
 EXE_EXPORT bool ExeProjectCurveOnSurfExt( int nCurveId, const INTVECTOR& vnSurfId, int nGuideId, int nDestGrpId,
-                                          double dLinTol, double dMaxSegmLen, bool bDirFromGuide) ;
+                                          double dLinTol, double dMaxSegmLen, bool bDirFromGuide, bool bFromVsTo) ;
 EXE_EXPORT int  ExeCurveGetVoronoi( const INTVECTOR& vIds, int nDestGrpId, int nBound, int* pnCount) ;
 EXE_EXPORT int  ExeCurveGetMedialAxis( const INTVECTOR& vIds, int nDestGrpId, int nSide, int* pnCount) ;
 EXE_EXPORT int  ExeCurveGetFatCurve( int nId, int nDestGrpId, double dRad, bool bSquareEnds, bool bSquareMids, int* pnCount) ;
@@ -702,7 +702,6 @@ EXE_EXPORT bool ExeSurfTmRemoveFacet( int nId, int nFacet) ;
 EXE_EXPORT bool ExeSurfTmSwapFacets( int nId, int nFacet1, int nFacet2) ;
 EXE_EXPORT bool ExeSurfTmRemovePart( int nId, int nPart) ;
 EXE_EXPORT bool ExeCutSurfTmPlane( int nId, const Point3d& ptOn, const Vector3d& vtN, bool bSaveOnEq, int nRefType) ;
-EXE_EXPORT bool ExeCutSurfBzPlane( int nId, const Point3d& ptOn, const Vector3d& vtN, bool bSaveOnEq, int nRefType) ;
 EXE_EXPORT bool ExeCutSurfTmClosedCurve( int nSurfId, int nCurveId, bool bSaveOnEq) ;
 EXE_EXPORT bool ExeSurfTmAdd( int nId1, int nId2, bool bTwoColors = false) ;
 EXE_EXPORT bool ExeSurfTmSubtract( int nId1, int nId2, bool bTwoColors = false) ;
@@ -717,13 +716,16 @@ EXE_EXPORT bool ExeSurfTmGetTriaColor( int nId, int nTria, int& nColor) ;
 EXE_EXPORT bool ExeSurfTmResetTwoColors( int nId) ;
 EXE_EXPORT bool ExeSurfTmSetShowEdges( int nId, bool bShow) ;
 EXE_EXPORT bool ExeSurfTmGetShowEdges( int nId, bool& bShow) ;
-EXE_EXPORT bool ExeSurfBzTrim( int nId, int nCutterId) ;
 EXE_EXPORT bool ExeSurfTmSetSmoothAng( int nId, double dAngDeg) ;
+EXE_EXPORT bool ExeSurfTmGetSmoothAng( int nId, double& dAngDeg) ;
+EXE_EXPORT bool ExeCutSurfBzPlane( int nId, const Point3d& ptOn, const Vector3d& vtN, bool bSaveOnEq, int nRefType) ;
+EXE_EXPORT bool ExeSurfBzTrim( int nId, int nCutterId) ;
 
 // GeomDb Volume Modify
 EXE_EXPORT int  ExeExplodeVolume( int nId, int* pnCount) ;
 EXE_EXPORT bool ExeVolZmapChangeResolution( int nId, int nNewRes) ;
 EXE_EXPORT bool ExeVolZmapSetShowEdges( int nId, bool bShow) ;
+EXE_EXPORT bool ExeVolZmapGetShowEdges( int nId, bool& bShow) ;
 EXE_EXPORT bool ExeRemoveVolZmapPart( int nId, int nPart) ;
 EXE_EXPORT bool ExeVolZmapSetStdTool( const INTVECTOR& vIds, const std::string& sToolName,
                                       double dLen, double dDiam, double dCornR, double dCutterH, int nFlag, bool bFirst) ;
@@ -746,8 +748,9 @@ EXE_EXPORT bool ExeVolZmapMillingStep( int nId, const Point3d& ptPs, const Vecto
                                                 const Point3d& ptPe, const Vector3d& vtDe, const Vector3d& vtAe, int nRefType) ;
 EXE_EXPORT bool ExeCutVolZmapPlane( int nId, const Point3d& ptOn, const Vector3d& vtN, int nRefType) ;
 EXE_EXPORT bool ExeUpdateVolZmapByAddingSurfTm( int nVolZmapId, int nStmId) ;
-EXE_EXPORT bool ExeUniformVolZmap( int nVolZmapId, double dToler, bool bExtensionFirst, int nToolNum) ;
+EXE_EXPORT bool ExeVolZmapMakeUniform( int nVolZmapId, double dToler, bool bExtensionFirst, int nToolNum) ;
 EXE_EXPORT bool ExeVolZMapOffset( int nId, double dDist, int nType) ;
+EXE_EXPORT bool ExeVolZMapRemoveFins( int nVolZMapId, const Vector3d& vtDir, double dThick, int nRefType) ;
 
 // GeomDB Get
 EXE_EXPORT bool ExeTextNormVersor( int nId, int nRefId, Vector3d& vtNorm) ;
@@ -757,7 +760,7 @@ EXE_EXPORT bool ExeTextGetHeight( int nId, double& dH) ;
 EXE_EXPORT bool ExeTextGetItalic( int nId, bool& bItl) ;
 
 // GeomDb Get Pocketing
-EXE_EXPORT bool ExePocketing( const int nId, double dRad, double dStep, double dAngle, int nType, bool bSmooth, int nDestGrpId, int& nFirstId, int& nCrvCount) ;
+EXE_EXPORT bool ExePocketing( int nId, double dRad, double dStep, double dAngle, int nType, bool bSmooth, int nDestGrpId, int& nFirstId, int& nCrvCount) ;
 EXE_EXPORT int  ExeSurfFrGetZigZagInfill( int nId, int nDestGrpId, double dStep, double dAng, bool bSmooth, bool bRemoveOverlapLink,int* pnCount) ;
 
 // GeomDb Curve Get
@@ -807,12 +810,14 @@ EXE_EXPORT bool ExeSurfFrChunkMaxOffset( int nId, int nChunk, double& dMaxOffset
 EXE_EXPORT bool ExeSurfFrTestExternal( int nId1, int nId2, double dMinDist) ;
 EXE_EXPORT int  ExeSurfFrChunkCount( int nId) ;
 EXE_EXPORT int  ExeSurfFrChunkSimpleClassify( int nId1, int nChunk1, int nId2, int nChunk2, double dToler = 0) ;
+EXE_EXPORT int  ExeSurfFlatRegionInterference( int nId1, int nChunk1, int nId2, int nChunk2, double dToler = 0) ;
 EXE_EXPORT bool ExeSurfFrChunkCenter( int nId, int nChunk, int nRefId, Point3d& ptCen, Vector3d& vtN) ;
 EXE_EXPORT int  ExeExtractSurfFrChunkLoops( int nId, int nChunk, int nDestGrpId, int* pnCount) ;
 EXE_EXPORT int  ExeSurfFrGetZigZagInfill( int nId, int nDestGrpId, double dStep, double dAng, bool bSmooth, int* pnCount) ;
 EXE_EXPORT int  ExeSurfTmVertexCount( int nId) ;
 EXE_EXPORT int  ExeSurfTmFacetCount( int nId) ;
 EXE_EXPORT int  ExeSurfTmPartCount( int nId) ;
+EXE_EXPORT bool ExeSurfTmGetPartAndShellFromFacet( int nSurfTm, int nFacet, int& nPart, int& nShell) ;
 EXE_EXPORT bool ExeSurfTmGetVertex( int nId, int nVert, int nRefId, Point3d& ptVert) ;
 EXE_EXPORT bool ExeSurfTmGetNearestVertex( int nId, const Point3d& ptNear, int nRefId, int& nVert, Point3d& ptVert) ;
 EXE_EXPORT bool ExeSurfTmTriangleNormVersor( int nId, int nTria, int nRefId, Vector3d& vtNorm) ;
@@ -853,10 +858,10 @@ EXE_EXPORT bool ExeSurfBezierGetPointD1( int nSurfId, double dU, double dV, int
                                          Point3d& ptP, Vector3d& vtDerU, Vector3d& vtDerV) ;
 EXE_EXPORT bool ExeSurfBezierGetPointNrmD1( int nSurfId, double dU, double dV, int nUsd, int nVsd, int nRefId,
                                             Point3d& ptP, Vector3d& vtN, Vector3d& vtDerU, Vector3d& vtDerV) ;
+EXE_EXPORT bool ExeSurfBezierParamsFromPoint( int nSurfId, const Point3d& ptOnSurf, int nRefId, double& dU, double& dV) ;
+EXE_EXPORT bool ExeSurfBezierGetInfo( int nSurfId, int& nDegU, int& nDegV, int& nSpanU, int& nSpanV, bool& bIsRat, bool& bTrimmed) ;
 EXE_EXPORT int  ExeSurfBezierGetCurveU( int nSurfId, double dV, int nDestGrpId) ;
 EXE_EXPORT int  ExeSurfBezierGetCurveV( int nSurfId, double dU, int nDestGrpId) ;
-EXE_EXPORT bool ExeSurfBezParamsFromPoint( int nSurfId, const Point3d& ptOnSurf, int nDestGrpId) ;
-EXE_EXPORT bool ExeSurfBezierGetInfo( int nSurfId, int& nDegU, int& nDegV, int& nSpanU, int& nSpanV, bool& bIsRat, bool& bTrimmed) ;
 EXE_EXPORT int  ExeSurfBezierGetControlCurveU( int nSurfId, int nIndV, int nDestGrpId) ;
 EXE_EXPORT int  ExeSurfBezierGetControlCurveV( int nSurfId, int nIndU, int nDestGrpId) ;
 EXE_EXPORT int  ExeExtractSurfBezierLoops( int nId, int nDestGrpId, int* pnCount) ;
@@ -922,7 +927,7 @@ EXE_EXPORT bool ExePointSurfBzDist( const Point3d& ptP, int nSbzId, int nRefType
                                     double* pdDist, Point3d& ptMin, Vector3d& vtN) ;
  
 // Geo Intersect
-EXE_EXPORT bool ExeLineCurveInters( const Point3d& ptP, const Vector3d& vtDir, const int nId, const int nRefType,
+EXE_EXPORT bool ExeLineCurveInters( const Point3d& ptP, const Vector3d& vtDir, int nId, int nRefType,
                                     INTDBLVECTOR& vInters) ;
 EXE_EXPORT bool ExeLineBoxInters( const Point3d& ptP, const Vector3d& vtDir, const BBox3d& b3Box,
                                   INTDBLVECTOR& vInters) ;
@@ -932,7 +937,7 @@ EXE_EXPORT bool ExeLineSurfBzInters( const Point3d& ptP, const Vector3d& vtDir,
                                      INTDBLVECTOR& vInters) ;
 EXE_EXPORT bool ExeLineVolZmapInters( const Point3d& ptP, const Vector3d& vtDir, int nId, int nRefType,
                                       INTDBLVECTOR& vInters) ;
-EXE_EXPORT int  ExePlaneCurveInters( const Point3d& ptOn, const Vector3d& vtN, const int nId, const int nDestGrpId, const int nRefType,
+EXE_EXPORT int  ExePlaneCurveInters( const Point3d& ptOn, const Vector3d& vtN, int nId, int nDestGrpId, int nRefType,
                                      int* pnCount) ;
 EXE_EXPORT int  ExePlaneBoxInters( const Point3d& ptOn, const Vector3d& vtN, const BBox3d& b3Box, int nDestGrpId, int nRefType,
                                    int* pnPntCount, int* pnCrvCount, int* pnSrfCount) ;
@@ -942,9 +947,9 @@ EXE_EXPORT int  ExeParPlanesSurfTmInters( const Point3d& ptOn, const Vector3d& v
                                           int* pnGrpCount) ;
 EXE_EXPORT int  ExePlaneVolZmapInters( const Point3d& ptOn, const Vector3d& vtN, int nId, int nDestGrpId, int nRefType,
                                        int* pnCount) ;
-EXE_EXPORT int  ExeCurveCurveInters( const int nId1, const int nId2, const int nDestGrpId,
+EXE_EXPORT int  ExeCurveCurveInters( int nId1, int nId2, int nDestGrpId,
                                      int* pnPntCount, int* pnCrvCount, bool bOnly3D = false) ;
-EXE_EXPORT int  ExeCurveSurfTmInters( const int nCrvId, const int nStmId, const int nDestGrpId,
+EXE_EXPORT int  ExeCurveSurfTmInters( int nCrvId, int nStmId, int nDestGrpId,
                                       int* pnPntCount, int* pnCrvCount) ;
 EXE_EXPORT int  ExeSurfTmSurfTmInters( int nId1, int nId2, int nDestGrpId, double dToler,
                                        int* pnPntCount, int* pnCrvCount, int* pnSrfCount) ;
@@ -1092,7 +1097,8 @@ EXE_EXPORT int  ExeGetFirstRawPart( void) ;
 EXE_EXPORT int  ExeGetNextRawPart( int nRawId) ;
 EXE_EXPORT bool ExeIsRawPart( int nRawId) ;
 EXE_EXPORT int  ExeAddRawPart( Point3d ptOrig, double dLength, double dWidth, double dHeight, Color cCol) ;
-EXE_EXPORT int  ExeAddRawPartWithPart( int nPartId, int nCrvId, double dOverMat, Color cCol) ;
+EXE_EXPORT int  ExeAddRawPartGen( int nCrvSrfId, double dOverMat, Color cCol) ;
+EXE_EXPORT int  ExeAddRawPartWithPart( int nPartId, int nCrvSrfId, double dOverMat, Color cCol) ;
 EXE_EXPORT bool ExeModifyRawPart( int nRawId, Point3d ptOrig, double dLength, double dWidth, double dHeight, Color cCol) ;
 EXE_EXPORT bool ExeModifyRawPart( int nRawId, int nCrvId, double dOverMat, double dHeight, Color cCol) ;
 EXE_EXPORT bool ExeModifyRawPartSize( int nRawId, double dLength, double dWidth, double dHeight) ;
@@ -1270,6 +1276,7 @@ EXE_EXPORT bool ExeSetMachiningGeometry( const SELVECTOR& vIds) ;
 EXE_EXPORT bool ExePreviewMachining( bool bRecalc) ;
 EXE_EXPORT bool ExeApplyMachining( bool bRecalc, bool bPostApply = true) ;
 EXE_EXPORT bool ExeUpdateMachining( bool bPostApply = true) ;
+EXE_EXPORT bool ExeChangePreviewMachiningToolShow( int nLookFlag) ;
 EXE_EXPORT bool ExePreparePreviewMachiningTool( void) ;
 EXE_EXPORT bool ExeRemovePreviewMachiningTool( void) ;
 EXE_EXPORT int  ExeGetPreviewMachiningToolStepCount( void) ;
@@ -1297,7 +1304,9 @@ EXE_EXPORT bool ExeGetClEntFeed( int nEntId, double& dFeed) ;
 EXE_EXPORT bool ExeGetClEntAxesStatus( int nEntId, int& nStatus) ;
 EXE_EXPORT bool ExeGetClEntAxesMask( int nEntId, int& nMask) ;
 EXE_EXPORT bool ExeGetClEntAxesVal( int nEntId, DBLVECTOR& vAxes) ;
-
+EXE_EXPORT bool ExeGetClEntTDir( int nEntId, Vector3d& vtTDir) ;
+EXE_EXPORT bool ExeGetClEntCDir( int nEntId, Vector3d& vtCDir) ;
+EXE_EXPORT bool ExeGetClEntADir( int nEntId, Vector3d& vtADir) ;
 // Simulation
 EXE_EXPORT bool ExeSimInit( void) ;
 EXE_EXPORT bool ExeSimStart( bool bFirst) ;
@@ -1359,6 +1368,7 @@ EXE_EXPORT bool ExeGetCalcTipFromPositions( double dX, double dY, double dZ, con
 EXE_EXPORT bool ExeGetCalcToolDirFromAngles( const DBLVECTOR& vAng, Vector3d& vtDir) ;
 EXE_EXPORT bool ExeGetCalcAuxDirFromAngles( const DBLVECTOR& vAng, Vector3d& vtDir) ;
 EXE_EXPORT bool ExeVerifyOutstroke( double dX, double dY, double dZ, double dAngA, double dAngB, int& nStat) ;
+EXE_EXPORT bool ExeVerifyOutstroke( double dX, double dY, double dZ, const DBLVECTOR& vAng, int& nStat) ;
 EXE_EXPORT bool ExeGetOutstrokeInfo( std::string& sInfo) ;
 // Machine Move
 EXE_EXPORT bool ExeSetAxisPos( const std::string& sAxis, double dVal, double* pdNewVal = nullptr) ;
@@ -1394,6 +1404,7 @@ EXE_EXPORT bool ExeSetCameraType( bool bOrthoOrPersp, bool bRedraw) ;
 EXE_EXPORT bool ExeSetZoomType( int nMode, bool bRedraw) ;
 EXE_EXPORT bool ExeResize( int nW, int nH) ;
 EXE_EXPORT bool ExeDraw( void) ;
+EXE_EXPORT bool ExeRedraw( void) ;
 EXE_EXPORT bool ExeSelect( int nWinX, int nWinY, int nSelW, int nSelH, int* pnSel) ;
 EXE_EXPORT bool ExeSetObjFilterForSelWin( bool bZerodim, bool bCurve, bool bSurf, bool bVolume, bool bExtra) ;
 EXE_EXPORT bool ExeUnselectableRemove( int nId) ;
@@ -1527,3 +1538,4 @@ EXE_EXPORT bool ExeTrimmingGetSurfBzSyncPoints( int nParentId, int nEdge1Id, int
 EXE_EXPORT bool ExeTrimmingGetHoleBorder( int nParentId, const INTVECTOR& vSurfIds, const INTVECTOR& vOtherSurfIds,
                                           double dSurfLinTol, double dSurfAngTol, double dEdgeLinTol, double dEdgeAngTol,
                                           double dEdgeThick, int& nFirstId, int& nCount) ;
+EXE_EXPORT int ExeRegolarizeSurfaceLocally( int nParentId, int nSurfId, int nSyncStartId, int nSyncEndId, double dLinTol, int nType) ;

EgtKeyCodes.h

@@ -27,7 +27,7 @@
 
 //----------------------------------------------------------------------------
 const int KEY_BASELIB_PROD = 207 ;
-const int KEY_BASELIB_VER = 3103 ;
+const int KEY_BASELIB_VER = 3105 ;
 const int KEY_BASELIB_LEV = 1 ;
 
 //----------------------------------------------------------------------------

EgtPointerOwner.h

@@ -21,7 +21,7 @@ class PtrOwner
    public :
       explicit PtrOwner( void) : m_pT( nullptr) {}
       explicit PtrOwner( T* pT) : m_pT( pT) {}
-      PtrOwner( PtrOwner<T>&& RPT) : m_pT( Release( RPT)) {}
+      PtrOwner( PtrOwner<T>&& RPT) noexcept : m_pT( Release( RPT)) {}
       PtrOwner( const PtrOwner<T>& RPT) = delete ;
       ~PtrOwner( void) { Reset() ; }
       bool Set( T* pT) { Reset() ; m_pT = pT ; return ( m_pT != nullptr) ; }