From 2f821e645e1c0034b1bec46fdcf24032b869670a Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 22 Apr 2024 15:30:22 +0200 Subject: [PATCH 1/3] Include : - aggiornamento prototipi. --- EMkMachMgr.h | 4 +++- EXeExecutor.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/EMkMachMgr.h b/EMkMachMgr.h index b66290a..e6011f2 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- // EgalTech 2015-2024 //---------------------------------------------------------------------------- -// File : EMkMachMgr.h Data : 02.04.24 Versione : 2.6d1 +// File : EMkMachMgr.h Data : 22.04.24 Versione : 2.6d4 // Contenuto : Dichiarazione della interfaccia IMachMgr. // // @@ -17,6 +17,7 @@ // 28.10.23 DS Aggiunte in interfaccia GetClEntAxesVal, GetToolSetupPosInCurrSetup e GetAllCurrAxesName. // 30.03.24 DS Aggiunte in interfaccia GetAllAxesNames e GetCalcTable. // 02.04.24 DS Aggiunta in interfaccia GetClEntAxesMask. +// 22.04.24 DS Aggiunta in interfaccia GetExitId. // //---------------------------------------------------------------------------- @@ -322,6 +323,7 @@ class __declspec( novtable) IMachMgr virtual int GetAxisId( const std::string& sAxis) const = 0 ; virtual int GetHeadId( const std::string& sHead) const = 0 ; virtual int GetHeadExitCount( const std::string& sHead) const = 0 ; + virtual int GetExitId( const std::string& sHead, int nExit) const = 0 ; virtual int GetTcPosId( const std::string& sTcPos) const = 0 ; virtual bool GetAxisToken( const std::string& sAxis, std::string& sToken) const = 0 ; virtual bool GetAxisType( const std::string& sAxis, bool& bLinear) const = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index af177ad..46a8ad8 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -1198,6 +1198,7 @@ EXE_EXPORT int ExeGetTableId( const std::string& sTable) ; EXE_EXPORT int ExeGetAxisId( const std::string& sAxis) ; EXE_EXPORT int ExeGetHeadId( const std::string& sHead) ; EXE_EXPORT int ExeGetHeadExitCount( const std::string& sHead) ; +EXE_EXPORT int ExeGetExitId( const std::string& sHead, int nExit) ; EXE_EXPORT int ExeGetTcPosId( const std::string& sTcPos) ; EXE_EXPORT bool ExeGetAxisToken( const std::string& sAxis, std::string& sToken) ; EXE_EXPORT bool ExeGetAxisType( const std::string& sAxis, bool& bLinear) ; From 08e53e8872bf78fc70064973e2a619beebafeb62 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Fri, 26 Apr 2024 11:27:58 +0200 Subject: [PATCH 2/3] Include : - aggiornamento prototipi. --- EGkVolZmap.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/EGkVolZmap.h b/EGkVolZmap.h index 447a394..27966e9 100644 --- a/EGkVolZmap.h +++ b/EGkVolZmap.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- // EgalTech 2015-2024 //---------------------------------------------------------------------------- -// File : EGkVolZmap.h Data : 09.03.24 Versione : 2.6c2 +// File : EGkVolZmap.h Data : 22.04.24 Versione : 2.6d4 // Contenuto : Dichiarazione della interfaccia IVolZmap. // // @@ -27,10 +27,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 dPrec, bool bTriDex) = 0 ; - virtual bool CreateEmptyMap( const Point3d& ptO, double dLengthX, double dLengthY, double dLengthZ, double dStep, bool bTriDex) = 0 ; - virtual bool CreateFromFlatRegion( const ISurfFlatRegion& Surf, double dDimZ, double dPrec, bool bTriDex) = 0 ; - virtual bool CreateFromTriMesh( const ISurfTriMesh& Surf, double dPrec, bool bTriDex) = 0 ; + virtual bool Create( 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) = 0 ; + virtual bool CreateFromFlatRegion( const ISurfFlatRegion& Surf, double dDimZ, double dStep, bool bTriDex) = 0 ; + virtual bool CreateFromTriMesh( const ISurfTriMesh& Surf, double dStep, bool bTriDex) = 0 ; virtual int GetBlockCount( void) const = 0 ; virtual int GetBlockUpdatingCounter( int nBlock) const = 0 ; virtual bool GetBlockTriangles( int nBlock, TRIA3DEXVECTOR& vTria) const = 0 ; @@ -56,7 +56,7 @@ class __declspec( novtable) IVolZmap : public IGeoObj virtual bool SetChiselTool( const std::string& sToolName, double dH, double dW, double dTh, int nFlag, bool bFirst) = 0 ; virtual bool SetAdditiveTool( const std::string& sToolName, - double dH, double dR, double dRC, int nFlag, bool bFirst) = 0 ; + double dH, double dR, double dRc, int nFlag, bool bFirst) = 0 ; virtual int GetToolCount( void) const = 0 ; virtual bool SetCurrTool( int nCurrTool) = 0 ; virtual bool ResetTools( void) = 0 ; From 95d828ea9ab54680fa16baa29522297f641c3096 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Fri, 26 Apr 2024 11:42:01 +0200 Subject: [PATCH 3/3] Include : - eliminato utensile di tipo additive (si continua ad usare una fresa cilindrica) --- EMkToolConst.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/EMkToolConst.h b/EMkToolConst.h index c421f92..51e5103 100644 --- a/EMkToolConst.h +++ b/EMkToolConst.h @@ -27,7 +27,6 @@ const int TF_MORTISE = 0x0800 ; // 2048 const int TF_CHISEL = 0x1000 ; // 4096 const int TF_WATERJET = 0x2000 ; // 8192 const int TF_COMPO = 0x4000 ; // 16384 -const int TF_ADDITIVE = 0x8000 ; // 32768 // Costante per tutte le famiglie const int TF_ALL = 0xFF00 ; // Tipologie di utensili @@ -43,8 +42,7 @@ enum ToolType { TT_MORTISE_STD = TF_MORTISE + 0, // 2048 TT_CHISEL_STD = TF_CHISEL + 0, // 4096 TT_WATERJET = TF_WATERJET + 0, // 8192 - TT_COMPO = TF_COMPO + 0, // 16384 - TT_ADDITIVE = TF_ADDITIVE + 0 // 32768 + TT_COMPO = TF_COMPO + 0 // 16384 } ; // Controllo tipo valido bool inline IsValidToolType( int nType)