From cda56e4f1e0552b7826f194c3f44f6fb88007d65 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Tue, 2 Apr 2024 15:34:57 +0200 Subject: [PATCH] Include : - aggiornamento prototipi. --- EMkMachMgr.h | 9 ++++++--- EMkMachiningConst.h | 8 +++++--- EMkMachiningGeoConst.h | 2 ++ EXeExecutor.h | 6 ++++-- EgtKeyCodes.h | 2 +- 5 files changed, 18 insertions(+), 9 deletions(-) diff --git a/EMkMachMgr.h b/EMkMachMgr.h index bf72fd5..1e20530 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2015-2023 +// EgalTech 2015-2024 //---------------------------------------------------------------------------- -// File : EMkMachMgr.h Data : 28.10.23 Versione : 2.5j4 +// File : EMkMachMgr.h Data : 30.03.24 Versione : 2.6d1 // Contenuto : Dichiarazione della interfaccia IMachMgr. // // @@ -15,6 +15,7 @@ // 21.09.22 DS Aggiunta in interfaccia GetAxisOffset. // 25.08.23 DS Aggiunta in interfaccia CopyMachGroup. // 28.10.23 DS Aggiunte in interfaccia GetClEntAxesVal, GetToolSetupPosInCurrSetup e GetAllCurrAxesName. +// 30.03.24 DS Aggiunte in interfaccia GetAllAxesNames e GetCalcTable. // //---------------------------------------------------------------------------- @@ -288,9 +289,10 @@ class __declspec( novtable) IMachMgr // Machine Calc virtual bool SetCalcTable( const std::string& sTable) = 0 ; virtual bool SetCalcTool( const std::string& sTool, const std::string& sHead, int nExit) = 0 ; - virtual bool GetAllCurrAxesName( STRVECTOR& vAxName) const = 0 ; + virtual bool GetAllCurrAxesNames( STRVECTOR& vAxName) const = 0 ; virtual bool SetRotAxisBlock( const std::string& sAxis, double dVal) = 0 ; virtual bool GetRotAxisBlocked( int nInd, std::string& sAxis, double& dVal) const = 0 ; + virtual bool GetCalcTable( std::string& sTable) const = 0 ; virtual bool GetCalcTool( std::string& sTool) const = 0 ; virtual bool GetCalcHead( std::string& sHead) const = 0 ; virtual bool GetCalcExit( int& nExit) const = 0 ; @@ -331,6 +333,7 @@ class __declspec( novtable) IMachMgr virtual bool ResetAxisPos( const std::string& sAxis) = 0 ; virtual bool ResetAllAxesPos( void) = 0 ; virtual bool GetAllTablesNames( STRVECTOR& vNames) const = 0 ; + virtual bool GetAllAxesNames( STRVECTOR& vNames) const = 0 ; virtual bool GetAllHeadsNames( STRVECTOR& vNames) const = 0 ; virtual bool GetAllTcPosNames( STRVECTOR& vNames) const = 0 ; virtual bool LoadTool( const std::string& sHead, int nExit, const std::string& sTool) = 0 ; diff --git a/EMkMachiningConst.h b/EMkMachiningConst.h index d65834a..ca60318 100644 --- a/EMkMachiningConst.h +++ b/EMkMachiningConst.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2015-2023 +// EgalTech 2015-2024 //---------------------------------------------------------------------------- -// File : EmkMachiningConst.h Data : 06.09.23 Versione : 2.5i1 +// File : EmkMachiningConst.h Data : 29.03.24 Versione : 2.6di1 // Contenuto : Costanti delle lavorazioni. // // @@ -13,6 +13,7 @@ // 09.11.20 DS Agg. MPA_SIDEANGFEED e MPA_STEPLAST. // 04.02.22 DS Agg. MPA_EPICYCLESRAD e MPA_EPICYCLESDIST. // 06.09.23 DS Agg. 5AxMachining. +// 29.03.24 DS Agg. MGP_APPROXLINTOL. // //---------------------------------------------------------------------------- @@ -39,7 +40,8 @@ enum MgpType { MGP_NONE = 0, MGP_EXTSAWARCMINRAD = ( MGP_DOU + 4), MGP_INTSAWARCMAXSIDEANG =( MGP_DOU + 5), MGP_SAFEAGGRBOTTZ = ( MGP_DOU + 6), - MGP_MAXDEPTHSAFE = ( MGP_DOU + 7)} ; + MGP_MAXDEPTHSAFE = ( MGP_DOU + 7), + MGP_APPROXLINTOL = ( MGP_DOU + 8)} ; //---------------------------------------------------------------------------- // Costanti per tipologia di split arcs diff --git a/EMkMachiningGeoConst.h b/EMkMachiningGeoConst.h index c8f42b1..49e9d21 100644 --- a/EMkMachiningGeoConst.h +++ b/EMkMachiningGeoConst.h @@ -108,6 +108,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 sottogruppo di testa per abilitarne visualizzazione in Preview (0/1 default) +static std::string KEY_PREVIEWSHOW = "PreviewShow" ; //----------------- Costanti posizione per preview utensile in lavorazione ------ enum MchToolShow { MCH_TPM_CURR = 0, diff --git a/EXeExecutor.h b/EXeExecutor.h index f49ea22..a64acec 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- // EgalTech 2015-2024 //---------------------------------------------------------------------------- -// File : EXcExecutor.h Data : 09.01.24 Versione : 2.5l6 +// File : EXcExecutor.h Data : 30.03.24 Versione : 2.6d1 // Contenuto : Interfaccia Executor. // // @@ -1198,14 +1198,16 @@ EXE_EXPORT bool ExeGetAxisType( const std::string& sAxis, bool& bLinear) ; EXE_EXPORT bool ExeGetAxisInvert( const std::string& sAxis, bool& bInvert) ; EXE_EXPORT bool ExeGetAxisOffset( const std::string& sAxis, double& dOffset) ; EXE_EXPORT bool ExeGetAllTablesNames( STRVECTOR& vNames) ; +EXE_EXPORT bool ExeGetAllAxesNames( STRVECTOR& vNames) ; EXE_EXPORT bool ExeGetAllHeadsNames( STRVECTOR& vNames) ; EXE_EXPORT bool ExeGetAllTcPosNames( STRVECTOR& vNames) ; // Machine Calc 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 ExeGetAllCurrAxesName( STRVECTOR& vAxName) ; EXE_EXPORT bool ExeSetRotAxisBlock( const std::string& sAxis, double dVal) ; +EXE_EXPORT bool ExeGetCalcTable( std::string& sTable) ; EXE_EXPORT bool ExeGetCalcTool( std::string& sTool, std::string& sHead, int& nExit) ; +EXE_EXPORT bool ExeGetAllCurrAxesNames( STRVECTOR& vAxName) ; EXE_EXPORT bool ExeGetRotAxisBlocked( int nInd, std::string& sAxis, double& dVal) ; EXE_EXPORT bool ExeGetCalcAngles( const Vector3d& vtDirT, const Vector3d& vtDirA, int& nStat, double& dAngA1, double& dAngB1, double& dAngA2, double& dAngB2) ; diff --git a/EgtKeyCodes.h b/EgtKeyCodes.h index cf707a4..c1c1078 100644 --- a/EgtKeyCodes.h +++ b/EgtKeyCodes.h @@ -25,7 +25,7 @@ //---------------------------------------------------------------------------- const int KEY_BASELIB_PROD = 207 ; -const int KEY_BASELIB_VER = 2603 ; +const int KEY_BASELIB_VER = 2604 ; const int KEY_BASELIB_LEV = 1 ; //----------------------------------------------------------------------------