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

EgtExecutor :

Browse Source 
- aggiunto parametro altezza tagliente a definizione utensili per Virtual Milling.
This commit is contained in:
Dario Sassi
2020-04-15 09:46:20 +00:00
parent 54c8818cc5
commit edb2a82012
2 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EXE_GdbModifyVol.cpp
+7 -4
View File
@@ -193,7 +193,8 @@ ExeRemoveVolZmapPart( int nId, int nPart)
//----------------------------------------------------------------------------
bool
ExeVolZmapSetStdTool( const INTVECTOR& vIds, const string& sToolName, double dLen, double dDiam, double dCornR, int nFlag)
ExeVolZmapSetStdTool( const INTVECTOR& vIds, const string& sToolName,
double dLen, double dDiam, double dCornR, double dCutterH, int nFlag)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, false)
@@ -201,7 +202,7 @@ ExeVolZmapSetStdTool( const INTVECTOR& vIds, const string& sToolName, double dLe
bool bOk = true ;
for ( int i = 0 ; i < int( vIds.size()) ; ++ i) {
IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( vIds[i])) ;
bOk = ( pVZM != nullptr && pVZM->SetStdTool( sToolName, dLen, 0.5 * dDiam, dCornR, nFlag)) && bOk ;
bOk = ( pVZM != nullptr && pVZM->SetStdTool( sToolName, dLen, 0.5 * dDiam, dCornR, dCutterH, nFlag)) && bOk ;
}
// se richiesto, salvo il comando Lua equivalente
if ( IsCmdLog()) {
@@ -210,6 +211,7 @@ ExeVolZmapSetStdTool( const INTVECTOR& vIds, const string& sToolName, double dLe
ToString( dLen) + "," +
ToString( dDiam) + "," +
ToString( dCornR) + "," +
ToString( dCutterH) + "," +
ToString( nFlag) + ")" +
" -- Ok=" + ToString( bOk) ;
LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
@@ -221,7 +223,7 @@ ExeVolZmapSetStdTool( const INTVECTOR& vIds, const string& sToolName, double dLe
//----------------------------------------------------------------------------
bool
ExeVolZmapSetAdvTool( const INTVECTOR& vIds, const string& sToolName,
double dLen, double dDiam, double dTipLen, double dTipDiam, double dCornR, int nFlag)
double dLen, double dDiam, double dTipLen, double dTipDiam, double dCornR, double dCutterH, int nFlag)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, false)
@@ -229,7 +231,7 @@ ExeVolZmapSetAdvTool( const INTVECTOR& vIds, const string& sToolName,
bool bOk = true ;
for ( int i = 0 ; i < int( vIds.size()) ; ++ i) {
IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( vIds[i])) ;
bOk = ( pVZM != nullptr && pVZM->SetAdvTool( sToolName, dLen, dDiam / 2, dTipLen, dTipDiam / 2, dCornR, nFlag)) && bOk ;
bOk = ( pVZM != nullptr && pVZM->SetAdvTool( sToolName, dLen, dDiam / 2, dTipLen, dTipDiam / 2, dCornR, dCutterH, nFlag)) && bOk ;
}
// se richiesto, salvo il comando Lua equivalente
if ( IsCmdLog()) {
@@ -240,6 +242,7 @@ ExeVolZmapSetAdvTool( const INTVECTOR& vIds, const string& sToolName,
ToString( dTipLen) + "," +
ToString( dTipDiam) + "," +
ToString( dCornR) + "," +
ToString( dCutterH) + "," +
ToString( nFlag) + ")" +
" -- Ok=" + ToString( bOk) ;
LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
LUA_GdbModifyVol.cpp
+10 -6
View File
@@ -60,7 +60,7 @@ LuaRemoveVolZmapPart( lua_State* L)
static int
LuaVolZmapSetStdTool( lua_State* L)
{
// 5 o 6 parametri : vIds, sToolName, dLen, dDiam, dCornR, nFlag
// 6 o 7 parametri : vIds, sToolName, dLen, dDiam, dCornR, dCutterH [, nFlag]
INTVECTOR vIds ;
LuaCheckParam( L, 1, vIds)
string sToolName ;
@@ -71,11 +71,13 @@ LuaVolZmapSetStdTool( lua_State* L)
LuaCheckParam( L, 4, dDiam)
double dCornR ;
LuaCheckParam( L, 5, dCornR)
double dCutterH ;
LuaCheckParam( L, 6, dCutterH)
int nFlag = 1 ;
LuaGetParam( L, 6, nFlag) ;
LuaGetParam( L, 7, nFlag) ;
LuaClearStack( L) ;
// imposto utensile standard a Zmap indicati
bool bOk = ExeVolZmapSetStdTool( vIds, sToolName, dLen, dDiam, dCornR, nFlag) ;
bool bOk = ExeVolZmapSetStdTool( vIds, sToolName, dLen, dDiam, dCornR, dCutterH, nFlag) ;
// restituisco il risultato
LuaSetParam( L, bOk) ;
return 1 ;
@@ -85,7 +87,7 @@ LuaVolZmapSetStdTool( lua_State* L)
static int
LuaVolZmapSetAdvTool( lua_State* L)
{
// 7 o 8 parametri : vIds, sToolName, dLen, dDiam, dTipLen, dTipDiam, dCornR, nFlag
// 8 o 9 parametri : vIds, sToolName, dLen, dDiam, dTipLen, dTipDiam, dCornR, dCutterH [, nFlag]
INTVECTOR vIds ;
LuaCheckParam( L, 1, vIds)
string sToolName ;
@@ -100,11 +102,13 @@ LuaVolZmapSetAdvTool( lua_State* L)
LuaCheckParam( L, 6, dTipDiam)
double dCornR ;
LuaCheckParam( L, 7, dCornR)
double dCutterH ;
LuaCheckParam( L, 8, dCutterH)
int nFlag = 1 ;
LuaGetParam( L, 8, nFlag) ;
LuaGetParam( L, 9, nFlag) ;
LuaClearStack( L) ;
// imposto utensile avanzato a Zmap indicati
bool bOk = ExeVolZmapSetAdvTool( vIds, sToolName, dLen, dDiam, dTipLen, dTipDiam, dCornR, nFlag) ;
bool bOk = ExeVolZmapSetAdvTool( vIds, sToolName, dLen, dDiam, dTipLen, dTipDiam, dCornR, dCutterH, nFlag) ;
// restituisco il risultato
LuaSetParam( L, bOk) ;
return 1 ;