From 6540be77b6e70fe6cad941ec4b7054632dbf74eb Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 8 Feb 2016 10:48:43 +0000 Subject: [PATCH] Include : - aggiornamenti. --- EInAPI.h | 3 ++- EMkMachiningGeoConst.h | 4 +++- EXeConst.h | 8 +++++++- EXeExecutor.h | 4 +++- 4 files changed, 15 insertions(+), 4 deletions(-) diff --git a/EInAPI.h b/EInAPI.h index baf135d..7ee721c 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -477,7 +477,8 @@ EIN_EXPORT BOOL __stdcall EgtMoveToSnapPointOnCollision( int nId[], int nCount, EIN_EXPORT void __stdcall EgtSaveCollInfo( void) ; EIN_EXPORT void __stdcall EgtRestoreCollInfo( void) ; EIN_EXPORT BOOL __stdcall EgtGetPartClusterCenterGlob( int nId[], int nCount, double ptCen[3]) ; -EIN_EXPORT BOOL __stdcall EgtVerifyMachining( int nMchId, bool bReduced, int nRawId) ; +EIN_EXPORT BOOL __stdcall EgtVerifyMachining( int nMchId, int* pnResult) ; +EIN_EXPORT BOOL __stdcall EgtVerifyCutAsSplitting( int nMchId) ; // Machining EIN_EXPORT BOOL __stdcall EgtInitMachMgr( const wchar_t* wsMachinesDir) ; diff --git a/EMkMachiningGeoConst.h b/EMkMachiningGeoConst.h index f316c4f..b75cec2 100644 --- a/EMkMachiningGeoConst.h +++ b/EMkMachiningGeoConst.h @@ -32,8 +32,10 @@ static std::string MCH_HOME = "HOME" ; static std::string MCH_PV_CUT = "CUT" ; static std::string MCH_PV_PRE_CUT = "PRC" ; static std::string MCH_PV_POST_CUT = "POC" ; -static std::string MCH_PV_RRCUT = "RRCUT" ; static std::string MCH_PV_RCUT = "RCUT" ; +static std::string MCH_PV_RRCUT = "RRCUT" ; +static std::string MCH_PV_RLICUT = "RLICUT" ; +static std::string MCH_PV_RLOCUT = "RLOCUT" ; // Chiave info con WidthT e DeltaT lama in Preview static std::string MCH_PV_KEY_WT = "WT" ; static std::string MCH_PV_KEY_DT = "DT" ; diff --git a/EXeConst.h b/EXeConst.h index 4cebcf5..f4a2034 100644 --- a/EXeConst.h +++ b/EXeConst.h @@ -55,7 +55,13 @@ enum ApprType{ APP_LINES = 0, // come ICurve::APL_STD enum FpcType{ FPC_NGE = 0, // costruzione da pezzo Nge FPC_REGION = 1, // costruzione da regione FPC_LAYER = 2, // costruzione da layer - FPC_CLOSEDCURVE = 3}; // costruzione da curva chiusa + FPC_CLOSEDCURVE = 3} ; // costruzione da curva chiusa + +//----------------- Costanti tipo interferenza di lavorazioni piane ------------ +enum FmiType{ FMI_NONE = 0, // nessuna interferenza + FMI_LI = 1, // interferenza con attacco + FMI_RM = 2, // interferenza con lavorazione ridotta + FMI_LO = 4} ; // interferenza con uscita //----------------- Costante per sostituzione nome progetto -------------------- const std::string SUB_PROJECT_TITLE = "%PRJTITLE%" ; \ No newline at end of file diff --git a/EXeExecutor.h b/EXeExecutor.h index cbdc23a..c76ef03 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -513,7 +513,9 @@ EXE_EXPORT bool ExeMoveToSnapPointOnCollision( const INTVECTOR& vIds, bool bRedu EXE_EXPORT void ExeSaveCollInfo( void) ; EXE_EXPORT void ExeRestoreCollInfo( void) ; EXE_EXPORT bool ExeGetPartClusterCenterGlob( const INTVECTOR& vIds, Point3d& ptCen) ; -EXE_EXPORT bool ExeVerifyMachining( int nMchId, bool bReduced, int nRawId) ; +// Machining Nest +EXE_EXPORT bool ExeVerifyMachining( int nMchId, int& nResult) ; +EXE_EXPORT bool ExeVerifyCutAsSplitting( int nMchId) ; // Machining EXE_EXPORT bool ExeInitMachMgr( const std::string& sMachinesDir) ;