diff --git a/EXE_GdbModifyVol.cpp b/EXE_GdbModifyVol.cpp index 287b0bd..3e843ec 100644 --- a/EXE_GdbModifyVol.cpp +++ b/EXE_GdbModifyVol.cpp @@ -144,7 +144,7 @@ ExeRemoveVolZmapPart( int nId, int nPart) //---------------------------------------------------------------------------- bool ExeVolZmapSetStdTool( const INTVECTOR& vIds, const string& sToolName, - double dLen, double dDiam, double dCornR, double dCutterH, int nFlag) + double dLen, double dDiam, double dCornR, double dCutterH, int nFlag, bool bFirst) { IGeomDB* pGeomDB = GetCurrGeomDB() ; VERIFY_GEOMDB( pGeomDB, false) @@ -152,7 +152,7 @@ ExeVolZmapSetStdTool( 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->SetStdTool( sToolName, dLen, 0.5 * dDiam, dCornR, dCutterH, nFlag)) && bOk ; + bOk = ( pVZM != nullptr && pVZM->SetStdTool( sToolName, dLen, 0.5 * dDiam, dCornR, dCutterH, nFlag, bFirst)) && bOk ; } // se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { @@ -173,7 +173,7 @@ ExeVolZmapSetStdTool( const INTVECTOR& vIds, const string& sToolName, //---------------------------------------------------------------------------- bool ExeVolZmapSetAdvTool( const INTVECTOR& vIds, const string& sToolName, - double dLen, double dDiam, double dTipLen, double dTipDiam, double dCornR, double dCutterH, int nFlag) + double dLen, double dDiam, double dTipLen, double dTipDiam, double dCornR, double dCutterH, int nFlag, bool bFirst) { IGeomDB* pGeomDB = GetCurrGeomDB() ; VERIFY_GEOMDB( pGeomDB, false) @@ -181,7 +181,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, dCutterH, nFlag)) && bOk ; + bOk = ( pVZM != nullptr && pVZM->SetAdvTool( sToolName, dLen, dDiam / 2, dTipLen, dTipDiam / 2, dCornR, dCutterH, nFlag, bFirst)) && bOk ; } // se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { @@ -204,7 +204,7 @@ ExeVolZmapSetAdvTool( const INTVECTOR& vIds, const string& sToolName, //---------------------------------------------------------------------------- bool ExeVolZmapSetSawTool( const INTVECTOR& vIds, const string& sToolName, - double dLen, double dDiam, double dThick, double dStemDiam, double dCornR, int nFlag) + double dLen, double dDiam, double dThick, double dStemDiam, double dCornR, int nFlag, bool bFirst) { IGeomDB* pGeomDB = GetCurrGeomDB() ; VERIFY_GEOMDB( pGeomDB, false) @@ -212,7 +212,7 @@ ExeVolZmapSetSawTool( 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->SetSawTool( sToolName, dLen, dDiam / 2, dThick, dStemDiam / 2, dCornR, nFlag)) && bOk ; + bOk = ( pVZM != nullptr && pVZM->SetSawTool( sToolName, dLen, dDiam / 2, dThick, dStemDiam / 2, dCornR, nFlag, bFirst)) && bOk ; } // se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { @@ -233,7 +233,7 @@ ExeVolZmapSetSawTool( const INTVECTOR& vIds, const string& sToolName, //---------------------------------------------------------------------------- bool -ExeVolZmapSetGenTool( const INTVECTOR& vIds, const string& sToolName, int nToolSectId, int nFlag) +ExeVolZmapSetGenTool( const INTVECTOR& vIds, const string& sToolName, int nToolSectId, int nFlag, bool bFirst) { IGeomDB* pGeomDB = GetCurrGeomDB() ; VERIFY_GEOMDB( pGeomDB, false) @@ -243,7 +243,7 @@ ExeVolZmapSetGenTool( const INTVECTOR& vIds, const string& sToolName, int nToolS // 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) ; + bOk = ( pVZM != nullptr && pVZM->SetGenTool( sToolName, pCC, nFlag, bFirst) && bOk) ; } // se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { @@ -261,7 +261,7 @@ ExeVolZmapSetGenTool( const INTVECTOR& vIds, const string& sToolName, int nToolS //---------------------------------------------------------------------------- bool ExeVolZmapSetMortiserTool( const INTVECTOR& vIds, const string& sToolName, - double dLen, double dWidth, double dThick, double dCornR, int nFlag) + double dLen, double dWidth, double dThick, double dCornR, int nFlag, bool bFirst) { IGeomDB* pGeomDB = GetCurrGeomDB() ; VERIFY_GEOMDB( pGeomDB, false) @@ -269,7 +269,7 @@ ExeVolZmapSetMortiserTool( 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->SetMortiserTool( sToolName, dLen, dWidth, dThick, dCornR, nFlag) && bOk) ; + bOk = ( pVZM != nullptr && pVZM->SetMortiserTool( sToolName, dLen, dWidth, dThick, dCornR, nFlag, bFirst) && bOk) ; } // se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { @@ -290,7 +290,7 @@ ExeVolZmapSetMortiserTool( const INTVECTOR& vIds, const string& sToolName, //---------------------------------------------------------------------------- bool ExeVolZmapSetChiselTool( const INTVECTOR& vIds, const string& sToolName, - double dLen, double dWidth, double dThick, int nFlag) + double dLen, double dWidth, double dThick, int nFlag, bool bFirst) { IGeomDB* pGeomDB = GetCurrGeomDB() ; VERIFY_GEOMDB( pGeomDB, false) @@ -298,7 +298,7 @@ ExeVolZmapSetChiselTool( 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->SetChiselTool( sToolName, dLen, dWidth, dThick, nFlag) && bOk) ; + bOk = ( pVZM != nullptr && pVZM->SetChiselTool( sToolName, dLen, dWidth, dThick, nFlag, bFirst) && bOk) ; } // se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { @@ -317,7 +317,7 @@ ExeVolZmapSetChiselTool( const INTVECTOR& vIds, const string& sToolName, //---------------------------------------------------------------------------- bool -ExeVolZmapResetTool( const INTVECTOR& vIds) +ExeVolZmapResetTools( const INTVECTOR& vIds) { IGeomDB* pGeomDB = GetCurrGeomDB() ; VERIFY_GEOMDB( pGeomDB, false) @@ -325,7 +325,7 @@ ExeVolZmapResetTool( const INTVECTOR& vIds) bool bOk = true ; for ( int i = 0 ; i < int( vIds.size()) ; ++ i) { IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( vIds[i])) ; - bOk = ( pVZM != nullptr && pVZM->ResetTool() && bOk) ; + bOk = ( pVZM != nullptr && pVZM->ResetTools() && bOk) ; } // se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { @@ -397,7 +397,7 @@ ExeVolZmapMillingStep( int nId, const Point3d& ptPs, const Vector3d& vtDs, Vector3d vtDeL = GetVectorLocal( pGeomDB, vtDe, nRefType, frLoc) ; // recupero lo Zmap e eseguo movimento di fresatura con l'utensile già associato IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nId)) ; - bOk = bOk && ( pVZM != nullptr && pVZM->MillingStep( ptPsL, vtDsL, ptPeL, vtDeL)) ; + bOk = bOk && ( pVZM != nullptr && pVZM->MillingStep( 0, ptPsL, vtDsL, ptPeL, vtDeL)) ; ExeSetModified() ; // se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { @@ -433,7 +433,7 @@ ExeVolZmapMillingStep( int nId, const Point3d& ptPs, const Vector3d& vtDs, const Vector3d vtAeL = GetVectorLocal( pGeomDB, vtAe, nRefType, frLoc) ; // recupero lo Zmap e eseguo movimento di fresatura con l'utensile già associato IVolZmap* pVZM = GetVolZmap( pGeomDB->GetGeoObj( nId)) ; - bOk = bOk && ( pVZM != nullptr && pVZM->MillingStep( ptPsL, vtDsL, vtAsL, ptPeL, vtDeL, vtAeL)) ; + bOk = bOk && ( pVZM != nullptr && pVZM->MillingStep( 0, ptPsL, vtDsL, vtAsL, ptPeL, vtDeL, vtAeL)) ; ExeSetModified() ; // se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { diff --git a/LUA_GdbModifyVol.cpp b/LUA_GdbModifyVol.cpp index 85c7f8a..407decf 100644 --- a/LUA_GdbModifyVol.cpp +++ b/LUA_GdbModifyVol.cpp @@ -94,7 +94,7 @@ LuaVolZmapSetStdTool( lua_State* L) LuaGetParam( L, 7, nFlag) ; LuaClearStack( L) ; // imposto utensile standard a Zmap indicati - bool bOk = ExeVolZmapSetStdTool( vIds, sToolName, dLen, dDiam, dCornR, dCutterH, nFlag) ; + bool bOk = ExeVolZmapSetStdTool( vIds, sToolName, dLen, dDiam, dCornR, dCutterH, nFlag, true) ; // restituisco il risultato LuaSetParam( L, bOk) ; return 1 ; @@ -125,7 +125,7 @@ LuaVolZmapSetAdvTool( lua_State* L) LuaGetParam( L, 9, nFlag) ; LuaClearStack( L) ; // imposto utensile avanzato a Zmap indicati - bool bOk = ExeVolZmapSetAdvTool( vIds, sToolName, dLen, dDiam, dTipLen, dTipDiam, dCornR, dCutterH, nFlag) ; + bool bOk = ExeVolZmapSetAdvTool( vIds, sToolName, dLen, dDiam, dTipLen, dTipDiam, dCornR, dCutterH, nFlag, true) ; // restituisco il risultato LuaSetParam( L, bOk) ; return 1 ; @@ -154,7 +154,7 @@ LuaVolZmapSetSawTool( lua_State* L) LuaGetParam( L, 8, nFlag) ; LuaClearStack( L) ; // imposto utensile avanzato a Zmap indicati - bool bOk = ExeVolZmapSetSawTool( vIds, sToolName, dLen, dDiam, dThick, dStemDiam, dCornR, nFlag) ; + bool bOk = ExeVolZmapSetSawTool( vIds, sToolName, dLen, dDiam, dThick, dStemDiam, dCornR, nFlag, true) ; // restituisco il risultato LuaSetParam( L, bOk) ; return 1 ; @@ -175,7 +175,7 @@ LuaVolZmapSetGenTool( lua_State* L) LuaGetParam( L, 4, nFlag) ; LuaClearStack( L) ; // imposto utensile generico a Zmap indicati - bool bOk = ExeVolZmapSetGenTool( vIds, sToolName, nToolSectId, nFlag) ; + bool bOk = ExeVolZmapSetGenTool( vIds, sToolName, nToolSectId, nFlag, true) ; // restituisco il risultato LuaSetParam( L, bOk) ; return 1 ; @@ -202,7 +202,7 @@ LuaVolZmapSetMortiserTool( lua_State* L) LuaGetParam( L, 7, nFlag) ; LuaClearStack( L) ; // imposto mortasatrice a Zmap indicati - bool bOk = ExeVolZmapSetMortiserTool( vIds, sToolName, dLen, dWidth, dThick, dCornR, nFlag) ; + bool bOk = ExeVolZmapSetMortiserTool( vIds, sToolName, dLen, dWidth, dThick, dCornR, nFlag, true) ; // restituisco il risultato LuaSetParam( L, bOk) ; return 1 ; @@ -227,7 +227,7 @@ LuaVolZmapSetChiselTool( lua_State* L) LuaGetParam( L, 6, nFlag) ; LuaClearStack( L) ; // imposto scalpello a Zmap indicati - bool bOk = ExeVolZmapSetChiselTool( vIds, sToolName, dLen, dWidth, dThick, nFlag) ; + bool bOk = ExeVolZmapSetChiselTool( vIds, sToolName, dLen, dWidth, dThick, nFlag, true) ; // restituisco il risultato LuaSetParam( L, bOk) ; return 1 ; @@ -242,7 +242,7 @@ LuaVolZmapResetTool( lua_State* L) LuaCheckParam( L, 1, vIds) LuaClearStack( L) ; // reset utensile a Zmap indicati - bool bOk = ExeVolZmapResetTool( vIds) ; + bool bOk = ExeVolZmapResetTools( vIds) ; // restituisco il risultato LuaSetParam( L, bOk) ; return 1 ;