Egalware/EgtExecutor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

EgtExecutor :

Browse Source 
- modifiche varie per OmagCut.
This commit is contained in:
Dario Sassi
2015-09-19 08:27:43 +00:00
parent b2469b944d
commit d7c8a61456
5 changed files with 202 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LUA_MachMgr.cpp
+106 -6
View File
@@ -15,6 +15,7 @@
#include "stdafx.h"
#include "LUA.h"
#include "/EgtDev/Include/EXeExecutor.h"
#include "/EgtDev/Include/EMkToolConst.h"
#include "/EgtDev/Include/EMkMachiningConst.h"
#include "/EgtDev/Include/EGkGdbConst.h"
#include "/EgtDev/Include/EGkLuaAux.h"
@@ -234,20 +235,20 @@ LuaGetNextRawPart( lua_State* L)
static int
LuaAddRawPart( lua_State* L)
{
// 5 parametri : Pto origine, dWidth, dLen, dH, Color
// 5 parametri : Pto origine, dLen, dWidth, dH, Color
Point3d ptOrig ;
LuaCheckParam( L, 1, ptOrig)
double dWidth ;
LuaCheckParam( L, 2, dWidth)
double dLength ;
LuaCheckParam( L, 3, dLength)
LuaCheckParam( L, 2, dLength)
double dWidth ;
LuaCheckParam( L, 3, dWidth)
double dHeight ;
LuaCheckParam( L, 4, dHeight)
Color cCol ;
LuaCheckParam( L, 5, cCol)
LuaClearStack( L) ;
// inserisco il grezzo nella macchinata corrente
int nInd = ExeAddRawPart( ptOrig, dWidth, dLength, dHeight, cCol) ;
int nInd = ExeAddRawPart( ptOrig, dLength, dWidth, dHeight, cCol) ;
// restituisco il risultato
if ( nInd != GDB_ID_NULL)
LuaSetParam( L, nInd) ;
@@ -280,6 +281,27 @@ LuaAddRawPartWithPart( lua_State* L)
return 1 ;
}
//-------------------------------------------------------------------------------
static int
LuaModifyRawPartSize( lua_State* L)
{
// 4 parametri : nRawId, dLength, dWidth, dHeight
int nRawId ;
LuaCheckParam( L, 1, nRawId)
double dLength ;
LuaCheckParam( L, 2, dLength)
double dWidth ;
LuaCheckParam( L, 3, dWidth)
double dHeight ;
LuaCheckParam( L, 4, dHeight)
LuaClearStack( L) ;
// modifico le dimensioni del grezzo
bool bOk = ExeModifyRawPartSize( nRawId, dLength, dWidth, dHeight) ;
// restituisco il risultato
LuaSetParam( L, bOk) ;
return 1 ;
}
//-------------------------------------------------------------------------------
static int
LuaModifyRawPartHeight( lua_State* L)
@@ -522,6 +544,23 @@ LuaSetTable( lua_State* L)
return 1 ;
}
//-------------------------------------------------------------------------------
static int
LuaGetTableRef1( lua_State* L)
{
// nessun parametro
LuaClearStack( L) ;
// imposto la tavola corrente
Point3d ptPos ;
bool bOk = ExeGetTableRef1( ptPos) ;
// restituisco il risultato
if ( bOk)
LuaSetParam( L, ptPos) ;
else
LuaSetParam( L) ;
return 1 ;
}
//-------------------------------------------------------------------------------
static int
LuaAddSubPiece( lua_State* L)
@@ -675,13 +714,30 @@ LuaSetCalcTool( lua_State* L)
int nExit ;
LuaCheckParam( L, 3, nExit)
LuaClearStack( L) ;
// imposto la tavola corrente per il calcolo
// imposto l'utensile corrente per il calcolo
bool bOk = ExeSetCalcTool( sTool, sHead, nExit) ;
// restituisco il risultato
LuaSetParam( L, bOk) ;
return 1 ;
}
//-------------------------------------------------------------------------------
static int
LuaGetCalcTool( lua_State* L)
{
// nessun parametro
LuaClearStack( L) ;
// recupero l'utensile corrente
string sTool ;
bool bOk = ExeGetCalcTool( sTool) ;
// restituisco il risultato
if ( bOk)
LuaSetParam( L, sTool) ;
else
LuaSetParam( L) ;
return 1 ;
}
//-------------------------------------------------------------------------------
static int
LuaGetCalcAngles( lua_State* L)
@@ -772,6 +828,46 @@ LuaVerifyOutOfStroke( lua_State* L)
}
}
//-------------------------------------------------------------------------------
static int
LuaGetToolParam( lua_State* L)
{
// 2 parametri : sName, nType
string sName ;
LuaCheckParam( L, 1, sName)
int nType ;
LuaCheckParam( L, 2, nType)
LuaClearStack( L) ;
// recupero il parametro dell'utensile voluto
if ( ( nType & TPA_INT) != 0) {
int nVal ;
bool bOk = ExeGetToolParam( sName, nType, nVal) ;
if ( bOk)
LuaSetParam( L, nVal) ;
else
LuaSetParam( L) ;
}
else if ( ( nType & TPA_DOU) != 0) {
double dVal ;
bool bOk = ExeGetToolParam( sName, nType, dVal) ;
if ( bOk)
LuaSetParam( L, dVal) ;
else
LuaSetParam( L) ;
}
else if ( ( nType & TPA_STR) != 0) {
string sVal ;
bool bOk = ExeGetToolParam( sName, nType, sVal) ;
if ( bOk)
LuaSetParam( L, sVal) ;
else
LuaSetParam( L) ;
}
else
LuaSetParam( L) ;
return 1 ;
}
//-------------------------------------------------------------------------------
static int
LuaAddMachining( lua_State* L)
@@ -878,6 +974,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr)
bOk = bOk && luaMgr.RegisterFunction( "EgtGetNextRawPart", LuaGetNextRawPart) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtAddRawPart", LuaAddRawPart) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtAddRawPartWithPart", LuaAddRawPartWithPart) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtModifyRawPartSize", LuaModifyRawPartSize) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtModifyRawPartHeight", LuaModifyRawPartHeight) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtRemoveRawPart", LuaRemoveRawPart) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtRotateRawPart", LuaRotateRawPart) ;
@@ -892,6 +989,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr)
bOk = bOk && luaMgr.RegisterFunction( "EgtMovePartInRawPart", LuaTranslatePartInRawPart) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtRotatePartInRawPart", LuaRotatePartInRawPart) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtSetTable", LuaSetTable) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtGetTableRef1", LuaGetTableRef1) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtAddSubPiece", LuaAddSubPiece) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtSetAxisPos", LuaSetAxisPos) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtGetAxisPos", LuaGetAxisPos) ;
@@ -901,9 +999,11 @@ LuaInstallMachMgr( LuaMgr& luaMgr)
bOk = bOk && luaMgr.RegisterFunction( "EgtResetHeadSet", LuaResetHeadSet) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtSetCalcTable", LuaSetCalcTable) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtSetCalcTool", LuaSetCalcTool) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtGetCalcTool", LuaGetCalcTool) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtGetCalcAngles", LuaGetCalcAngles) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtGetCalcPositions", LuaGetCalcPositions) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtVerifyOutOfStroke", LuaVerifyOutOfStroke) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtGetToolParam", LuaGetToolParam) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtAddMachining", LuaAddMachining) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtSetMachiningParam", LuaSetMachiningParam) ;
bOk = bOk && luaMgr.RegisterFunction( "EgtSetMachiningGeometry", LuaSetMachiningGeometry) ;