From 65fd3dc1a32da503f17d4ce8f28901dd80078446 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Sat, 17 Jun 2017 17:15:31 +0000 Subject: [PATCH] Include : - aggiornamento prototipi. --- EInAPI.h | 4 ++++ EMkMachMgr.h | 2 ++ EXeExecutor.h | 3 +++ 3 files changed, 9 insertions(+) diff --git a/EInAPI.h b/EInAPI.h index e386971..fb78340 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -687,6 +687,7 @@ EIN_EXPORT BOOL __stdcall EgtRemoveOperationHome( int nId) ; // Dispositions EIN_EXPORT int __stdcall EgtGetPhaseDisposition( int nPhase) ; EIN_EXPORT BOOL __stdcall EgtSpecialApplyDisposition( int nId, BOOL bRecalc) ; +EIN_EXPORT BOOL __stdcall EgtSpecialUpdateDisposition( int nId) ; // Machinings EIN_EXPORT int __stdcall EgtAddMachining( const wchar_t* wsName, const wchar_t* wsMachining) ; EIN_EXPORT int __stdcall EgtCreateMachining( const wchar_t* wsName, int nMchType, const wchar_t* wsTool) ; @@ -700,12 +701,15 @@ EIN_EXPORT BOOL __stdcall EgtSetMachiningParamString( int nType, const wchar_t* EIN_EXPORT BOOL __stdcall EgtSetMachiningGeometry( int nNumId, const int nIds[], const int nSubs[]) ; EIN_EXPORT BOOL __stdcall EgtPreviewMachining( BOOL bRecalc) ; EIN_EXPORT BOOL __stdcall EgtApplyMachining( BOOL bRecalc) ; +EIN_EXPORT BOOL __stdcall EgtUpdateMachining( void) ; EIN_EXPORT BOOL __stdcall EgtGetMachiningParamBool( int nType, BOOL* pbVal) ; 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 EgtApplyAllMachinings( BOOL bStopOnFirstErr, wchar_t*& wsErrList) ; +EIN_EXPORT BOOL __stdcall EgtUpdateAllMachinings( BOOL bStopOnFirstErr, wchar_t*& wsErrList) ; // Simulation EIN_EXPORT BOOL __stdcall EgtSimStart( BOOL bFirst) ; EIN_EXPORT BOOL __stdcall EgtSimMove( int* pnStatus) ; diff --git a/EMkMachMgr.h b/EMkMachMgr.h index b41cf3a..0b5edb1 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -192,6 +192,7 @@ class __declspec( novtable) IMachMgr // Operations : dispositions virtual int GetPhaseDisposition( int nPhase) const = 0 ; virtual bool DispositionSpecialApply( int nId, bool bRecalc) = 0 ; + virtual bool DispositionSpecialUpdate( int nId) = 0 ; // Operations : machinings virtual int AddMachining( const std::string& sName, const std::string& sMachining) = 0 ; virtual int AddMachining( const std::string& sName, int nMchType, const std::string& sTool) = 0 ; @@ -207,6 +208,7 @@ class __declspec( novtable) IMachMgr virtual bool ExistsMachiningPreview( void) = 0 ; virtual bool RemoveMachiningPreview( void) = 0 ; virtual bool MachiningApply( bool bRecalc) = 0 ; + virtual bool MachiningUpdate( void) = 0 ; virtual bool GetMachiningParam( int nType, bool& bVal) const = 0 ; virtual bool GetMachiningParam( int nType, int& dVal) const = 0 ; virtual bool GetMachiningParam( int nType, double& dVal) const = 0 ; diff --git a/EXeExecutor.h b/EXeExecutor.h index 20bba02..e06f229 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -740,6 +740,7 @@ EXE_EXPORT bool ExeRemoveOperationHome( int nId) ; // Dispositions EXE_EXPORT int ExeGetPhaseDisposition( int nPhase) ; EXE_EXPORT bool ExeSpecialApplyDisposition( int nId, bool bRecalc) ; +EXE_EXPORT bool ExeSpecialUpdateDisposition( int nId) ; // Machinings EXE_EXPORT int ExeAddMachining( const std::string& sName, const std::string& sMachining) ; EXE_EXPORT int ExeAddMachining( const std::string& sName, int nMchType, const std::string& sTool) ; @@ -753,6 +754,7 @@ EXE_EXPORT bool ExeSetMachiningParam( int nType, const std::string& sVal) ; EXE_EXPORT bool ExeSetMachiningGeometry( const SELVECTOR& vIds) ; EXE_EXPORT bool ExePreviewMachining( bool bRecalc) ; EXE_EXPORT bool ExeApplyMachining( bool bRecalc) ; +EXE_EXPORT bool ExeUpdateMachining( void) ; EXE_EXPORT bool ExeGetMachiningParam( int nType, bool& bVal) ; EXE_EXPORT bool ExeGetMachiningParam( int nType, int& nVal) ; EXE_EXPORT bool ExeGetMachiningParam( int nType, double& dVal) ; @@ -761,6 +763,7 @@ EXE_EXPORT bool ExeGetMachiningGeometry( SELVECTOR& vIds) ; EXE_EXPORT bool ExeIsMachiningEmpty( void) ; EXE_EXPORT bool ExeGetMachiningStartPoint( Point3d& ptStart) ; EXE_EXPORT bool ExeGetMachiningEndPoint( Point3d& ptEnd) ; +EXE_EXPORT bool ExeApplyAllMachinings( bool bStopOnFirstErr, std::string& sErrList) ; EXE_EXPORT bool ExeUpdateAllMachinings( bool bStopOnFirstErr, std::string& sErrList) ; // Simulation EXE_EXPORT bool ExeSimStart( bool bFirst) ;