diff --git a/EInAPI.h b/EInAPI.h index 931f42f..14d4d37 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -488,8 +488,8 @@ EIN_EXPORT BOOL __stdcall EgtAddPartToRawPart( int nPartId, const double ptPos[3 EIN_EXPORT BOOL __stdcall EgtRemovePartFromRawPart( int nPartId) ; // Table & Fixtures EIN_EXPORT BOOL __stdcall EgtSetTable( const wchar_t* wsTable) ; -EIN_EXPORT BOOL __stdcall EgtGetTableRef1( double ptPos[3]) ; -EIN_EXPORT BOOL __stdcall EgtGetTableArea1( int* pnAreaId) ; +EIN_EXPORT BOOL __stdcall EgtGetTableRef( int nInd, double ptPos[3]) ; +EIN_EXPORT BOOL __stdcall EgtGetTableArea( int nInd, double ptMin[3], double ptMax[3]) ; EIN_EXPORT BOOL __stdcall EgtShowOnlyTable( bool bVal) ; // Tools DataBase EIN_EXPORT BOOL __stdcall EgtTdbGetToolNewName( const wchar_t* wsName, wchar_t*& wsNewName) ; @@ -532,10 +532,13 @@ EIN_EXPORT BOOL __stdcall EgtMdbGetCurrMachiningParamDouble( int nType, double* EIN_EXPORT BOOL __stdcall EgtMdbGetCurrMachiningParamString( int nType, wchar_t*& wsVal) ; EIN_EXPORT BOOL __stdcall EgtMdbSave( void) ; EIN_EXPORT BOOL __stdcall EgtMdbGetMachiningDir( wchar_t*& wsMchDir) ; +// Operations +EIN_EXPORT BOOL __stdcall EgtRemoveAllOperations( void) ; // Simulation EIN_EXPORT BOOL __stdcall EgtSimStart( void) ; -EIN_EXPORT BOOL __stdcall EgtSimMove( void) ; +EIN_EXPORT BOOL __stdcall EgtSimMove( int* pnStatus) ; EIN_EXPORT BOOL __stdcall EgtSimHome( void) ; +EIN_EXPORT BOOL __stdcall EgtSimGetAxisInfoPos( int nI, wchar_t*& wsName, double* pdVal) ; EIN_EXPORT BOOL __stdcall EgtSimSetStep( double dStep) ; EIN_EXPORT BOOL __stdcall EgtSimStop( void) ; // Generation diff --git a/EMkMachMgr.h b/EMkMachMgr.h index 2f1b38e..190b18f 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -71,8 +71,8 @@ class __declspec( novtable) IMachMgr virtual bool RotatePartInRawPart( int nPartId, const Vector3d& vtAx, double dAngRotDeg) = 0 ; // Tables and Fixtures virtual bool SetTable( const std::string& sTable) = 0 ; - virtual bool GetTableRef1( Point3d& ptPos) = 0 ; - virtual bool GetTableArea1( int& nAreaId) = 0 ; + virtual bool GetTableRef( int nInd, Point3d& ptPos) = 0 ; + virtual bool GetTableArea( int nInd, BBox3d& b3Area) = 0 ; virtual int AddFixture( const std::string& sName, const Point3d& ptPos, double dAngRotDeg) = 0 ; virtual bool ShowOnlyTable( bool bVal) = 0 ; // Tools DataBase @@ -146,7 +146,7 @@ class __declspec( novtable) IMachMgr virtual bool GetMachiningParam( int nType, std::string& sVal) const = 0 ; // Simulation virtual bool SimStart( void) = 0 ; - virtual bool SimMove( void) = 0 ; + virtual bool SimMove( int& nStatus) = 0 ; virtual bool SimGetAxisInfoPos( int nI, std::string& sName, double& dVal) = 0 ; virtual bool SimSetStep( double dStep) = 0 ; virtual bool SimStop( void) = 0 ; diff --git a/EMkSimuGenConst.h b/EMkSimuGenConst.h new file mode 100644 index 0000000..a485f25 --- /dev/null +++ b/EMkSimuGenConst.h @@ -0,0 +1,22 @@ +//---------------------------------------------------------------------------- +// EgalTech 2015-2015 +//---------------------------------------------------------------------------- +// File : EmkSimuGenConst.h Data : 22.11.15 Versione : 1.6k8 +// Contenuto : Costanti per simulazione e generazione. +// +// +// +// Modifiche : 22.11.15 DS Creazione modulo. +// +// +//---------------------------------------------------------------------------- + +#pragma once + +//------------------------ Stato del movimento di simulazione ----------------- +enum SimuStat { MCH_SIM_OK = 0, + MCH_SIM_END = 1, + MCH_SIM_OUTSTROKE = 2, + MCH_SIM_DIR_ERR = 3, + MCH_SIM_ERR = 4} ; + \ No newline at end of file diff --git a/EXeExecutor.h b/EXeExecutor.h index c4713ad..3727bf8 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -503,8 +503,8 @@ EXE_EXPORT bool ExeTranslatePartInRawPart( int nPartId, const Vector3d& vtMove) EXE_EXPORT bool ExeRotatePartInRawPart( int nPartId, const Vector3d& vtAx, double dAngRotDeg) ; // Table & Disposition EXE_EXPORT bool ExeSetTable( const std::string& sTable) ; -EXE_EXPORT bool ExeGetTableRef1( Point3d& ptPos) ; -EXE_EXPORT bool ExeGetTableArea1( int& nAreaId) ; +EXE_EXPORT bool ExeGetTableRef( int nInd, Point3d& ptPos) ; +EXE_EXPORT bool ExeGetTableArea( int nInd, BBox3d& b3Area) ; EXE_EXPORT bool ExeShowOnlyTable( bool bVal) ; EXE_EXPORT int ExeAddFixture( const std::string& sName, const Point3d& ptPos, double dAngRotDeg) ; // Tools Database @@ -568,7 +568,7 @@ EXE_EXPORT bool ExeGetMachiningParam( int nType, double& dVal) ; EXE_EXPORT bool ExeGetMachiningParam( int nType, std::string& sVal) ; // Simulation EXE_EXPORT bool ExeSimStart( void) ; -EXE_EXPORT bool ExeSimMove( void) ; +EXE_EXPORT bool ExeSimMove( int& nStatus) ; EXE_EXPORT bool ExeSimHome( void) ; EXE_EXPORT bool ExeSimGetAxisInfoPos( int nI, std::string& sName, double& dVal) ; EXE_EXPORT bool ExeSimSetStep( double dStep) ;