diff --git a/EXE_MachMgr.cpp b/EXE_MachMgr.cpp index 4044a11..a255823 100644 --- a/EXE_MachMgr.cpp +++ b/EXE_MachMgr.cpp @@ -248,18 +248,6 @@ ExeGetCurrMachGroup( void) return pMachMgr->GetCurrMachGroup() ; } -//----------------------------------------------------------------------------- -// Setup -//----------------------------------------------------------------------------- -int -ExeGetCurrSetup( void) -{ - IMachMgr* pMachMgr = GetCurrMachMgr() ; - VERIFY_MACHMGR( pMachMgr, 0) - // recupero l'identificativo del gruppo di attrezzaggio della macchinata corrente - return pMachMgr->GetCurrSetup() ; -} - //----------------------------------------------------------------------------- // Phases //----------------------------------------------------------------------------- @@ -1225,6 +1213,28 @@ ExeTdbGetToolHolderDir( string& sTHolderDir) return pMachMgr->TdbGetToolHolderDir( sTHolderDir) ; } +//----------------------------------------------------------------------------- +// Setup +//----------------------------------------------------------------------------- +int +ExeGetCurrSetup( void) +{ + IMachMgr* pMachMgr = GetCurrMachMgr() ; + VERIFY_MACHMGR( pMachMgr, 0) + // recupero l'identificativo del gruppo di attrezzaggio della macchinata corrente + return pMachMgr->GetCurrSetup() ; +} + +//----------------------------------------------------------------------------- +bool +ExeImportSetup( const string& sName) +{ + IMachMgr* pMachMgr = GetCurrMachMgr() ; + VERIFY_MACHMGR( pMachMgr, false) + // eseguo importazione + return pMachMgr->ImportSetup( sName) ; +} + //----------------------------------------------------------------------------- // DB lavorazioni //----------------------------------------------------------------------------- diff --git a/EXE_NstMachining.cpp b/EXE_NstMachining.cpp index 0f66b45..8ad776b 100644 --- a/EXE_NstMachining.cpp +++ b/EXE_NstMachining.cpp @@ -240,9 +240,9 @@ ExeVerifyCutAsSplitting( int nMchId) nResult += CAR_LI_OK ; } // verifico se posso portare uscita al bordo grezzo - bool bLoToModif = ( nLoType != SAW_LO_EXT) ; + bool bLoToModif = ( nLoType != SAW_LO_EXT_CENT && nLoType != SAW_LO_EXT_OUT) ; if ( bLoToModif) { - pGseCtx->m_pMachMgr->SetMachiningParam( MPA_LEADOUTTYPE, SAW_LO_EXT) ; + pGseCtx->m_pMachMgr->SetMachiningParam( MPA_LEADOUTTYPE, SAW_LO_EXT_CENT) ; // aggiorno preview pGseCtx->m_pMachMgr->MachiningPreview( true) ; // verifico interferenza diff --git a/EgtExecutor.rc b/EgtExecutor.rc index 8f07ee6..65fb0c9 100644 Binary files a/EgtExecutor.rc and b/EgtExecutor.rc differ diff --git a/LUA_MachMgr.cpp b/LUA_MachMgr.cpp index 8f01750..9ec7a1c 100644 --- a/LUA_MachMgr.cpp +++ b/LUA_MachMgr.cpp @@ -1316,6 +1316,22 @@ LuaTdbSave( lua_State* L) return 1 ; } +//----------------------------------------------------------------------------- +// Setup +//----------------------------------------------------------------------------- +static int +LuaImportSetup( lua_State* L) +{ + // 1 o nessun parametro : [sName] + string sName ; + LuaGetParam( L, 1, sName) ; + LuaClearStack( L) ; + // eseguo importazione + bool bOk = ExeImportSetup( sName) ; + LuaSetParam( L, bOk) ; + return 1 ; +} + //------------------------------------------------------------------------------- // Machinings database //------------------------------------------------------------------------------- @@ -3007,6 +3023,8 @@ LuaInstallMachMgr( LuaMgr& luaMgr) bOk = bOk && luaMgr.RegisterFunction( "EgtTdbGetCurrToolParam", LuaTdbGetCurrToolParam) ; bOk = bOk && luaMgr.RegisterFunction( "EgtTdbReload", LuaTdbReload) ; bOk = bOk && luaMgr.RegisterFunction( "EgtTdbSave", LuaTdbSave) ; + // Setup + bOk = bOk && luaMgr.RegisterFunction( "EgtImportSetup", LuaImportSetup) ; // Machinings database bOk = bOk && luaMgr.RegisterFunction( "EgtMdbGetMachiningNewName", LuaMdbGetMachiningNewName) ; bOk = bOk && luaMgr.RegisterFunction( "EgtMdbAddMachining", LuaMdbAddMachining) ;