Virtual milling additivo

EExBeamMgr.h

@@ -32,7 +32,6 @@ class __declspec( novtable) IBeamMgr
       virtual ~IBeamMgr( void) {} 
 
       virtual bool Init( IGeomDB* pGDB, int nFlag = 0) = 0 ;
-      virtual bool SetFlag( int nFlag) = 0 ;
       virtual int  CreatePart( void) = 0 ;
       virtual bool SetPart( int nPartId) = 0 ;
       virtual bool ErasePart( void) = 0 ;
@@ -42,11 +41,9 @@ class __declspec( novtable) IBeamMgr
       virtual bool SetPartCount( int nCount) = 0 ;
       virtual bool SetPartBox( double dLength, double dHeight, double dWidth, bool bUpdate = true) = 0 ;
       virtual int  AddProcess( int nGroup, int nProc, int nSide, const std::string& sDes, int nProcId,
-                               const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, const STRVECTOR& vsUAtt,
+                               const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, const STRVECTOR& vsUAtt, bool bUpdate = true) = 0 ;
-                               int nCrvId, int nCrv2Id, bool bUpdate = true) = 0 ;
       virtual int  ModifyProcess( int nGeomId, int nGroup, int nProc, int nSide, const std::string& sDes, int nProcId,
-                                  const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, const STRVECTOR& vsUAtt,
+                                  const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, const STRVECTOR& vsUAtt, bool bUpdate = true) = 0 ;
-                                  int nCrvId, int nCrv2Id, bool bUpdate = true) = 0 ;
       virtual bool EraseProcess( int nGeomId, bool bUpdate = true) = 0 ;
       virtual bool EnableProcess( int nGeomId, bool bEnable, bool bUpdate = true) = 0 ;
       virtual bool CalcSolid( int nPartId, bool bRecalc = false) = 0 ;

EGkCDeClosedSurfTmClosedSurfTm.h

@@ -12,7 +12,7 @@
 
 #pragma once
 
-#include "EgtDev/Include/EGkSurfTriMesh.h"
+#include "/EgtDev/Include/EGkSurfTriMesh.h"
 
 //----------------------- Macro per import/export ----------------------------
 #undef EGK_EXPORT

EGkCDeConvexTorusClosedSurfTm.h

@@ -12,8 +12,8 @@
 
 #pragma once
 
-#include "EgtDev/Include/EGkFrame3d.h"
+#include "/EgtDev/Include/EGkFrame3d.h"
-#include "EgtDev/Include/EGkSurfTriMesh.h"
+#include "/EgtDev/Include/EGkSurfTriMesh.h"
 
 //----------------------- Macro per import/export ----------------------------
 #undef EGK_EXPORT

EGkCurveComposite.h

@@ -58,8 +58,8 @@ class __declspec( novtable) ICurveComposite : public ICurve
       virtual bool IsAPoint( void) const = 0 ;
       virtual bool IsALine( double dLinTol, Point3d& ptStart, Point3d& ptEnd) const = 0 ;
       virtual bool IsACircle( double dLinTol, Point3d& ptCen, Vector3d& vtN, double& dRad, bool& bCCW) const = 0 ;
-      virtual bool SetCurveTempProp( int nCrv, int nProp, int nPropInd = 0) = 0 ;
+      virtual bool SetCurveTempProp( int nCrv, int nProp, int nPropNum = 0) = 0 ;
-      virtual bool GetCurveTempProp( int nCrv, int& nProp, int nPropInd = 0) const = 0 ;
+      virtual bool GetCurveTempProp( int nCrv, int& nProp, int nPropNum = 0) const = 0 ;
 } ;
 
 //-----------------------------------------------------------------------------

EGkGeoObj.h

@@ -54,8 +54,8 @@ class __declspec( novtable) IGeoObj
       virtual void SetObjGraphics( IObjGraphics* pOGr) = 0 ;
       virtual IObjGraphics* GetObjGraphics( void) = 0 ;
       virtual const IObjGraphics* GetObjGraphics( void) const = 0 ;
-      virtual void SetTempProp( int nProp, int nPropInd = 0) = 0 ;
+      virtual void SetTempProp( int nProp, int nPropNum = 0) = 0 ;
-      virtual int  GetTempProp( int nPropInd = 0) const = 0 ;
+      virtual int  GetTempProp( int nPropNum = 0) const = 0 ;
 } ;
 
 //-----------------------------------------------------------------------------

EGkHashGrids2d.h

@@ -13,8 +13,8 @@
 
 #pragma once
 
-#include "EgtDev/Include/EGkBBox3d.h"
+#include "/EgtDev/Include/EGkBBox3d.h"
-#include "EgtDev/Include/EgtNumCollection.h"
+#include "/EgtDev/Include/EgtNumCollection.h"
 #include <unordered_map>
 
 //----------------------- Macro per import/export ----------------------------

EGkHashGrids3d.h

@@ -13,8 +13,8 @@
 
 #pragma once
 
-#include "EgtDev/Include/EGkBBox3d.h"
+#include "/EgtDev/Include/EGkBBox3d.h"
-#include "EgtDev/Include/EgtNumCollection.h"
+#include "/EgtDev/Include/EgtNumCollection.h"
 #include <unordered_map>
 
 //----------------------- Macro per import/export ----------------------------

EGkIntersCurves.h

@@ -124,7 +124,7 @@ class IntersCurveCurve
       //! Restituisce il punto di intersezione più vicino al punto passato
       EGK_EXPORT bool GetIntersPointNearTo( int nCrv, const Point3d& ptNear, Point3d& ptI) ;
       //! Restituisce la classificazione di una curva rispetto all'altra ( nCrv=0 -> CurvaA, nCrv=1 -> CurvaB)
-      EGK_EXPORT bool GetCurveClassification( int nCrv, double dLenMin, CRVCVECTOR& ccClass) ;
+      EGK_EXPORT bool GetCurveClassification( int nCrv, CRVCVECTOR& ccClass) ;
       //! Restituisce la classificazione di curve chiuse secondo le regole delle regioni
       EGK_EXPORT int  GetRegionCurveClassification( void) ;
 
@@ -142,7 +142,7 @@ class IntersCurveCurve
       void CrvCompoCrvCompoCalculate( const ICurve& CurveA, const ICurve& CurveB) ;
       bool AdjustIntersParams( bool bAdjCrvA, bool bAdjCrvB) ;
       bool SwapInfoAB( ICCIVECTOR& Info, int IndCrvOrd) ;
-      bool CalcCurveClassification( const ICurve* pCurve, const ICCIVECTOR& Info, double dLenMin, CRVCVECTOR& ccClass) ;
+      bool CalcCurveClassification( const ICurve* pCurve, const ICCIVECTOR& Info, CRVCVECTOR& ccClass) ;
       bool CalcCurveInOrOut( const ICurve* pCurveA, const ICurve* pCurveB, CRVCVECTOR& ccClass) ;
       bool GetCurveOutClass( const ICurve* pCurve, int& nClass) ;
 

EGkIntersLineBox.h

@@ -1,8 +1,8 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2020-2022
+//  EgalTech 2020-2020
 //----------------------------------------------------------------------------
-// File : EGkIntersLineBox.h      Data : 08.01.22         Versione : 2.4a3
+// File : EGkIntersLineBox.h      Data : 07.05.20         Versione : 2.2e1
-// Contenuto : Dichiarazione delle funzioni intersezione linea/box.
+// Contenuto : Dichiarazione della classe intersezione linea/box.
 //
 //
 //

EGkIntersPlaneBox.h

@@ -1,19 +1,18 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2020-2022
+//  EgalTech 2020-2020
 //----------------------------------------------------------------------------
-// File : EGkIntersPlaneBox.h      Data : 09.01.22         Versione : 2.4a3
+// File : EGkIntersPlaneBox.h      Data : 08.05.20         Versione : 2.2e1
 // Contenuto : Dichiarazione della classe intersezione piano/box.
 //
 //
 //
 // Modifiche : 08.05.20 DS Creazione modulo.
-//             09.01.22 DS Aggiunta TestIntersPlaneBox.
+//
 //
 //----------------------------------------------------------------------------
 
 #pragma once
 
-#include "/EgtDev/Include/EGkPlane3d.h"
 #include "/EgtDev/Include/EGkBBox3d.h"
 #include "/EgtDev/Include/EGkGeoCollection.h"
 
@@ -26,6 +25,5 @@
 #endif
 
 //-----------------------------------------------------------------------------
-EGK_EXPORT bool TestIntersPlaneBox( const Plane3d& plPlane, const BBox3d& b3Box) ;
+EGK_EXPORT bool IntersPlaneBox( const Point3d& ptOn, const Vector3d& vtN, const BBox3d& b3Box,
-EGK_EXPORT bool IntersPlaneBox( const Plane3d& plPlane, const BBox3d& b3Box,
                                 PNTVECTOR& vPnt, BIPNTVECTOR& vBpt, TRIA3DVECTOR& vTria) ;

EGkIntersTriaTria.h

@@ -32,17 +32,16 @@ EGK_EXPORT int IntersTriaTria( const Triangle3d& trTria1, const Triangle3d& trTr
 
 //-----------------------------------------------------------------------------
 // Tipo di intersezione triangolo-triangolo  
-enum IntTriaTriaType { ITTT_NO = 0,                // non c'è intersezione
+enum IntTriaTriaType { ITTT_NO = 0,            // non c'� intersezione
-                       ITTT_OVERLAPS = 1,          // i triangoli si sovrappongono (i triangoli del poligono sono in vTria)
+                       ITTT_OVERLAPS = 1,      // i triangoli si sovrappongono (i triangoli del poligono sono in vTria)
-                       ITTT_VERT_VERT = 2,         // intersezione coppia di vertici
+                       ITTT_VERT_VERT = 2,     // intersezione coppia di vertici
-                       ITTT_VERT_EDGE = 3,         // vertice del primo su lato del secondo
+                       ITTT_VERT_EDGE = 3,     // vertice del primo su lato del secondo
-                       ITTT_EDGE_VERT = 4,         // vertice del secondo su lato del primo
+                       ITTT_EDGE_VERT = 4,     // vertice del secondo su lato del primo
-                       ITTT_VERT_INT = 5,          // vertice del primo nell'interno del secondo
+                       ITTT_VERT_INT = 5,      // vertice del primo nell'interno del secondo
-                       ITTT_INT_VERT = 6,          // vertice del secondo nell'interno del primo
+                       ITTT_INT_VERT = 6,      // vertice del secondo nell'interno del primo
-                       ITTT_EDGE_EDGE_PNT = 7,     // punto sull'intersezione di due lati
+                       ITTT_EDGE_EDGE_PNT = 7, // punto sull'intersezione di due lati
-                       ITTT_EDGE_EDGE_SEG = 8,     // sovrapposizione di lati
+                       ITTT_EDGE_EDGE_SEG = 8, // sovrapposizione di lati
-                       ITTT_EDGE_INT = 9,          // lato del primo nell'interno del secondo
+                       ITTT_EDGE_INT = 9,      // lato del primo nell'interno del secondo
-                       ITTT_INT_EDGE = 10,         // lato del secondo nell'interno del primo
+                       ITTT_INT_EDGE = 10,     // lato del secondo nell'interno del primo
-                       ITTT_INT_INT_SEG = 11,      // segmento all'interno di entrambi i triangoli
+                       ITTT_INT_INT_SEG = 11,  // segmento all'interno di entrambi i triangoli
-                       ITTT_COUNTER_OVERLAPS = 12  // triangoli sovrapposti controversi (i triangoli del poligono sono in vTria)
                      } ;

EGkPolyLine.h

@@ -99,6 +99,8 @@ class PolyLine
                         { return GetPrevULine( nullptr, &ptIni, nullptr, &ptFin) ; }
       EGK_EXPORT PNTULIST& GetUPointList( void)
                               { return m_lUPoints ; }
+      EGK_EXPORT const PNTULIST& GetUPointList( void) const
+                                    { return m_lUPoints ; }
       EGK_EXPORT bool IsFlat( int& nRank, Point3d& ptCen, Vector3d& vtDir, double dToler = EPS_SMALL) const ;
       EGK_EXPORT bool IsFlat( Plane3d& plPlane, double dToler = EPS_SMALL) const ;
       EGK_EXPORT bool IsClosedAndFlat( Plane3d& plPlane, double& dArea, double dToler = EPS_SMALL) const ;
@@ -116,6 +118,13 @@ class PolyLine
       EGK_EXPORT bool GetConvexHullXY( PNTVECTOR& vConvHull) const ;
       EGK_EXPORT bool GetMinAreaRectangleXY( Point3d& ptCen, Vector3d& vtAx, double& dLen, double& dHeight) const ;
       EGK_EXPORT bool Trim( const Plane3d& plPlane, bool bInVsOut = true) ;
+      EGK_EXPORT bool ChangePolyLineStart( const Point3d& ptNewStart, double dTol = EPS_SMALL) ;
+      // nSegNum 0-based
+      EGK_EXPORT bool PointPositionOnPolyLine( const Point3d& ptPoint, int& nSegNum, double& dParOnSeg, double dTol = EPS_SMALL) const ;
+      EGK_EXPORT bool IsPointInsidePolyLine( const Point3d& ptP) const ;
+      EGK_EXPORT bool DistPointPolyLine( const Point3d& ptP, double& dPointPolyLineDist) const ;
+      EGK_EXPORT bool SplitPolyLineAtPoint( const Point3d& ptPoint, PolyLine& Loop1, PolyLine& Loop2, double dTol = EPS_SMALL) const ;
+      EGK_EXPORT bool AddPolyLineToPolyLine( PolyLine& PolyToAdd, double dTol = EPS_SMALL) ;
 
    private :
       bool MyChangeStart( int nPos) ;
@@ -133,9 +142,15 @@ class PolyLine
 typedef std::vector<PolyLine>  POLYLINEVECTOR ;   // vettore di PolyLine
 typedef std::list<PolyLine>    POLYLINELIST ;     // lista di PolyLine
 
+
 //----------------------------------------------------------------------------
-bool DistPointPolyLine( const Point3d& ptP, const PolyLine& plPoly, double& dDist) ;
+struct PositionOnPolyLine {
-bool IsPointInsidePolyLine( const Point3d& ptP, const PolyLine& plPoly, double dToler) ;
+   int nIndexInVec ;
-bool GetPointParamOnPolyLine( const Point3d& ptP, const PolyLine& plPoly, double dToler, double& dPar) ;
+   int nSegNum ;
-bool ChangePolyLineStart( PolyLine& plPoly, const Point3d& ptNewStart, double dToler) ;
+   double dParOnSeg ;
-bool SplitPolyLineAtPoint( const PolyLine& plPoly, const Point3d& ptP, double dToler, PolyLine& plPoly1, PolyLine& plPoly2) ;
+   PositionOnPolyLine( int nIndex, int nSeg, double dPar) {
+      nIndexInVec = nIndex ;
+      nSegNum = nSeg ;
+      dParOnSeg = dPar ;
+   }
+} ;

EGkSfrCreate.h

@@ -29,6 +29,9 @@ class Triangle3d ;
 EGK_EXPORT ISurfFlatRegion* GetSurfFlatRegionRectangle( double dWidth, double dLen) ;
 EGK_EXPORT ISurfFlatRegion* GetSurfFlatRegionStadium( double dWidth, double dLen) ;
 EGK_EXPORT ISurfFlatRegion* GetSurfFlatRegionDisk( double dRadius) ;
+EGK_EXPORT ISurfFlatRegion* GetSurfFlatRegionFromPolyLine( const PolyLine& ContourPolyLine) ;
+EGK_EXPORT ISurfFlatRegion* GetSurfFlatRegionFromPolyLineVector( const POLYLINEVECTOR& vContoursPolyLineVec) ;
+// la curva ingrassata non deve autointersecarsi
 EGK_EXPORT ISurfFlatRegion* GetSurfFlatRegionFromFatCurve( ICurve* pCrv, double dRadius,
                                                            bool bSquareEnds, bool bSquareMids) ;
 // NB : la curva ingrassata non deve autointersecarsi
@@ -56,9 +59,9 @@ class SurfFlatRegionByContours
       typedef std::vector<INDAREA>  INDAREAVECTOR ;   // vettore di coppie indice, area
 
    private :
-      bool          m_bAllowedMore  ;      // ammesse più regioni
+      bool          m_bAllowedMore  ;      // ammesse pi� regioni
-      bool          m_bAllowedMultiChunk ; // ammesse regioni con più componenti disgiunti (chunk)
+      bool          m_bAllowedMultiChunk ; // ammesse regioni con pi� componenti disgiunti (chunk)
       bool          m_bFirst ;             // flag per prima superficie non ancora richiesta
-      ICURVEPVECTOR m_vpCrv ;              // vettore di puntatori a curve, l'oggetto ne è possessore
+      ICURVEPVECTOR m_vpCrv ;              // vettore di puntatori a curve, l'oggetto ne � possessore
       INDAREAVECTOR m_vArea ;              // vettore indice + area di ogni curva
 } ;

EGkSurfFlatRegion.h

@@ -45,7 +45,7 @@ class __declspec( novtable) ISurfFlatRegion : public ISurf
       virtual const ISurfTriMesh* GetAuxSurf( void) const = 0 ;
       virtual ISurfFlatRegion* CloneChunk( int nChunk) const = 0 ;
       virtual bool GetChunkCentroid( int nChunk, Point3d& ptCen) const ;
-      virtual bool GetCurveClassification( const ICurve& Crv, double dLenMin, CRVCVECTOR& ccClass) const = 0 ;
+      virtual bool GetCurveClassification( const ICurve& Crv, CRVCVECTOR& ccClass) const = 0 ;
       virtual int  GetChunkSimpleClassification( int nChunk, const ISurfFlatRegion& Other, int nOthChunk) const ;   // compare only outsides
 } ;
 

EGkSurfTriMesh.h

@@ -25,9 +25,6 @@ const int SVT_DEL = - 2 ;            // vertice o triangolo cancellato
 inline bool IsValidSvt( int nSvt)
                { return ( nSvt != SVT_NULL  &&  nSvt != SVT_DEL) ; }
 
-//----------------------------------------------------------------------------
-const double MAX_EDGE_LEN_STD = 5000.0 ;
-
 //----------------------------------------------------------------------------
 class __declspec( novtable) ISurfTriMesh : public ISurf
 {
@@ -107,7 +104,6 @@ class __declspec( novtable) ISurfTriMesh : public ISurf
       virtual bool GetSurfClassification( const ISurfTriMesh& ClassifierSurf,
                              INTVECTOR& vTriaIn, INTVECTOR& vTriaOut, INTVECTOR& vTriaOnP, INTVECTOR& vTriaOnM, INTVECTOR& vTriaIndef) = 0 ;
       virtual bool CutWithOtherSurf( const ISurfTriMesh& CutterSurf, bool bInVsOut, bool bSaveOnEq) = 0 ;
-      virtual bool Repair( double dMaxEdgeLen = MAX_EDGE_LEN_STD) = 0 ;
       virtual bool GetAllTriaOverlapBox( const BBox3d& b3Box, INTVECTOR& vT) const = 0 ;
       virtual const BBox3d& GetAllTriaBox( void) const = 0 ;
       virtual int  GetPartCount( void) const = 0 ;

EGkVolZmap.h

@@ -73,7 +73,6 @@ class __declspec( novtable) IVolZmap : public IGeoObj
       virtual bool SetGenTool( const std::string& sToolName, const ICurveComposite* pToolOutline, int nFlag) = 0 ;
       virtual bool SetMortiserTool( const std::string& sToolName, double dH, double dW, double dTh, double dRc, int nFlag) = 0 ;
       virtual bool SetChiselTool( const std::string& sToolName, double dH, double dW, double dTh, int nFlag) = 0 ;
-      virtual bool SetAdditiveTool( const std::string& sToolName, double dH, double dR, double dRC, int nFlag) = 0 ;
       virtual bool SetCurrTool( int nCurrTool) = 0 ;
       virtual int GetToolCount( void) const = 0 ;
       virtual int GetCurrTool( void) const = 0 ;

EInAPI.h

@@ -118,7 +118,6 @@ EIN_EXPORT BOOL __stdcall EgtExportSvg( int nId, const wchar_t* wsFilePath) ;
 
 // BeamManager
 EIN_EXPORT BOOL __stdcall EgtInitBeamMgr( int nFlag) ;
-EIN_EXPORT BOOL __stdcall EgtBeamSetFlag( int nFlag) ;
 EIN_EXPORT int  __stdcall EgtBeamCreatePart( void) ;
 EIN_EXPORT BOOL __stdcall EgtBeamSetPart( int nPartId) ;
 EIN_EXPORT BOOL __stdcall EgtBeamErasePart( void) ;
@@ -129,12 +128,10 @@ EIN_EXPORT BOOL __stdcall EgtBeamSetPartCount( int nCount) ;
 EIN_EXPORT BOOL __stdcall EgtBeamSetPartBox( double dLength, double dHeight, double dWidth, BOOL bUpdate) ;
 EIN_EXPORT int  __stdcall EgtBeamAddProcess( int nGroup, int nProc, int nSide, const wchar_t* wsDes, int nProcId,
                                              const double ptOrig[3], const double vX[3], const double vY[3], const double vZ[3],
-                                             int nPar, const double vPar[], const wchar_t* wsPar, const wchar_t* wsUAtts,
+                                             int nPar, const double vPar[], const wchar_t* wsPar, const wchar_t* wsUAtts, BOOL bUpdate) ;
-                                             int nCrvId, int nCrv2Id, BOOL bUpdate) ;
 EIN_EXPORT int  __stdcall EgtBeamModifyProcess( int nGeomId, int nGroup, int nProc, int nSide, const wchar_t* wsDes, int nProcId,
                                                 const double ptOrig[3], const double vX[3], const double vY[3], const double vZ[3],
-                                                int nPar, const double vPar[], const wchar_t* wsPar, const wchar_t* wsUAtts,
+                                                int nPar, const double vPar[], const wchar_t* wsPar, const wchar_t* wsUAtts, BOOL bUpdate) ;
-                                                int nCrvId, int nCrv2Id, BOOL bUpdate) ;
 EIN_EXPORT BOOL __stdcall EgtBeamEraseProcess( int nGeomId, BOOL bUpdate) ;
 EIN_EXPORT BOOL __stdcall EgtBeamEnableProcess( int nGeomId, BOOL bEnable, BOOL bUpdate) ;
 EIN_EXPORT BOOL __stdcall EgtBeamCalcSolid( int nPartId, BOOL bRecalc) ;
@@ -820,9 +817,6 @@ EIN_EXPORT BOOL __stdcall EgtMdbGetGeneralParamDouble( int nType, double* pdVal)
 EIN_EXPORT BOOL __stdcall EgtMdbReload( void) ;
 EIN_EXPORT BOOL __stdcall EgtMdbSave( void) ;
 EIN_EXPORT BOOL __stdcall EgtMdbGetMachiningDir( wchar_t*& wsMchDir) ;
-EIN_EXPORT BOOL __stdcall EgtMdbExport( const wchar_t* wsMachiningsNames, const wchar_t* wsOutFile) ;
-EIN_EXPORT BOOL __stdcall EgtMdbToBeImported( const wchar_t* wsFile, wchar_t*& wsMachiningsNames, int*& vTypes, int* pnCount) ;
-EIN_EXPORT BOOL __stdcall EgtMdbImport( const wchar_t* wsFile, const wchar_t* wsMachiningsToImport, const wchar_t* wsMachiningsNames, wchar_t*& wsImported) ;
 // Operations
 EIN_EXPORT int  __stdcall EgtGetFirstOperation( void) ;
 EIN_EXPORT int  __stdcall EgtGetNextOperation( int nId) ;
@@ -907,7 +901,6 @@ EIN_EXPORT BOOL __stdcall EgtGetAllHeadsNames( wchar_t*& wsNames) ;
 EIN_EXPORT BOOL __stdcall EgtGetAllTablesNames( wchar_t*& wsNames) ;
 // Machine Calc
 EIN_EXPORT BOOL __stdcall EgtSetCalcTool( const wchar_t* wsTool, const wchar_t* wsHead, int nExit) ;
-EIN_EXPORT BOOL __stdcall EgtGetCalcTool( wchar_t*& wsTool, wchar_t*& wsHead, int* pnExit) ;
 EIN_EXPORT BOOL __stdcall EgtGetCalcAngles( const double vtDirT[3], const double vtDirA[3],
                                             int* pnStat, double* pdAngA1, double* pdAngB1, double* pdAngA2, double* pdAngB2) ;
 EIN_EXPORT BOOL __stdcall EgtGetCalcPositions( const double ptP[3], double dAngA, double dAngB,
@@ -1009,7 +1002,6 @@ EIN_EXPORT BOOL __stdcall EgtGetPhotoPath( int nId, wchar_t*& wsFile) ;
 EIN_EXPORT BOOL __stdcall EgtChangePhotoPath( int nId, const wchar_t* wsFile) ;
 EIN_EXPORT BOOL __stdcall EgtGetPhotoOrigin( int nId, double ptOri[3]) ;
 EIN_EXPORT BOOL __stdcall EgtGetPhotoCenter( int nId, double ptCen[3]) ;
-EIN_EXPORT BOOL __stdcall EgtChangePhotoCenterAsFlatScan( int nId) ;
 EIN_EXPORT BOOL __stdcall EgtGetPhotoDimensions( int nId, double* pdDimX, double* pdDimY) ;
 EIN_EXPORT BOOL __stdcall EgtGetPhotoPixels( int nId, int* pnPixelX, int* pnPixelY) ;
 EIN_EXPORT BOOL __stdcall EgtGetPhotoImagePixels( int nId, int* pnPixelX, int* pnPixelY) ;

EMkMachMgr.h

@@ -193,10 +193,6 @@ class __declspec( novtable) IMachMgr
       virtual bool MdbReload( void) = 0 ;
       virtual bool MdbSave( void) const = 0 ;
       virtual bool MdbGetMachiningDir( std::string& sMchDir) const = 0 ;
-      virtual bool MdbExport( const STRVECTOR& vsMachiningsNames, const std::string& sOutFile) const = 0 ;
-      virtual bool MdbToBeImported( const std::string& sFile, STRVECTOR& vsMachiningsNames, INTVECTOR& vMachiningsTypes) const = 0 ;
-      virtual bool MdbImport( const std::string& sFile, const STRVECTOR& vsMachiningsToImport, const STRVECTOR& vsMachiningsNames, 
-                              STRVECTOR& vsImported) = 0 ;
       // Operations : general
       virtual int  GetOperationCount( void) const = 0 ;
       virtual int  GetFirstOperation( void) const = 0 ;

ENsAutoNester.h

@@ -24,7 +24,6 @@
    #define ENS_EXPORT __declspec( dllimport)
 #endif
 
-class Point3d ;
 class PolyArc ;
 
 //-----------------------------------------------------------------------------
@@ -48,14 +47,10 @@ class __declspec( novtable) IAutoNester
       virtual bool SetStartCorner( int nCorner) = 0 ;
       virtual bool AddSheet( int nSheetId, const PolyArc& Outline, double dKerf, int nPriority, int nCount, bool* pbIsRect = nullptr) = 0 ;
       virtual bool AddDefectToSheet( int nSheetId, const PolyArc& Outline) = 0 ;
-      virtual bool AddRestrictedZoneToSheet( int nRzConstrId, int nSheetId, const PolyArc& Outline) = 0 ;
       virtual bool AddPart( int nPartId, const PolyArc& Outline, bool bCanFlip, bool bCanRotate, double dRotStep, int nPriority, int nCount) = 0 ;
       virtual bool AddHoleToPart( int nPartId, const PolyArc& Hole) = 0 ;
       virtual bool AddAnotherOutlineToPart( int nPartId, const PolyArc& AnotherOutline) = 0 ;
       virtual bool AddToolOutlineToPart( int nPartId, const PolyArc& ToolOutline) = 0 ;
-      virtual bool SetRestrictedZoneToPart( int nPartId, int nRzConstrId) = 0 ;
-      virtual bool SetStripYconstraintToPart( int nPartId, const Point3d& ptRef, double dStripStart, double dStripRepeat) = 0 ;
-      virtual bool SetStripXconstraintToPart( int nPartId, const Point3d& ptRef, double dStripStart, double dStripRepeat) = 0 ;
       virtual bool SetInterpartGap( double dGap) = 0 ;
       virtual bool SetReportFile( const std::string& sReportFile) = 0 ;
       virtual bool Compute( bool bMinimizeOnXvsY, int nMaxTime) = 0 ;

EXeExecutor.h

@@ -125,7 +125,6 @@ EXE_EXPORT bool ExeExportSvg( int nId, const std::string& sFilePath, int nFilter
 
 // BeamManager
 EXE_EXPORT bool ExeInitBeamMgr( int nFlag) ;
-EXE_EXPORT bool ExeBeamSetFlag( int nFlag) ;
 EXE_EXPORT int  ExeBeamCreatePart( void) ;
 EXE_EXPORT bool ExeBeamSetPart( int nPartId) ;
 EXE_EXPORT bool ExeBeamErasePart( void) ;
@@ -135,11 +134,9 @@ EXE_EXPORT bool ExeBeamSetPartName( const std::string& sName) ;
 EXE_EXPORT bool ExeBeamSetPartCount( int nCount) ;
 EXE_EXPORT bool ExeBeamSetPartBox( double dLength, double dHeight, double dWidth, bool bUpdate = true) ;
 EXE_EXPORT int  ExeBeamAddProcess( int nGroup, int nProc, int nSide, const std::string& sDes, int nProcId,
-                                   const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, const STRVECTOR& vsUAtt,
+                                   const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, const STRVECTOR& vsUAtt, bool bUpdate = true) ;
-                                   int nCrvId, int nCrv2Id, bool bUpdate = true) ;
 EXE_EXPORT int  ExeBeamModifyProcess( int nGeomId, int nGroup, int nProc, int nSide, const std::string& sDes, int nProcId,
-                                      const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, const STRVECTOR& vsUAtt,
+                                      const Frame3d& frRef, const DBLVECTOR& vdPar, const std::string& sPar, const STRVECTOR& vsUAtt, bool bUpdate = true) ;
-                                      int nCrvId, int nCrv2Id, bool bUpdate = true) ;
 EXE_EXPORT bool ExeBeamEraseProcess( int nGeomId, bool bUpdate = true) ;
 EXE_EXPORT bool ExeBeamEnableProcess( int nGeomId, bool bEnable, bool bUpdate = true) ;
 EXE_EXPORT bool ExeBeamCalcSolid( int nPartId, bool bRecalc = false) ;
@@ -437,9 +434,6 @@ EXE_EXPORT bool ExeSetInfo( int nId, const std::string& sKey, const Vector3d& vt
 EXE_EXPORT bool ExeSetInfo( int nId, const std::string& sKey, const Point3d& ptP) ;
 EXE_EXPORT bool ExeSetInfo( int nId, const std::string& sKey, const BBox3d& b3Box) ;
 EXE_EXPORT bool ExeSetInfo( int nId, const std::string& sKey, const Frame3d& frFrame) ;
-EXE_EXPORT bool ExeSetInfo( int nId, const std::string& sKey, const INTVECTOR& vnInfo) ;
-EXE_EXPORT bool ExeSetInfo( int nId, const std::string& sKey, const DBLVECTOR& vdInfo) ;
-EXE_EXPORT bool ExeSetInfo( int nId, const std::string& sKey, const STRVECTOR& vsInfo) ;
 EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, bool& bInfo) ;
 EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, int& nInfo) ;
 EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, double& dInfo) ;
@@ -448,9 +442,6 @@ EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, Vector3d& vtV) ;
 EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, Point3d& ptP) ;
 EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, BBox3d& b3Box) ;
 EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, Frame3d& frFrame) ;
-EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, INTVECTOR& vnInfo) ;
-EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, DBLVECTOR& vdInfo) ;
-EXE_EXPORT bool ExeGetInfo( int nId, const std::string& sKey, STRVECTOR& vsInfo) ;
 EXE_EXPORT bool ExeExistsInfo( int nId, const std::string& sKey) ;
 EXE_EXPORT bool ExeRemoveInfo( int nId, const std::string& sKey) ;
 EXE_EXPORT bool ExeSetTextureName( int nId, const std::string& sTxrName) ;
@@ -791,14 +782,10 @@ EXE_EXPORT bool ExeAutoNestSetGuillotineMode( void) ;
 EXE_EXPORT bool ExeAutoNestSetStartCorner( int nCorner) ;
 EXE_EXPORT bool ExeAutoNestAddSheet( int nSheetId, int nOutlineId, double dKerf, int nPriority, int nCount, bool* pbIsRect = nullptr) ;
 EXE_EXPORT bool ExeAutoNestAddDefectToSheet( int nSheetId, int nDefectId) ;
-EXE_EXPORT bool ExeAutoNestAddRestrictedZoneToSheet( int nSheetId, int nRstZoneId, int nRzConstrId) ;
 EXE_EXPORT bool ExeAutoNestAddPart( int nPartId, int nOutlineId, bool bCanFlip, bool bCanRotate, double dRotStep, int nPriority, int nCount) ;
 EXE_EXPORT bool ExeAutoNestAddHoleToPart( int nPartId, int nHoleId) ;
 EXE_EXPORT bool ExeAutoNestAddAnotherOutlineToPart( int nPartId, int nAnotherOutlineId) ;
 EXE_EXPORT bool ExeAutoNestAddToolOutlineToPart( int nPartId, int nToolOutlineId) ;
-EXE_EXPORT bool ExeAutoNestSetRestrictedZoneToPart( int nPartId, int nRzConstrId) ;
-EXE_EXPORT bool ExeAutoNestSetStripYconstraintToPart( int nPartId, const Point3d& ptRef, double dStripStart, double dStripRepeat) ;
-EXE_EXPORT bool ExeAutoNestSetStripXconstraintToPart( int nPartId, const Point3d& ptRef, double dStripStart, double dStripRepeat) ;
 EXE_EXPORT bool ExeAutoNestSetInterpartGap( double dGap) ;
 EXE_EXPORT bool ExeAutoNestSetReportFile( const std::string& sReportFile) ;
 EXE_EXPORT bool ExeAutoNestCompute( bool bMinimizeOnXvsY, int nMaxTime) ;
@@ -976,9 +963,6 @@ EXE_EXPORT bool ExeMdbGetGeneralParam( int nType, double& dVal) ;
 EXE_EXPORT bool ExeMdbReload( void) ;
 EXE_EXPORT bool ExeMdbSave( void) ;
 EXE_EXPORT bool ExeMdbGetMachiningDir( std::string& sMchDir) ;
-EXE_EXPORT bool ExeMdbExport( const STRVECTOR& vsMachiningsNames, const std::string& sOutFile) ;
-EXE_EXPORT bool ExeMdbToBeImported( const std::string& sFile, STRVECTOR& vsMachiningsNames, INTVECTOR& vMachiningsTypes) ;
-EXE_EXPORT bool ExeMdbImport( const std::string& sFile, const STRVECTOR& vsMachiningsToImport, const STRVECTOR& vsMachiningsNames, STRVECTOR& vsImported) ;
 // Operations
 EXE_EXPORT int  ExeGetFirstOperation( void) ;
 EXE_EXPORT int  ExeGetNextOperation( int nId) ;
@@ -1078,8 +1062,10 @@ EXE_EXPORT bool ExeGetAllTcPosNames( STRVECTOR& vNames) ;
 EXE_EXPORT bool ExeSetCalcTable( const std::string& sTable) ;
 EXE_EXPORT bool ExeSetCalcTool( const std::string& sTool, const std::string& sHead, int nExit) ;
 EXE_EXPORT bool ExeSetRotAxisBlock( const std::string& sAxis, double dVal) ;
-EXE_EXPORT bool ExeGetCalcTool( std::string& sTool, std::string& sHead, int& nExit) ;
 EXE_EXPORT bool ExeGetRotAxisBlocked( int nInd, std::string& sAxis, double& dVal) ;
+EXE_EXPORT bool ExeGetCalcTool( std::string& sTool) ;
+EXE_EXPORT bool ExeGetCalcHead( std::string& sHead) ;
+EXE_EXPORT bool ExeGetCalcExit( int& nExit) ;
 EXE_EXPORT bool ExeGetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA,
                                   int& nStat, double& dAngA1, double& dAngB1, double& dAngA2, double& dAngB2) ;
 EXE_EXPORT bool ExeGetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA,
@@ -1196,7 +1182,6 @@ EXE_EXPORT bool ExeGetPhotoPath( int nId, std::string& sPath) ;
 EXE_EXPORT bool ExeChangePhotoPath( int nId, const std::string& sPath) ;
 EXE_EXPORT bool ExeGetPhotoOrigin( int nId, Point3d& ptOri) ;
 EXE_EXPORT bool ExeGetPhotoCenter( int nId, Point3d& ptCen) ;
-EXE_EXPORT bool ExeChangePhotoCenterAsFlatScan( int nId) ;
 EXE_EXPORT bool ExeGetPhotoDimensions( int nId, double& dDimX, double& dDimY) ;
 EXE_EXPORT bool ExeGetPhotoPixels( int nId, int& nPixelX, int& nPixelY) ;
 EXE_EXPORT bool ExeGetPhotoImagePixels( int nId, int& nPixelX, int& nPixelY) ;

EgtKeyCodes.h

@@ -1,7 +1,7 @@
 //----------------------------------------------------------------------------
-//  EgalTech 2015-2022
+//  EgalTech 2015-2021
 //----------------------------------------------------------------------------
-// File : EgtKeyCodes.h       Data : 01.01.22        Versione : 2.4a1
+// File : EgtKeyCodes.h       Data : 03.10.21        Versione : 2.3j1
 // Contenuto : Costanti per codici di protezione librerie di base.
 //
 //
@@ -15,7 +15,6 @@
 //             22.02.20 DS Aggiunta costante KEYOPT_EMK_NC_OFF.
 //             04.08.20 DS Portato a 22 KEY_BASELIB_VER.
 //             01.01.21 DS Nuova gestione KEY_BASELIB_VER con versione prodotto e mese.
-//             01.01.22 DS Passaggio a versione 24.
 //
 //----------------------------------------------------------------------------
 
@@ -23,7 +22,7 @@
 
 //----------------------------------------------------------------------------
 const int KEY_BASELIB_PROD = 207 ;
-const int KEY_BASELIB_VER = 2401 ;
+const int KEY_BASELIB_VER = 2310 ;
 const int KEY_BASELIB_LEV = 1 ;
 
 //----------------------------------------------------------------------------