diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp index 3b715d9..8b51b18 100644 --- a/EXE_MachMgr.cpp +++ b/EXE_MachMgr.cpp @@ -524,17 +524,38 @@ ExeAddRawPart( Point3d ptOrig, double dLength, double dWidth, double dHeight, Co //----------------------------------------------------------------------------- int -ExeAddRawPartWithPart( int nPartId, int nCrvId, double dOverMat, Color cCol) +ExeAddRawPartGen( int nCrvSrfId, double dOverMat, Color cCol) { IMachMgr* pMachMgr = GetCurrMachMgr() ; VERIFY_MACHMGR( pMachMgr, GDB_ID_NULL) // inserisco grezzo con pezzo nella macchinata corrente - int nId = pMachMgr->AddRawPartWithPart( nPartId, nCrvId, dOverMat, cCol) ; + int nId = pMachMgr->AddRawPart( nCrvSrfId, dOverMat, cCol) ; + ExeSetModified() ; + // se richiesto, salvo il comando Lua equivalente + if ( IsCmdLog()) { + string sLua = "EgtAddRawPartGen(" + ToString( nCrvSrfId) + "," + + ToString( dOverMat) + ",{" + + ToString( cCol) + "})" + + " -- Id=" + ToString( nId) ; + LOG_INFO( GetCmdLogger(), sLua.c_str()) ; + } + // restituisco il risultato + return nId ; +} + +//----------------------------------------------------------------------------- +int +ExeAddRawPartWithPart( int nPartId, int nCrvSrfId, double dOverMat, Color cCol) +{ + IMachMgr* pMachMgr = GetCurrMachMgr() ; + VERIFY_MACHMGR( pMachMgr, GDB_ID_NULL) + // inserisco grezzo con pezzo nella macchinata corrente + int nId = pMachMgr->AddRawPartWithPart( nPartId, nCrvSrfId, dOverMat, cCol) ; ExeSetModified() ; // se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { string sLua = "EgtAddRawPartWithPart(" + ToString( nPartId) + "," + - ToString( nCrvId) + "," + + ToString( nCrvSrfId) + "," + ToString( dOverMat) + ",{" + ToString( cCol) + "})" + " -- Id=" + ToString( nId) ; diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp index 3a80290..1c5f4eb 100644 --- a/LUA_MachMgr.cpp +++ b/LUA_MachMgr.cpp @@ -504,6 +504,7 @@ LuaGetNextRawPart( lua_State* L) LuaSetParam( L) ; return 1 ; } + //------------------------------------------------------------------------------- static int LuaAddRawPart( lua_State* L) @@ -530,6 +531,28 @@ LuaAddRawPart( lua_State* L) return 1 ; } +//------------------------------------------------------------------------------- +static int +LuaAddRawPartGen( lua_State* L) +{ + // 3 parametri : nCrvSrfId, dOverMat, Color + int nCrvSrfId ; + LuaCheckParam( L, 1, nCrvSrfId) + double dOverMat ; + LuaCheckParam( L, 2, dOverMat) + Color cCol ; + LuaCheckParam( L, 3, cCol) + LuaClearStack( L) ; + // inserisco il grezzo nella macchinata corrente + int nInd = ExeAddRawPartGen( nCrvSrfId, dOverMat, cCol) ; + // restituisco il risultato + if ( nInd != GDB_ID_NULL) + LuaSetParam( L, nInd) ; + else + LuaSetParam( L) ; + return 1 ; +} + //------------------------------------------------------------------------------- static int LuaAddRawPartWithPart( lua_State* L) @@ -4584,6 +4607,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr) bOk = bOk && luaMgr.RegisterFunction( "EgtGetFirstRawPart", LuaGetFirstRawPart) ; bOk = bOk && luaMgr.RegisterFunction( "EgtGetNextRawPart", LuaGetNextRawPart) ; bOk = bOk && luaMgr.RegisterFunction( "EgtAddRawPart", LuaAddRawPart) ; + bOk = bOk && luaMgr.RegisterFunction( "EgtAddRawPartGen", LuaAddRawPartGen) ; bOk = bOk && luaMgr.RegisterFunction( "EgtAddRawPartWithPart", LuaAddRawPartWithPart) ; bOk = bOk && luaMgr.RegisterFunction( "EgtModifyRawPart", LuaModifyRawPart) ; bOk = bOk && luaMgr.RegisterFunction( "EgtModifyRawPartSize", LuaModifyRawPartSize) ;