From 55ce22b06ccea88a8a7f933809aad5889f52eac1 Mon Sep 17 00:00:00 2001 From: Daniele Bariletti Date: Thu, 29 Aug 2024 10:05:45 +0200 Subject: [PATCH] EgtGeomKernel : - piccoli aggiustamenti stilistici. --- CurveAux.cpp | 3 +++ CurveComposite.cpp | 2 ++ DistPointCurve.cpp | 2 ++ IntersCurveCurve.cpp | 8 ++++++++ SbzFromCurves.cpp | 2 +- SelfIntersCurve.cpp | 2 ++ StmFromCurves.cpp | 4 ++-- 7 files changed, 20 insertions(+), 3 deletions(-) diff --git a/CurveAux.cpp b/CurveAux.cpp index 5bbb6eb..861ef2b 100644 --- a/CurveAux.cpp +++ b/CurveAux.cpp @@ -1774,6 +1774,7 @@ GetCurveVoronoi( const ICurve& crvC) case CRV_ARC : return GetBasicCurveArc( &crvC)->GetVoronoiObject() ; case CRV_BEZIER : return GetBasicCurveBezier( &crvC)->GetVoronoiObject() ; case CRV_COMPO : return GetBasicCurveComposite( &crvC)->GetVoronoiObject() ; + default : return nullptr ; } return nullptr ; } @@ -1851,5 +1852,7 @@ ResetCurveVoronoi( const ICurve& crvC) case CRV_COMPO : GetBasicCurveComposite( &crvC)->ResetVoronoiObject() ; break ; + default : + break ; } } diff --git a/CurveComposite.cpp b/CurveComposite.cpp index d6dbc33..c0ffe14 100644 --- a/CurveComposite.cpp +++ b/CurveComposite.cpp @@ -948,6 +948,8 @@ CurveComposite::IsFlat( Plane3d& plPlane, bool bUseExtrusion, double dToler) con return false ; } } break ; + default : + return false ; } } // recupero dati sulla planarità della polilinea diff --git a/DistPointCurve.cpp b/DistPointCurve.cpp index 9590b3f..b009273 100644 --- a/DistPointCurve.cpp +++ b/DistPointCurve.cpp @@ -47,6 +47,8 @@ DistPointCurve::DistPointCurve( const Point3d& ptP, const ICurve& Curve, bool bI case CRV_COMPO : CrvCompositeCalculate( ptP, Curve) ; break ; + default : + break ; } // salvo il punto m_ptP = ptP ; diff --git a/IntersCurveCurve.cpp b/IntersCurveCurve.cpp index 7c05360..f076dea 100644 --- a/IntersCurveCurve.cpp +++ b/IntersCurveCurve.cpp @@ -78,6 +78,8 @@ IntersCurveCurve::IntersCurveCurve( const ICurve& CurveA, const ICurve& CurveB, case CRV_COMPO : LineCrvCompoCalculate( *pCalcCrv[0], *pCalcCrv[1]) ; break ; + default : + break ; } break ; case CRV_ARC : @@ -91,6 +93,8 @@ IntersCurveCurve::IntersCurveCurve( const ICurve& CurveA, const ICurve& CurveB, case CRV_COMPO : ArcCrvCompoCalculate( *pCalcCrv[0], *pCalcCrv[1]) ; break ; + default : + break ; } break ; case CRV_COMPO : @@ -104,8 +108,12 @@ IntersCurveCurve::IntersCurveCurve( const ICurve& CurveA, const ICurve& CurveB, case CRV_COMPO : CrvCompoCrvCompoCalculate( *pCalcCrv[0], *pCalcCrv[1]) ; break ; + default : + break ; } break ; + default : + break ; } // per curve approssimate, sistemo... AdjustIntersParams( ( pCalcCrv[0] != m_pCurve[0]), ( pCalcCrv[1] != m_pCurve[1])) ; diff --git a/SbzFromCurves.cpp b/SbzFromCurves.cpp index df830ff..6474c45 100644 --- a/SbzFromCurves.cpp +++ b/SbzFromCurves.cpp @@ -68,7 +68,7 @@ GetSurfBezierByRegion( const CICURVEPVECTOR& vpCurve, double dLinTol) vPL.resize( vpCurve.size()) ; for ( int i = 0 ; i < int( vpCurve.size()) ; ++ i) { if ( ! vpCurve[i]->ApproxWithLines( dLinTol, ANG_TOL_STD_DEG, ICurve::APL_SPECIAL, vPL[i])) - return false ; + return nullptr ; } Vector3d vtN ; INTMATRIX vnPLIndMat ; diff --git a/SelfIntersCurve.cpp b/SelfIntersCurve.cpp index 1074b65..690256d 100644 --- a/SelfIntersCurve.cpp +++ b/SelfIntersCurve.cpp @@ -88,6 +88,8 @@ SelfIntersCurve::SelfIntersCurve( const ICurve& Curve) } } break ; + default : + break ; } // per curva approssimata, sistemo... AdjustIntersParams( ( pCalcCrv != m_pCurve), pCalcCrv, vTmpPar) ; diff --git a/StmFromCurves.cpp b/StmFromCurves.cpp index 198f1d1..88f920e 100644 --- a/StmFromCurves.cpp +++ b/StmFromCurves.cpp @@ -65,7 +65,7 @@ GetSurfTriMeshByRegion( const CICURVEPVECTOR& vpCurve, double dLinTol) vPL.resize( vpCurve.size()) ; for ( int i = 0 ; i < int( vpCurve.size()) ; ++ i) { if ( ! vpCurve[i]->ApproxWithLines( dLinTol, ANG_TOL_STD_DEG, ICurve::APL_SPECIAL, vPL[i])) - return false ; + return nullptr ; } Vector3d vtN ; INTMATRIX vnPLIndMat ; @@ -152,7 +152,7 @@ GetSurfTriMeshByRegionExtrusion( const CICURVEPVECTOR& vpCurve, const Vector3d& vPL.resize( vpCurve.size()) ; for ( int i = 0 ; i < int( vpCurve.size()) ; ++ i) { if ( ! vpCurve[i]->ApproxWithLines( dLinTol, ANG_TOL_STD_DEG, ICurve::APL_SPECIAL, vPL[i])) - return false ; + return nullptr ; } Vector3d vtN ; INTMATRIX vnPLIndMat ;