Egalware/EgtGeomKernel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correzioni/UtensileSferico/NB:CiSonoLineePerTest

Browse Source
This commit is contained in:
LorenzoM
2022-01-18 13:07:48 +01:00
parent 7e2bf848a9
commit 2f4d75b958
3 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tool.cpp
+11 -4
View File
@@ -74,6 +74,10 @@ Tool::SetTolerances( double dLinTol, double dAngTolDeg)
bool
Tool::SetStdTool( const string& sToolName, double dH, double dR, double dCornR, double dCutterH, int nToolNum)
{
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//////////////////////// Test Additivi //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
return SetAdditiveTool( sToolName, dH, dR, dCornR, nToolNum) ;
/////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Impostazioni generali
m_sName = sToolName ;
m_nCurrentNum = nToolNum ;
@@ -676,7 +680,7 @@ Tool::SetAdditiveTool( const std::string& sToolName, double dH, double dR, doubl
if ( dH < EPS_SMALL || dR < EPS_SMALL || dRC < - EPS_SMALL)
return false ;
m_nType = ADDITIVE ;
/*m_nType = ADDITIVE ;*/
m_dHeight = dH ;
m_dRadius = dR ;
m_dRCorner = dRC ;
@@ -711,10 +715,13 @@ Tool::SetAdditiveTool( const std::string& sToolName, double dH, double dR, doubl
// Utensile cilindrico con eventuale raggio corner
else {
// Utensile mal definito
if ( m_dRadius - m_dRCorner < EPS_SMALL)
if ( m_dRadius - m_dRCorner < 0)
return false ;
// Raggio corner nullo
if ( m_dRadius < EPS_SMALL) {
// Utensile sferico
else if ( m_dRadius - m_dRCorner < EPS_SMALL)
;
// Raggio corner nullo: cilindro
else if ( m_dRCorner < EPS_SMALL) {
;
}
else {