diff --git a/ToolsMgr.cpp b/ToolsMgr.cpp index 006f749..f89c84b 100644 --- a/ToolsMgr.cpp +++ b/ToolsMgr.cpp @@ -738,10 +738,11 @@ ToolsMgr::GetCurrToolThDiam( double& dThDiam) const if ( ! m_bCurrTool) return false ; - // se punta a forare, lama, fresa o scalpello + // se punta a forare, lama, fresa, mortasatrice/sega a catena o scalpello if ( ( m_tdCurrTool.m_nType & TF_DRILLBIT) != 0 || ( m_tdCurrTool.m_nType & TF_SAWBLADE) != 0 || ( m_tdCurrTool.m_nType & TF_MILL) != 0 || + ( m_tdCurrTool.m_nType & TF_MORTISE) != 0 || ( m_tdCurrTool.m_nType & TF_CHISEL) != 0) { // recupero le dimensioni del porta utensili double dTHoldBase = 0 ; @@ -761,9 +762,8 @@ ToolsMgr::GetCurrToolThDiam( double& dThDiam) const dThDiam = dTHoldDiam ; return true ; } - // se mortasatrice/sega a catena o waterjet - else if ( ( m_tdCurrTool.m_nType & TF_MORTISE) != 0 || - ( m_tdCurrTool.m_nType & TF_WATERJET) != 0) { + // se waterjet + else if ( ( m_tdCurrTool.m_nType & TF_WATERJET) != 0) { dThDiam = 0 ; return true ; } @@ -779,10 +779,11 @@ ToolsMgr::GetCurrToolThLength( double& dThLen) const if ( ! m_bCurrTool) return false ; - // se punta a forare, lama, fresa o scalpello + // se punta a forare, lama, fresa, mortasatrice/sega a catena o scalpello if ( ( m_tdCurrTool.m_nType & TF_DRILLBIT) != 0 || ( m_tdCurrTool.m_nType & TF_SAWBLADE) != 0 || ( m_tdCurrTool.m_nType & TF_MILL) != 0 || + ( m_tdCurrTool.m_nType & TF_MORTISE) != 0 || ( m_tdCurrTool.m_nType & TF_CHISEL) != 0) { // recupero le dimensioni del porta utensili double dTHoldBase = 0 ; @@ -802,9 +803,8 @@ ToolsMgr::GetCurrToolThLength( double& dThLen) const dThLen = dTHoldLen ; return true ; } - // se mortasatrice/sega a catena o waterjet - else if ( ( m_tdCurrTool.m_nType & TF_MORTISE) != 0 || - ( m_tdCurrTool.m_nType & TF_WATERJET) != 0) { + // se waterjet + else if ( ( m_tdCurrTool.m_nType & TF_WATERJET) != 0) { dThLen = 0 ; return true ; }