diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index 6eb74b4..b35c7de 100644 Binary files a/EgtMachKernel.rc and b/EgtMachKernel.rc differ diff --git a/MachMgrOperations.cpp b/MachMgrOperations.cpp index abd58fa..efb4f4c 100644 --- a/MachMgrOperations.cpp +++ b/MachMgrOperations.cpp @@ -159,42 +159,6 @@ MachMgr::GetOperationType( int nId) const return OPER_NULL ; // restituisco il tipo return pOpe->GetType() ; - - //// recupero l'operazione - // PtrOwner pIter( CreateGdbIterator( m_pGeomDB)) ; - // if ( IsNull( pIter) || ! pIter->GoTo( nId)) - // return OPER_NULL ; - //// verifico che il gruppo ricevuto sia corretto - // if ( pIter->GetParentId() != GetCurrOperId()) - // return OPER_NULL ; - //// recupero user object - // IUserObj* pUserObj = pIter->GetUserObj() ; - // if ( pUserObj == nullptr) - // return OPER_NULL ; - //// recupero il tipo di UserObj - // const string& sUserObj = pUserObj->GetClassName() ; - // if ( sUserObj == USEROBJ_GETNAME( Disposition)) - // return OPER_DISP ; - // else if ( sUserObj == USEROBJ_GETNAME( Drilling)) - // return OPER_DRILLING ; - // else if ( sUserObj == USEROBJ_GETNAME( Sawing)) - // return OPER_SAWING ; - // else if ( sUserObj == USEROBJ_GETNAME( Milling)) - // return OPER_MILLING ; - // else if ( sUserObj == USEROBJ_GETNAME( Pocketing)) - // return OPER_POCKETING ; - // //else if ( sUserObj == USEROBJ_GETNAME( Mortising)) - // // return OPER_MORTISING ; - // else if ( sUserObj == USEROBJ_GETNAME( SawRoughing)) - // return OPER_SAWROUGHING ; - // else if ( sUserObj == USEROBJ_GETNAME( SawFinishing)) - // return OPER_SAWFINISHING ; - // else if ( sUserObj == USEROBJ_GETNAME( GenMachining)) - // return OPER_GENMACHINING ; - // else if ( sUserObj == USEROBJ_GETNAME( Chiseling)) - // return OPER_CHISELING ; - // else - // return OPER_NULL ; } //---------------------------------------------------------------------------- diff --git a/Simulator.cpp b/Simulator.cpp index 45ecf80..0ed13a7 100644 --- a/Simulator.cpp +++ b/Simulator.cpp @@ -555,7 +555,8 @@ Simulator::FindAndManageOperationStart( bool bStart, bool bFirst, int& nStatus) return false ; } // cambio fase - m_pMchMgr->SetCurrPhase( pDisp->GetPhase()) ; + int nPhase = pDisp->GetPhase() ; + m_pMchMgr->SetCurrPhase( nPhase, ( nPhase == 1)) ; // aggiorno utensile e assi conseguenti if ( ! UpdateTool( bFirst)) { nStatus = MCH_SIM_ERR ; @@ -577,7 +578,8 @@ Simulator::FindAndManageOperationStart( bool bStart, bool bFirst, int& nStatus) return false ; } // cambio fase - m_pMchMgr->SetCurrPhase( pDisp->GetPhase()) ; + int nPhase = pDisp->GetPhase() ; + m_pMchMgr->SetCurrPhase( nPhase, ( nPhase == 1)) ; ++ m_nOpInd ; // richiamo gestione evento inizio e fine disposizione if ( ! OnDispositionStart( m_nOpId, m_nOpInd, pDisp->GetPhase(), sTable, ptOri1, true) ||