From d3d4cfef321248246df358c4f1b6bdd1bca94111 Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Fri, 2 Mar 2018 08:10:57 +0000 Subject: [PATCH] Include : - aggiornamento prototipi per SimSetUiStatus. --- EInAPI.h | 1 + EMkMachMgr.h | 1 + EMkSimuGenConst.h | 23 +++++++++++++++-------- EXeExecutor.h | 1 + 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/EInAPI.h b/EInAPI.h index ac64e2f..66a54cd 100644 --- a/EInAPI.h +++ b/EInAPI.h @@ -729,6 +729,7 @@ EIN_EXPORT BOOL __stdcall EgtSimGetToolInfo( wchar_t*& wsTool, double* pdSpeed) EIN_EXPORT BOOL __stdcall EgtSimGetOperationInfo( wchar_t*& wsName, int* pnType) ; EIN_EXPORT BOOL __stdcall EgtSimGetMoveInfo( int* pnGmove, double* pdFeed) ; EIN_EXPORT BOOL __stdcall EgtSimSetStep( double dStep) ; +EIN_EXPORT BOOL __stdcall EgtSimSetUiStatus( int nUiStatus) ; EIN_EXPORT BOOL __stdcall EgtSimStop( void) ; // Generation EIN_EXPORT BOOL __stdcall EgtGenerate( const wchar_t* wsCncFile, const wchar_t* wsInfo) ; diff --git a/EMkMachMgr.h b/EMkMachMgr.h index 1e961de..109eace 100644 --- a/EMkMachMgr.h +++ b/EMkMachMgr.h @@ -230,6 +230,7 @@ class __declspec( novtable) IMachMgr virtual bool SimGetOperationInfo( std::string& sName, int& nType) const = 0 ; virtual bool SimGetMoveInfo( int& nGmove, double& dFeed) const = 0 ; virtual bool SimSetStep( double dStep) = 0 ; + virtual bool SimSetUiStatus( int nUiStatus) = 0 ; virtual bool SimGoHome( void) = 0 ; virtual bool SimStop( void) = 0 ; // Generation diff --git a/EMkSimuGenConst.h b/EMkSimuGenConst.h index 504fa8c..0b31912 100644 --- a/EMkSimuGenConst.h +++ b/EMkSimuGenConst.h @@ -1,7 +1,7 @@ //---------------------------------------------------------------------------- -// EgalTech 2015-2015 +// EgalTech 2015-2018 //---------------------------------------------------------------------------- -// File : EmkSimuGenConst.h Data : 22.11.15 Versione : 1.6k8 +// File : EmkSimuGenConst.h Data : 01.03.18 Versione : 1.9c2 // Contenuto : Costanti per simulazione e generazione. // // @@ -14,12 +14,19 @@ #pragma once //------------------------ Stato del movimento di simulazione ----------------- -enum SimuStat { MCH_SIM_OK = 0, - MCH_SIM_END_STEP = 1, - MCH_SIM_END = 2, - MCH_SIM_OUTSTROKE = 3, - MCH_SIM_DIR_ERR = 4, - MCH_SIM_ERR = 5} ; +enum SimStat { MCH_SIM_OK = 0, + MCH_SIM_END_STEP = 1, + MCH_SIM_END = 2, + MCH_SIM_OUTSTROKE = 3, + MCH_SIM_DIR_ERR = 4, + MCH_SIM_ERR = 5} ; + +//------------------------ Stato della simulazione per l'utente --------------- +enum SimUiStat { MCH_UISIM_NULL = 0, + MCH_UISIM_STOP = 1, + MCH_UISIM_PLAY = 2, + MCH_UISIM_STEP = 3, + MCH_UISIM_PAUSE = 4} ; //------------------------ Stato di visualizzazione della macchina ------------ enum MachLook { MCH_LOOK_NONE = -1, diff --git a/EXeExecutor.h b/EXeExecutor.h index fd91f07..fcf844a 100644 --- a/EXeExecutor.h +++ b/EXeExecutor.h @@ -809,6 +809,7 @@ EXE_EXPORT bool ExeSimGetToolInfo( std::string& sName, double& dSpeed) ; EXE_EXPORT bool ExeSimGetOperationInfo( std::string& sName, int& nType) ; EXE_EXPORT bool ExeSimGetMoveInfo( int& nGmove, double& dFeed) ; EXE_EXPORT bool ExeSimSetStep( double dStep) ; +EXE_EXPORT bool ExeSimSetUiStatus( int nUiStatus) ; EXE_EXPORT bool ExeSimStop( void) ; // Generation EXE_EXPORT bool ExeGenerate( const std::string& sCncFile, const std::string& sInfo) ;