From 32ede62dc8af2337fd7757376bec473917ee996e Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 25 Nov 2024 15:01:26 +0100 Subject: [PATCH] =?UTF-8?q?Include=20:=20-=20aggiunta=20costante=20per=20e?= =?UTF-8?q?ntit=C3=A0=20non=20lavorate=20-=20aggiornamento=20prototipi.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EMkMachMgr.h | 4 +++- EMkMachiningGeoConst.h | 6 ++++-- EXeExecutor.h | 1 + 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/EMkMachMgr.h b/EMkMachMgr.h index a4a9ab8..86504d3 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- // EgalTech 2015-2024 //---------------------------------------------------------------------------- -// File : EMkMachMgr.h Data : 22.04.24 Versione : 2.6d4 +// File : EMkMachMgr.h Data : 25.11.24 Versione : 2.6k5 // Contenuto : Dichiarazione della interfaccia IMachMgr. // // @@ -18,6 +18,7 @@ // 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. +// 25.11.24 DS Aggiunta in interfaccia GetMachiningSkippedGeometry. // //---------------------------------------------------------------------------- @@ -271,6 +272,7 @@ class __declspec( novtable) IMachMgr virtual bool GetMachiningParam( int nType, double& dVal) const = 0 ; virtual bool GetMachiningParam( int nType, std::string& sVal) const = 0 ; virtual bool GetMachiningGeometry( SELVECTOR& vIds) const = 0 ; + virtual bool GetMachiningSkippedGeometry( SELVECTOR& vIds) const = 0 ; virtual bool IsMachiningEmpty( void) const = 0 ; virtual bool GetMachiningStartPoint( Point3d& ptStart) const = 0 ; virtual bool GetMachiningEndPoint( Point3d& ptEnd) const = 0 ; diff --git a/EMkMachiningGeoConst.h b/EMkMachiningGeoConst.h index 49e9d21..c796322 100644 --- a/EMkMachiningGeoConst.h +++ b/EMkMachiningGeoConst.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2016-2016 +// EgalTech 2016-2024 //---------------------------------------------------------------------------- -// File : EmkMachiningGeoConst.h Data : 06.01.16 Versione : 1.6l6 +// File : EmkMachiningGeoConst.h Data : 25.11.24 Versione : 2.6k5 // Contenuto : Costanti per le geometrie delle lavorazioni. // // @@ -26,6 +26,8 @@ static std::string KEY_STRAIGHT = "STR" ; static std::string KEY_NUM = "NUM" ; // Chiave per stato di aggiornamento di lavorazione static std::string KEY_STAT = "STAT" ; +// Chiave per elenco identificativi non lavorati +static std::string KEY_SKIPS = "SKIPS" ; // Sottogruppi delle lavorazioni static std::string MCH_AUX = "AUX" ; static std::string MCH_AUXVIEW = "AVIEW" ; diff --git a/EXeExecutor.h b/EXeExecutor.h index eb9733d..e29ab4a 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -1221,6 +1221,7 @@ EXE_EXPORT bool ExeGetMachiningParam( int nType, int& nVal) ; EXE_EXPORT bool ExeGetMachiningParam( int nType, double& dVal) ; EXE_EXPORT bool ExeGetMachiningParam( int nType, std::string& sVal) ; EXE_EXPORT bool ExeGetMachiningGeometry( SELVECTOR& vIds) ; +EXE_EXPORT bool ExeGetMachiningSkippedGeometry( SELVECTOR& vIds) ; EXE_EXPORT bool ExeIsMachiningEmpty( void) ; EXE_EXPORT bool ExeGetMachiningStartPoint( Point3d& ptStart) ; EXE_EXPORT bool ExeGetMachiningEndPoint( Point3d& ptEnd) ;