EgtExecutor 1.9a1 :

- aggiunta gestione Flag Utensile per VirtualMilling in Exe e Lua.
This commit is contained in:
Dario Sassi
2018-01-16 12:13:42 +00:00
parent 6bb42c687b
commit aacdc8cfc7
3 changed files with 32 additions and 20 deletions
+16 -12
View File
@@ -161,13 +161,13 @@ ExeRemoveVolZmapPart( int nId, int nPart)
//----------------------------------------------------------------------------
bool
ExeVolZmapSetStdTool( int nId, const string& sToolName, double dLen, double dDiam, double dCornR)
ExeVolZmapSetStdTool( int nId, const string& sToolName, double dLen, double dDiam, double dCornR, int nFlag)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, false)
// recupero lo Zmap e assegno i dati dell'utensile
IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nId)) ;
bool bOk = ( pVZM != nullptr && pVZM->SetStdTool( sToolName, dLen, 0.5 * dDiam, dCornR)) ;
bool bOk = ( pVZM != nullptr && pVZM->SetStdTool( sToolName, dLen, 0.5 * dDiam, dCornR, nFlag)) ;
ExeSetModified() ;
// se richiesto, salvo il comando Lua equivalente
if ( IsCmdLog()) {
@@ -175,7 +175,8 @@ ExeVolZmapSetStdTool( int nId, const string& sToolName, double dLen, double dDia
sToolName + "," +
ToString( dLen) + "," +
ToString( dDiam) + "," +
ToString( dCornR) + ")" +
ToString( dCornR) + "," +
ToString( nFlag) + ")" +
" -- Ok=" + ToString( bOk) ;
LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
}
@@ -186,14 +187,14 @@ ExeVolZmapSetStdTool( int nId, const string& sToolName, double dLen, double dDia
//----------------------------------------------------------------------------
bool
ExeVolZmapSetAdvTool( int nId, const string& sToolName,
double dLen, double dDiam, double dTipLen, double dTipDiam, double dCornR)
double dLen, double dDiam, double dTipLen, double dTipDiam, double dCornR, int nFlag)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, false)
// recupero lo Zmap e assegno i dati dell'utensile
IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nId)) ;
bool bOk = ( pVZM != nullptr &&
pVZM->SetAdvTool( sToolName, dLen, dDiam / 2, dTipLen, dTipDiam / 2, dCornR)) ;
pVZM->SetAdvTool( sToolName, dLen, dDiam / 2, dTipLen, dTipDiam / 2, dCornR, nFlag)) ;
ExeSetModified() ;
// se richiesto, salvo il comando Lua equivalente
if ( IsCmdLog()) {
@@ -203,7 +204,8 @@ ExeVolZmapSetAdvTool( int nId, const string& sToolName,
ToString( dDiam) + "," +
ToString( dTipLen) + "," +
ToString( dTipDiam) + "," +
ToString( dCornR) + ")" +
ToString( dCornR) + "," +
ToString( nFlag) + ")" +
" -- Ok=" + ToString( bOk) ;
LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
}
@@ -214,14 +216,14 @@ ExeVolZmapSetAdvTool( int nId, const string& sToolName,
//----------------------------------------------------------------------------
bool
ExeVolZmapSetMortiserTool( int nId, const string& sToolName,
double dLen, double dWidth, double dThick, double dCornR)
double dLen, double dWidth, double dThick, double dCornR, int nFlag)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, false)
// recupero lo Zmap e assegno i dati dell'utensile
IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nId)) ;
bool bOk = ( pVZM != nullptr &&
pVZM->SetMortiserTool( sToolName, dLen, dWidth, dThick, dCornR)) ;
pVZM->SetMortiserTool( sToolName, dLen, dWidth, dThick, dCornR, nFlag)) ;
ExeSetModified() ;
// se richiesto, salvo il comando Lua equivalente
if ( IsCmdLog()) {
@@ -230,7 +232,8 @@ ExeVolZmapSetMortiserTool( int nId, const string& sToolName,
ToString( dLen) + "," +
ToString( dWidth) + "," +
ToString( dThick) + "," +
ToString( dCornR) + ")" +
ToString( dCornR) + "," +
ToString( nFlag) + ")" +
" -- Ok=" + ToString( bOk) ;
LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
}
@@ -241,14 +244,14 @@ ExeVolZmapSetMortiserTool( int nId, const string& sToolName,
//----------------------------------------------------------------------------
bool
ExeVolZmapSetChiselTool( int nId, const string& sToolName,
double dLen, double dWidth, double dThick)
double dLen, double dWidth, double dThick, int nFlag)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, false)
// recupero lo Zmap e assegno i dati dell'utensile
IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nId)) ;
bool bOk = ( pVZM != nullptr &&
pVZM->SetChiselTool( sToolName, dLen, dWidth, dThick)) ;
pVZM->SetChiselTool( sToolName, dLen, dWidth, dThick, nFlag)) ;
ExeSetModified() ;
// se richiesto, salvo il comando Lua equivalente
if ( IsCmdLog()) {
@@ -256,7 +259,8 @@ ExeVolZmapSetChiselTool( int nId, const string& sToolName,
sToolName + "," +
ToString( dLen) + "," +
ToString( dWidth) + "," +
ToString( dThick) + ")" +
ToString( dThick) + "," +
ToString( nFlag) + ")" +
" -- Ok=" + ToString( bOk) ;
LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
}