From 8a4c550e2e7c734afd40299ef6d38d461ee84edf Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Mon, 12 May 2025 09:45:40 +0200 Subject: [PATCH] Include : - aggiornamento prototipi. --- EInAPI.h | 14 ++++++------- EMkMachMgr.h | 12 +++++------ EXeConst.h | 55 ++++++++++++++++++++++++++++----------------------- EXeExecutor.h | 14 ++++++------- 4 files changed, 50 insertions(+), 45 deletions(-) diff --git a/EInAPI.h b/EInAPI.h index 03c7fb0..5333689 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -774,7 +774,7 @@ EIN_EXPORT int __stdcall EgtAddRawPart( const double ptOrig[3], EIN_EXPORT BOOL __stdcall EgtModifyRawPart( int nRawId, const double ptOrig[3], double dLength, double dWidth, double dHeight, const int vCol[4]) ; EIN_EXPORT BOOL __stdcall EgtModifyRawPart2( int nRawId, int nCrvId, - double dOverMat, double dZmin, double dHeight, const int vCol[4]) ; + double dOverMat, double dHeight, const int vCol[4]) ; EIN_EXPORT BOOL __stdcall EgtModifyRawPartSize( int nRawId, double dLength, double dWidth, double dHeight) ; EIN_EXPORT BOOL __stdcall EgtModifyRawPartHeight( int nRawId, double dHeight) ; EIN_EXPORT BOOL __stdcall EgtKeepRawPart( int nRawId, int nSouPhase) ; @@ -898,16 +898,16 @@ EIN_EXPORT int __stdcall EgtGetFirstOperation( void) ; EIN_EXPORT int __stdcall EgtGetNextOperation( int nId) ; EIN_EXPORT int __stdcall EgtGetLastOperation( void) ; EIN_EXPORT int __stdcall EgtGetPrevOperation( int nId) ; -EIN_EXPORT int __stdcall EgtGetFirstActiveOperation( void) ; -EIN_EXPORT int __stdcall EgtGetNextActiveOperation( int nId) ; -EIN_EXPORT int __stdcall EgtGetLastActiveOperation( void) ; -EIN_EXPORT int __stdcall EgtGetPrevActiveOperation( int nId) ; +EIN_EXPORT int __stdcall EgtGetFirstActiveOperation( bool bNeedMachNotEmpty) ; +EIN_EXPORT int __stdcall EgtGetNextActiveOperation( int nId, bool bNeedMachNotEmpty) ; +EIN_EXPORT int __stdcall EgtGetLastActiveOperation( bool bNeedMachNotEmpty) ; +EIN_EXPORT int __stdcall EgtGetPrevActiveOperation( int nId, bool bNeedMachNotEmpty) ; EIN_EXPORT int __stdcall EgtGetOperationType( int nId) ; EIN_EXPORT int __stdcall EgtGetOperationPhase( int nId) ; EIN_EXPORT BOOL __stdcall EgtSetOperationName( int nId, const wchar_t* wsName) ; EIN_EXPORT BOOL __stdcall EgtGetOperationName( int nId, wchar_t*& wsName) ; EIN_EXPORT int __stdcall EgtGetOperationId( const wchar_t* wsName) ; -EIN_EXPORT BOOL __stdcall EgtIsOperationEmpty( int nId) ; +EIN_EXPORT BOOL __stdcall EgtIsOperationEmpty( int nId, int nEmptyType) ; EIN_EXPORT BOOL __stdcall EgtRemoveOperation( int nId) ; EIN_EXPORT BOOL __stdcall EgtRemoveAllPhaseOperations( int nPhase) ; EIN_EXPORT BOOL __stdcall EgtRemoveAllOperations( void) ; @@ -949,7 +949,7 @@ EIN_EXPORT BOOL __stdcall EgtGetMachiningParamInt( int nType, int* pnVal) ; EIN_EXPORT BOOL __stdcall EgtGetMachiningParamDouble( int nType, double* pdVal) ; EIN_EXPORT BOOL __stdcall EgtGetMachiningParamString( int nType, wchar_t*& wsVal) ; EIN_EXPORT BOOL __stdcall EgtGetMachiningGeometry( int nInd, int* pnId, int* pnSub) ; -EIN_EXPORT BOOL __stdcall EgtIsMachiningEmpty( void) ; +EIN_EXPORT BOOL __stdcall EgtIsMachiningEmpty( int nEmptyType) ; EIN_EXPORT BOOL __stdcall EgtGetMachiningStartPoint( double ptP[3]) ; EIN_EXPORT BOOL __stdcall EgtGetMachiningEndPoint( double ptP[3]) ; EIN_EXPORT BOOL __stdcall EgtApplyAllMachinings( BOOL bRecalc, BOOL bStopOnFirstErr, wchar_t*& wsErrList) ; diff --git a/EMkMachMgr.h b/EMkMachMgr.h index be005c6..8125e13 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -219,16 +219,16 @@ class __declspec( novtable) IMachMgr virtual int GetNextOperation( int nId) const = 0 ; virtual int GetLastOperation( void) const = 0 ; virtual int GetPrevOperation( int nId) const = 0 ; - virtual int GetFirstActiveOperation( void) const = 0 ; - virtual int GetNextActiveOperation( int nId) const = 0 ; - virtual int GetLastActiveOperation( void) const = 0 ; - virtual int GetPrevActiveOperation( int nId) const = 0 ; + virtual int GetFirstActiveOperation( bool bNeedMachNotEmpty = false) const = 0 ; + virtual int GetNextActiveOperation( int nId, bool bNeedMachNotEmpty = false) const = 0 ; + virtual int GetLastActiveOperation( bool bNeedMachNotEmpty = false) const = 0 ; + virtual int GetPrevActiveOperation( int nId, bool bNeedMachNotEmpty = false) const = 0 ; virtual int GetOperationType( int nId) const = 0 ; virtual int GetOperationPhase( int nId) const = 0 ; virtual bool SetOperationName( int nId, const std::string& sName) = 0 ; virtual std::string GetOperationName( int nId) const = 0 ; virtual int GetOperationId( const std::string& sName) const = 0 ; - virtual bool IsOperationEmpty( int nId) const = 0 ; + virtual bool IsOperationEmpty( int nId, int nEmptyType = 0) const = 0 ; virtual bool RemoveOperation( int nId) = 0 ; virtual bool RemoveAllPhaseOperations( int nPhase) = 0 ; virtual bool RemoveAllOperations( void) = 0 ; @@ -274,7 +274,7 @@ class __declspec( novtable) IMachMgr 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 IsMachiningEmpty( int nEmptyType = 0) const = 0 ; virtual bool GetMachiningStartPoint( Point3d& ptStart) const = 0 ; virtual bool GetMachiningEndPoint( Point3d& ptEnd) const = 0 ; // CL Entities Interrogations diff --git a/EXeConst.h b/EXeConst.h index 1317b69..c209fe9 100644 --- a/EXeConst.h +++ b/EXeConst.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2014-2022 +// EgalTech 2014-2025 //---------------------------------------------------------------------------- -// File : EXeConst.h Data : 11.01.22 Versione : 2.4a +// File : EXeConst.h Data : 11.05.25 Versione : 2.7e2 // Contenuto : Costanti generali per EgtExecuter. // // @@ -86,6 +86,7 @@ enum RuledType{ RUL_TYPE_ISOPAR = 0, // come ISurfTrimesh::RLT_ISOPAR RUL_TYPE_MINDIST = 1, // come ISurfTrimesh::RLT_MINDIST RUL_TYPE_ISOPAR_SMOOTH = 2} ; // come ISurfTrimesh::RLT_ISOPAR_SMOOTH +//----------------- Costanti per classificazione di curve rispetto a regioni --------- enum CrvRegClass { CRC_NULL = 0, CRC_IN = 1, CRC_OUT = 2, @@ -98,6 +99,10 @@ enum RSCapType { RSCT_NONE = 0, // come RSCAP_NONE RSCT_ROUND = 2, // come RSCAP_ROUND RSCT_BEVEL = 3} ; // come RSCAP_BEVEL +//----------------- Costanti tipo Zoom ----------------------------------------- +enum ZoomType { ZM_ALL = 1, // zoom tutto + ZM_IN = 2, // ingrandisci + ZM_OUT = 3} ; // rimpicciolisci //----------------- Costanti flag import CNC ----------------------------------- enum EicFlag { EIC_FLAG_NONE = 0, // come EImCncFlag::EICFLAG_NONE @@ -112,36 +117,36 @@ enum EibFlag { EIB_FLAG_NONE = 0, // come EImBtlFlag::EIBFLAG_NONE EIB_FLAG_SPECIAL_TRIM = 4} ; // come EImBtlFlag::EIBFLAG_SPECIAL_TRIM //----------------- Costanti tipo costruzione pezzi piani ---------------------- -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 +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 //----------------- 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 +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 //----------------- Costanti risultato verifica tagli lama allungati ----------- -enum CarRes{ CAR_INTERF = 0, // interferiscono entrambi gli allungamenti - CAR_LI_OK = 1, // allungamento inizio va bene - CAR_LO_OK = 2, // allungameno uscita va bene - CAR_LI_LO_OK = 1 + 2} ; // entrambi gli allungamenti vanno bene +enum CarRes { CAR_INTERF = 0, // interferiscono entrambi gli allungamenti + CAR_LI_OK = 1, // allungamento inizio va bene + CAR_LO_OK = 2, // allungameno uscita va bene + CAR_LI_LO_OK = 1 + 2} ; // entrambi gli allungamenti vanno bene -//----------------- Costanti tipo Zoom ----------------------------------------- -enum ZoomType { ZM_ALL = 1, // zoom tutto - ZM_IN = 2, // ingrandisci - ZM_OUT = 3} ; // rimpicciolisci +//----------------- Costanti tipo controllo lavorazione vuota ------------------- +enum EmptyNeed { EMP_NEED_GEOM = 0, // necessaria solo presenza geometria di definizione + EMP_NEED_ONE_TP_OK = 1, // almeno un percorso utensile non vuoto + EMP_NEED_ALL_TP_OK = 2} ; // tutti i percorsi utensile non vuoti //----------------- Costanti errore simulatore in cieco ------------------------ -enum SimHideErr { SHE_NONE = 0, // nessun errore - SHE_INIT = 1, // errore nell'avvio della simulazione - SHE_OUTSTROKE = 2, // errore di extracorsa - SHE_DIR_ERR = 3, // errore direzione utensile non raggiungibile - SHE_COLLISION = 4, // errore collisione testa-pezzo - SHE_SPECIAL = 5, // errore speciale/custom - SHE_GENERAL = 6} ; // errore generico +enum SimHideErr { SHE_NONE = 0, // nessun errore + SHE_INIT = 1, // errore nell'avvio della simulazione + SHE_OUTSTROKE = 2, // errore di extracorsa + SHE_DIR_ERR = 3, // errore direzione utensile non raggiungibile + SHE_COLLISION = 4, // errore collisione testa-pezzo + SHE_SPECIAL = 5, // errore speciale/custom + SHE_GENERAL = 6} ; // errore generico //----------------- Costanti per sostituzione direttorio e nome progetto -------------------- const std::string SUB_PROJECT_DIR = "%PRJDIR%" ; diff --git a/EXeExecutor.h b/EXeExecutor.h index a3e3a1e..36ee450 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -1068,7 +1068,7 @@ EXE_EXPORT bool ExeIsRawPart( int nRawId) ; EXE_EXPORT int ExeAddRawPart( Point3d ptOrig, double dLength, double dWidth, double dHeight, Color cCol) ; EXE_EXPORT int ExeAddRawPartWithPart( int nPartId, int nCrvId, double dOverMat, Color cCol) ; EXE_EXPORT bool ExeModifyRawPart( int nRawId, Point3d ptOrig, double dLength, double dWidth, double dHeight, Color cCol) ; -EXE_EXPORT bool ExeModifyRawPart( int nRawId, int nCrvId, double dOverMat, double dZmin, double dHeight, Color cCol) ; +EXE_EXPORT bool ExeModifyRawPart( int nRawId, int nCrvId, double dOverMat, double dHeight, Color cCol) ; EXE_EXPORT bool ExeModifyRawPartSize( int nRawId, double dLength, double dWidth, double dHeight) ; EXE_EXPORT bool ExeModifyRawPartHeight( int nRawId, double dHeight) ; EXE_EXPORT bool ExeKeepRawPart( int nRawId, int nSouPhase) ; @@ -1200,16 +1200,16 @@ EXE_EXPORT int ExeGetFirstOperation( void) ; EXE_EXPORT int ExeGetNextOperation( int nId) ; EXE_EXPORT int ExeGetLastOperation( void) ; EXE_EXPORT int ExeGetPrevOperation( int nId) ; -EXE_EXPORT int ExeGetFirstActiveOperation( void) ; -EXE_EXPORT int ExeGetNextActiveOperation( int nId) ; -EXE_EXPORT int ExeGetLastActiveOperation( void) ; -EXE_EXPORT int ExeGetPrevActiveOperation( int nId) ; +EXE_EXPORT int ExeGetFirstActiveOperation( bool bNeedMachNotEmpty = false) ; +EXE_EXPORT int ExeGetNextActiveOperation( int nId, bool bNeedMachNotEmpty = false) ; +EXE_EXPORT int ExeGetLastActiveOperation( bool bNeedMachNotEmpty = false) ; +EXE_EXPORT int ExeGetPrevActiveOperation( int nId, bool bNeedMachNotEmpty = false) ; EXE_EXPORT int ExeGetOperationType( int nId) ; EXE_EXPORT int ExeGetOperationPhase( int nId) ; EXE_EXPORT bool ExeSetOperationName( int nId, const std::string& sName) ; EXE_EXPORT bool ExeGetOperationName( int nId, std::string& sName) ; EXE_EXPORT int ExeGetOperationId( const std::string& sName) ; -EXE_EXPORT bool ExeIsOperationEmpty( int nId) ; +EXE_EXPORT bool ExeIsOperationEmpty( int nId, int nEmptyType = 0) ; EXE_EXPORT bool ExeRemoveOperation( int nId) ; EXE_EXPORT bool ExeRemoveAllPhaseOperations( int nPhase) ; EXE_EXPORT bool ExeRemoveAllOperations( void) ; @@ -1253,7 +1253,7 @@ 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 ExeIsMachiningEmpty( int nEmptyType) ; EXE_EXPORT bool ExeGetMachiningStartPoint( Point3d& ptStart) ; EXE_EXPORT bool ExeGetMachiningEndPoint( Point3d& ptEnd) ; EXE_EXPORT bool ExeApplyAllMachinings( bool bRecalc, bool bStopOnFirstErr, std::string& sErrList) ;