Include :

- aggiornamenti.
This commit is contained in:
Dario Sassi
2015-11-19 07:38:18 +00:00
parent 50abc1ee16
commit c04c80dc19
4 changed files with 26 additions and 2 deletions
+13
View File
@@ -252,6 +252,19 @@ LuaSetParam( lua_State* L, double dPar)
return true ;
}
//----------------------------------------------------------------------------
inline bool
LuaSetParam( lua_State* L, const char* szPar)
{
try {
lua_pushstring( L, szPar) ;
}
catch ( ...) {
return false ;
}
return true ;
}
//----------------------------------------------------------------------------
inline bool
LuaSetParam( lua_State* L, const std::string& sPar)
+2
View File
@@ -538,6 +538,8 @@ EIN_EXPORT BOOL __stdcall EgtSimMove( void) ;
EIN_EXPORT BOOL __stdcall EgtSimHome( void) ;
EIN_EXPORT BOOL __stdcall EgtSimSetStep( double dStep) ;
EIN_EXPORT BOOL __stdcall EgtSimStop( void) ;
// Generation
EIN_EXPORT BOOL __stdcall EgtGenerate( const wchar_t* wsCncFile, const wchar_t* wsInfo) ;
// Scene
EIN_EXPORT BOOL __stdcall EgtInitScene( HWND hWnd, int nDriver, BOOL b2Buff, int nColorBits, int nDepthBits) ;
+5 -1
View File
@@ -140,6 +140,10 @@ class __declspec( novtable) IMachMgr
virtual bool SetMachiningParam( int nType, const std::string& sVal) = 0 ;
virtual bool SetMachiningGeometry( const SELVECTOR& vIds) = 0 ;
virtual bool MachiningApply( 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 ;
virtual bool GetMachiningParam( int nType, std::string& sVal) const = 0 ;
// Simulation
virtual bool SimStart( void) = 0 ;
virtual bool SimMove( void) = 0 ;
@@ -147,7 +151,7 @@ class __declspec( novtable) IMachMgr
virtual bool SimSetStep( double dStep) = 0 ;
virtual bool SimStop( void) = 0 ;
// Generation
virtual bool Generate( const std::string& sCncFile) = 0 ;
virtual bool Generate( const std::string& sCncFile, const std::string& sInfo) = 0 ;
// Machine Calc
virtual bool SetCalcTable( const std::string& sTable) = 0 ;
virtual bool SetCalcTool( const std::string& sTool, const std::string& sHead, int nExit) = 0 ;
+6 -1
View File
@@ -20,6 +20,7 @@
#include "/EgtDev/Include/EGkSelection.h"
#define NOMINMAX
#include <windows.h>
#undef GetClassName
class LuaMgr ;
@@ -561,6 +562,10 @@ EXE_EXPORT bool ExeSetMachiningParam( int nType, double dVal) ;
EXE_EXPORT bool ExeSetMachiningParam( int nType, const std::string& sVal) ;
EXE_EXPORT bool ExeSetMachiningGeometry( const SELVECTOR& vIds) ;
EXE_EXPORT bool ExeApplyMachining( 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) ;
EXE_EXPORT bool ExeGetMachiningParam( int nType, std::string& sVal) ;
// Simulation
EXE_EXPORT bool ExeSimStart( void) ;
EXE_EXPORT bool ExeSimMove( void) ;
@@ -569,7 +574,7 @@ EXE_EXPORT bool ExeSimGetAxisInfoPos( int nI, std::string& sName, double& dVal)
EXE_EXPORT bool ExeSimSetStep( double dStep) ;
EXE_EXPORT bool ExeSimStop( void) ;
// Generation
EXE_EXPORT bool ExeGenerate( const std::string& sCncFile) ;
EXE_EXPORT bool ExeGenerate( const std::string& sCncFile, const std::string& sInfo) ;
// Machine Calc
EXE_EXPORT bool ExeSetCalcTable( const std::string& sTable) ;
EXE_EXPORT bool ExeSetCalcTool( const std::string& sTool, const std::string& sHead, int nExit) ;