diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp index 584fdf6..d63d7f0 100644 --- a/EXE_MachMgr.cpp +++ b/EXE_MachMgr.cpp @@ -1032,8 +1032,8 @@ ExeMoveDispAxis( const string& sName, double dPos) ExeSetModified() ; // se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { - string sLua = "EgtMoveDispAxis(" + sName + "," + - ToString( dPos) + ")" + + string sLua = "EgtMoveDispAxis('" + StringToLuaString( sName) + "'," + + ToString( dPos) + ")" + " -- Ok=" + ToString( bOk) ; LOG_INFO( GetCmdLogger(), sLua.c_str()) ; } @@ -1052,7 +1052,7 @@ ExeRemoveDispAxis( const string& sName) ExeSetModified() ; // se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { - string sLua = "EgtRemoveDispAxis(" + sName + ")" + + string sLua = "EgtRemoveDispAxis('" + StringToLuaString( sName) + "')" + " -- Ok=" + ToString( bOk) ; LOG_INFO( GetCmdLogger(), sLua.c_str()) ; } @@ -1090,10 +1090,10 @@ ExeAddFixture( const string& sName, const Point3d& ptPos, double dAngRotDeg, dou ExeSetModified() ; // se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { - string sLua = "EgtAddFixture(" + sName + ",{" + - ToString( ptPos) + "}," + - ToString( dAngRotDeg) + "," + - ToString( dMov) + ")" + + string sLua = "EgtAddFixture('" + StringToLuaString( sName) + "',{" + + ToString( ptPos) + "}," + + ToString( dAngRotDeg) + "," + + ToString( dMov) + ")" + " -- Id=" + ToString( nId) ; LOG_INFO( GetCmdLogger(), sLua.c_str()) ; } @@ -1201,8 +1201,28 @@ ExeRotateFixture( int nFxtId, double dDeltaAngDeg) ExeSetModified() ; // se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { - string sLua = "EgtRotateFixture(" + ToString( nFxtId) + ",{" + - ToString( dDeltaAngDeg) + "})" + + string sLua = "EgtRotateFixture(" + ToString( nFxtId) + "," + + ToString( dDeltaAngDeg) + ")" + + " -- Ok=" + ToString( bOk) ; + LOG_INFO( GetCmdLogger(), sLua.c_str()) ; + } + // restituisco il risultato + return bOk ; +} + +//----------------------------------------------------------------------------- +bool +ExeSetFixtureLink( int nFxtId, const string& sTaLink) +{ + IMachMgr* pMachMgr = GetCurrMachMgr() ; + VERIFY_MACHMGR( pMachMgr, false) + // imposto il collegamento all'asse di tavola indicato + bool bOk = pMachMgr->SetFixtureLink( nFxtId, sTaLink) ; + ExeSetModified() ; + // se richiesto, salvo il comando Lua equivalente + if ( IsCmdLog()) { + string sLua = "EgtSetFixtureLink(" + ToString( nFxtId) + ",'" + + StringToLuaString( sTaLink) + "')" + " -- Ok=" + ToString( bOk) ; LOG_INFO( GetCmdLogger(), sLua.c_str()) ; } @@ -1241,8 +1261,8 @@ ExeSetFixtureMobile( int nFxtId, double dMove) ExeSetModified() ; // se richiesto, salvo il comando Lua equivalente if ( IsCmdLog()) { - string sLua = "EgtSetFixtureMobile(" + ToString( nFxtId) + ",{" + - ToString( dMove) + "})" + + string sLua = "EgtSetFixtureMobile(" + ToString( nFxtId) + "," + + ToString( dMove) + ")" + " -- Ok=" + ToString( bOk) ; LOG_INFO( GetCmdLogger(), sLua.c_str()) ; } diff --git a/EgtExecutor.rc b/EgtExecutor.rc index 417933e..4456be8 100644 Binary files a/EgtExecutor.rc and b/EgtExecutor.rc differ diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp index b41e835..6ab87af 100644 --- a/LUA_MachMgr.cpp +++ b/LUA_MachMgr.cpp @@ -1251,6 +1251,23 @@ LuaRotateFixture( lua_State* L) return 1 ; } +//------------------------------------------------------------------------------- +static int +LuaSetFixtureLink( lua_State* L) +{ + // 2 parametri : nFxtId, sTaLink + int nFxtId ; + LuaCheckParam( L, 1, nFxtId) + string sTaLink ; + LuaCheckParam( L, 2, sTaLink) + LuaClearStack( L) ; + // aggancio il bloccaggio ad asse tavola + bool bOk= ExeSetFixtureLink( nFxtId, sTaLink) ; + // restituisco il risultato + LuaSetParam( L, bOk) ; + return 1 ; +} + //------------------------------------------------------------------------------- static int LuaMoveFixtureMobile( lua_State* L) @@ -4360,6 +4377,7 @@ LuaInstallMachMgr( LuaMgr& luaMgr) bOk = bOk && luaMgr.RegisterFunction( "EgtGetNextFixture", LuaGetNextFixture) ; bOk = bOk && luaMgr.RegisterFunction( "EgtMoveFixture", LuaMoveFixture) ; bOk = bOk && luaMgr.RegisterFunction( "EgtRotateFixture", LuaRotateFixture) ; + bOk = bOk && luaMgr.RegisterFunction( "EgtSetFixtureLink", LuaSetFixtureLink) ; bOk = bOk && luaMgr.RegisterFunction( "EgtMoveFixtureMobile", LuaMoveFixtureMobile) ; bOk = bOk && luaMgr.RegisterFunction( "EgtSetFixtureMobile", LuaSetFixtureMobile) ; // Tools database