From 4fb95bd5e3dbdc6a71f3ab3757ba9d60d1ddd68a Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Sat, 28 Nov 2020 16:17:08 +0000 Subject: [PATCH] EgtMachKernel 2.2k6 : - correzione calcolo preview di WaterJetting. --- EgtMachKernel.rc | Bin 11782 -> 11782 bytes WaterJetting.cpp | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/EgtMachKernel.rc b/EgtMachKernel.rc index 430c193a56b13200e9db585b5d7681b50945465d..34bc8f6bff3de400baad6af5e6d7e5ed91fb17ca 100644 GIT binary patch delta 97 zcmZpRX^YwLhmFx}^ItYwW=6Bgj>5W|vxM9jH?QON0rG*u7nvrX5iEd9O=7{OSQ@Kh Hr8(RHR2d*z delta 97 zcmZpRX^YwLhmFy6^ItYwW=7M=j>5W|vxM9jH?QON0rG*u7nvrX5iEd9O=7{OSQ@Kh Hr8(RHQiUK= diff --git a/WaterJetting.cpp b/WaterJetting.cpp index e5b2c81..e86d81f 100644 --- a/WaterJetting.cpp +++ b/WaterJetting.cpp @@ -1782,6 +1782,8 @@ WaterJetting::AddLeadInPreview( const ICurveComposite* pCompo, ISurfFlatRegion* double dSideCoeff = ( abs( m_Params.m_dSideAngle) > EPS_ANG_SMALL ? 1. / cos( m_Params.m_dSideAngle * DEGTORAD) : 1) ; double Rad = 0.49 * m_TParams.m_dDiam * dSideCoeff ; // non 0.5 per evitare problemi di coincidenza pSfr.Set( GetSurfFlatRegionFromFatCurve( Release( pCrv), Rad, false, false)) ; + if ( IsNull( pSfr)) + return false ; // se presente foro di attacco, ne calcolo la regione e la unisco alla precedente if ( m_Params.m_bLiHole && m_Params.m_dLiHoleRad > 10 * EPS_SMALL) { PtrOwner pSfr2( GetSurfFlatRegionDisk( m_Params.m_dLiHoleRad + m_TParams.m_dDiam / 2)) ; @@ -1791,7 +1793,7 @@ WaterJetting::AddLeadInPreview( const ICurveComposite* pCompo, ISurfFlatRegion* } } // Unisco le due regioni - return ( ! IsNull( pSfr) && pSPV->Add( *pSfr)) ; + return ( pSPV->Add( *pSfr)) ; } //----------------------------------------------------------------------------