EgtExecutor 2.1c1 :

- alle VolZmapSet**Tool di exe e Lua si può passare un singolo o una lista di Id  di Zmap
This commit is contained in:
Dario Sassi
2019-03-04 08:06:07 +00:00
parent ec041638b5
commit d270ab77f9
4 changed files with 111 additions and 100 deletions
+81 -70
View File
@@ -161,21 +161,24 @@ ExeRemoveVolZmapPart( int nId, int nPart)
//----------------------------------------------------------------------------
bool
ExeVolZmapSetStdTool( int nId, const string& sToolName, double dLen, double dDiam, double dCornR, int nFlag)
ExeVolZmapSetStdTool( const INTVECTOR& vIds, 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, nFlag)) ;
// recupero gli Zmap e assegno i dati dell'utensile
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 ;
}
// se richiesto, salvo il comando Lua equivalente
if ( IsCmdLog()) {
string sLua = "EgtVolZmapSetStdTool(" + IdToString( nId) + "," +
sToolName + "," +
ToString( dLen) + "," +
ToString( dDiam) + "," +
ToString( dCornR) + "," +
ToString( nFlag) + ")" +
string sLua = "EgtVolZmapSetStdTool({" + IdListToString( vIds) + "}," +
sToolName + "," +
ToString( dLen) + "," +
ToString( dDiam) + "," +
ToString( dCornR) + "," +
ToString( nFlag) + ")" +
" -- Ok=" + ToString( bOk) ;
LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
}
@@ -185,25 +188,27 @@ ExeVolZmapSetStdTool( int nId, const string& sToolName, double dLen, double dDia
//----------------------------------------------------------------------------
bool
ExeVolZmapSetAdvTool( int nId, const string& sToolName,
ExeVolZmapSetAdvTool( const INTVECTOR& vIds, const string& sToolName,
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, nFlag)) ;
// recupero gli Zmap e assegno i dati dell'utensile
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 ;
}
// se richiesto, salvo il comando Lua equivalente
if ( IsCmdLog()) {
string sLua = "EgtVolZmapSetAdvTool(" + IdToString( nId) + "," +
sToolName + "," +
ToString( dLen) + "," +
ToString( dDiam) + "," +
ToString( dTipLen) + "," +
ToString( dTipDiam) + "," +
ToString( dCornR) + "," +
ToString( nFlag) + ")" +
string sLua = "EgtVolZmapSetAdvTool({" + IdListToString( vIds) + "}," +
sToolName + "," +
ToString( dLen) + "," +
ToString( dDiam) + "," +
ToString( dTipLen) + "," +
ToString( dTipDiam) + "," +
ToString( dCornR) + "," +
ToString( nFlag) + ")" +
" -- Ok=" + ToString( bOk) ;
LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
}
@@ -213,25 +218,27 @@ ExeVolZmapSetAdvTool( int nId, const string& sToolName,
//----------------------------------------------------------------------------
bool
ExeVolZmapSetSawTool( int nId, const string& sToolName,
ExeVolZmapSetSawTool( const INTVECTOR& vIds, const string& sToolName,
double dLen, double dDiam, double dThick, double dStemDiam, 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->SetSawTool( sToolName, dLen, dDiam / 2, dThick, dStemDiam / 2, dCornR, nFlag)) ;
// recupero gli Zmap e assegno i dati dell'utensile
bool bOk = true ;
for ( int i = 0 ; i < int( vIds.size()) ; ++ i) {
IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( vIds[i])) ;
bOk = ( pVZM != nullptr && pVZM->SetSawTool( sToolName, dLen, dDiam / 2, dThick, dStemDiam / 2, dCornR, nFlag)) && bOk ;
}
// se richiesto, salvo il comando Lua equivalente
if ( IsCmdLog()) {
string sLua = "EgtVolZmapSetSawTool(" + IdToString( nId) + "," +
sToolName + "," +
ToString( dLen) + "," +
ToString( dDiam) + "," +
ToString( dThick) + "," +
ToString( dStemDiam) + "," +
ToString( dCornR) + "," +
ToString( nFlag) + ")" +
string sLua = "EgtVolZmapSetSawTool({" + IdListToString( vIds) + "}," +
sToolName + "," +
ToString( dLen) + "," +
ToString( dDiam) + "," +
ToString( dThick) + "," +
ToString( dStemDiam) + "," +
ToString( dCornR) + "," +
ToString( nFlag) + ")" +
" -- Ok=" + ToString( bOk) ;
LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
}
@@ -241,24 +248,24 @@ ExeVolZmapSetSawTool( int nId, const string& sToolName,
//----------------------------------------------------------------------------
bool
ExeVolZmapSetGenTool( int nId, const string& sToolName, int nToolSectId, int nFlag)
ExeVolZmapSetGenTool( const INTVECTOR& vIds, const string& sToolName, int nToolSectId, int nFlag)
{
IGeomDB* pGeomDB = GetCurrGeomDB() ;
VERIFY_GEOMDB( pGeomDB, false)
// recupero lo Zmap
IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nId)) ;
bool bOk = ( pVZM != nullptr) ;
// recupero la sezione dell'utensile
const ICurveComposite* pCC = GetCurveComposite( pGeomDB->GetGeoObj( nToolSectId)) ;
bOk = ( bOk && pCC != nullptr) ;
// assegno i dati dell'utensile
bOk = ( bOk && pVZM->SetGenTool( sToolName, pCC, nFlag)) ;
bool bOk = ( pCC != nullptr) ;
// recupero gli Zmap e assegno i dati dell'utensile
for ( int i = 0 ; i < int( vIds.size()) ; ++ i) {
IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( vIds[i])) ;
bOk = ( pVZM != nullptr && pVZM->SetGenTool( sToolName, pCC, nFlag) && bOk) ;
}
// se richiesto, salvo il comando Lua equivalente
if ( IsCmdLog()) {
string sLua = "EgtVolZmapSetGenTool(" + IdToString( nId) + "," +
sToolName + "," +
IdToString( nToolSectId) + "," +
ToString( nFlag) + ")" +
string sLua = "EgtVolZmapSetGenTool({" + IdListToString( vIds) + "}," +
sToolName + "," +
IdToString( nToolSectId) + "," +
ToString( nFlag) + ")" +
" -- Ok=" + ToString( bOk) ;
LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
}
@@ -268,24 +275,26 @@ ExeVolZmapSetGenTool( int nId, const string& sToolName, int nToolSectId, int nFl
//----------------------------------------------------------------------------
bool
ExeVolZmapSetMortiserTool( int nId, const string& sToolName,
ExeVolZmapSetMortiserTool( const INTVECTOR& vIds, const string& sToolName,
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, nFlag)) ;
// recupero gli Zmap e assegno i dati dell'utensile
bool bOk = true ;
for ( int i = 0 ; i < int( vIds.size()) ; ++ i) {
IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( vIds[i])) ;
bOk = ( pVZM != nullptr && pVZM->SetMortiserTool( sToolName, dLen, dWidth, dThick, dCornR, nFlag) && bOk) ;
}
// se richiesto, salvo il comando Lua equivalente
if ( IsCmdLog()) {
string sLua = "EgtVolZmapSetMortiserTool(" + IdToString( nId) + "," +
sToolName + "," +
ToString( dLen) + "," +
ToString( dWidth) + "," +
ToString( dThick) + "," +
ToString( dCornR) + "," +
ToString( nFlag) + ")" +
string sLua = "EgtVolZmapSetMortiserTool({" + IdListToString( vIds) + "}," +
sToolName + "," +
ToString( dLen) + "," +
ToString( dWidth) + "," +
ToString( dThick) + "," +
ToString( dCornR) + "," +
ToString( nFlag) + ")" +
" -- Ok=" + ToString( bOk) ;
LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
}
@@ -295,23 +304,25 @@ ExeVolZmapSetMortiserTool( int nId, const string& sToolName,
//----------------------------------------------------------------------------
bool
ExeVolZmapSetChiselTool( int nId, const string& sToolName,
ExeVolZmapSetChiselTool( const INTVECTOR& vIds, const string& sToolName,
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, nFlag)) ;
// recupero gli Zmap e assegno i dati dell'utensile
bool bOk = true ;
for ( int i = 0 ; i < int( vIds.size()) ; ++ i) {
IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( vIds[i])) ;
bOk = ( pVZM != nullptr && pVZM->SetChiselTool( sToolName, dLen, dWidth, dThick, nFlag) && bOk) ;
}
// se richiesto, salvo il comando Lua equivalente
if ( IsCmdLog()) {
string sLua = "EgtVolZmapSetChiselTool(" + IdToString( nId) + "," +
sToolName + "," +
ToString( dLen) + "," +
ToString( dWidth) + "," +
ToString( dThick) + "," +
ToString( nFlag) + ")" +
string sLua = "EgtVolZmapSetChiselTool({" + IdListToString( vIds) + "}," +
sToolName + "," +
ToString( dLen) + "," +
ToString( dWidth) + "," +
ToString( dThick) + "," +
ToString( nFlag) + ")" +
" -- Ok=" + ToString( bOk) ;
LOG_INFO( GetCmdLogger(), sLua.c_str()) ;
}