diff --git a/ArcPntDirTgCurve.cpp b/ArcPntDirTgCurve.cpp index b5d2d0a..ba3772c 100644 --- a/ArcPntDirTgCurve.cpp +++ b/ArcPntDirTgCurve.cpp @@ -16,9 +16,9 @@ #include "CurveBezier.h" #include "CurveComposite.h" #include "CreateCurveAux.h" -#include "DistPointLine.h" #include "GeoConst.h" #include "/EgtDev/Include/EGkArcPntDirTgCurve.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkDistPointCurve.h" #include "/EgtDev/Include/EGkArcSpecial.h" #include "/EgtDev/Include/EgtPointerOwner.h" diff --git a/CAvToolSurfTm.cpp b/CAvToolSurfTm.cpp index 5383a11..98d0f57 100644 --- a/CAvToolSurfTm.cpp +++ b/CAvToolSurfTm.cpp @@ -14,8 +14,8 @@ #include "stdafx.h" #include "CAvToolTriangle.h" #include "CAvToolSurfTm.h" -#include "DistPointLine.h" #include "DllMain.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGnStringUtils.h" #include #include diff --git a/CAvToolTriangle.cpp b/CAvToolTriangle.cpp index 7c04daf..f40296f 100644 --- a/CAvToolTriangle.cpp +++ b/CAvToolTriangle.cpp @@ -17,8 +17,8 @@ #include "CAvToolTriangle.h" #include "IntersLineSurfStd.h" #include "IntersLineTria.h" -#include "DistPointLine.h" #include "CDeUtility.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkIntervals.h" #include "/EgtDev/Include/ENkPolynomialRoots.h" #include "/EgtDev/Include/EgtNumUtils.h" diff --git a/CDeCylTria.cpp b/CDeCylTria.cpp index 084a0e5..0e19330 100644 --- a/CDeCylTria.cpp +++ b/CDeCylTria.cpp @@ -13,9 +13,9 @@ //--------------------------- Include ---------------------------------------- #include "stdafx.h" -#include "DistPointLine.h" #include "CDeCylTria.h" #include "CDeConvexTorusTria.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkPolygon3d.h" using namespace std ; diff --git a/CDeUtility.cpp b/CDeUtility.cpp index 2c8f7da..d5ce7f3 100644 --- a/CDeUtility.cpp +++ b/CDeUtility.cpp @@ -1,6 +1,6 @@ #include "stdafx.h" #include "CDeUtility.h" -#include "DistPointLine.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/ENkPolynomialRoots.h" using namespace std ; diff --git a/CircleCenTgCurve.cpp b/CircleCenTgCurve.cpp index d71978f..cd276dd 100644 --- a/CircleCenTgCurve.cpp +++ b/CircleCenTgCurve.cpp @@ -16,8 +16,8 @@ #include "CurveBezier.h" #include "CurveComposite.h" #include "CreateCurveAux.h" -#include "DistPointLine.h" #include "GeoConst.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkCircleCenTgCurve.h" #include "/EgtDev/Include/EGkDistPointCurve.h" #include "/EgtDev/Include/EgtPointerOwner.h" diff --git a/CurveBezier.cpp b/CurveBezier.cpp index afc6c6d..c7b64be 100644 --- a/CurveBezier.cpp +++ b/CurveBezier.cpp @@ -19,7 +19,6 @@ #include "BiArcs.h" #include "GeoConst.h" #include "PolygonPlane.h" -#include "DistPointLine.h" #include "GeoObjFactory.h" #include "NgeWriter.h" #include "NgeReader.h" @@ -29,6 +28,7 @@ #include "Voronoi.h" #include "IntersLineLine.h" #include "/EgtDev/Include/EGkCurveArc.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkStringUtils3d.h" #include "/EgtDev/Include/EGkUiUnits.h" #include "/EgtDev/Include/ENkPolynomial.h" diff --git a/CurveByApprox.cpp b/CurveByApprox.cpp index fd5ff91..f7d9f68 100644 --- a/CurveByApprox.cpp +++ b/CurveByApprox.cpp @@ -16,8 +16,8 @@ #include "CurveComposite.h" #include "CalcDerivate.h" #include "BiArcs.h" -#include "DistPointLine.h" #include "RemoveCurveDefects.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkCurveByApprox.h" #include "/EgtDev/Include/EGkPolyLine.h" #include "/EgtDev/Include/EGkPolyArc.h" diff --git a/CurveComposite.cpp b/CurveComposite.cpp index 5255d23..9b1d850 100644 --- a/CurveComposite.cpp +++ b/CurveComposite.cpp @@ -14,7 +14,6 @@ //--------------------------- Include ---------------------------------------- #include "stdafx.h" #include "CurveComposite.h" -#include "DistPointLine.h" #include "DistPointCrvComposite.h" #include "CurveLine.h" #include "CurveArc.h" @@ -27,6 +26,7 @@ #include "NgeWriter.h" #include "NgeReader.h" #include "Voronoi.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkCurveByApprox.h" #include "/EgtDev/Include/EGkArcSpecial.h" #include "/EgtDev/Include/EGkSfrCreate.h" diff --git a/CurveLine.cpp b/CurveLine.cpp index ab21983..d5fd3e4 100644 --- a/CurveLine.cpp +++ b/CurveLine.cpp @@ -14,11 +14,11 @@ //--------------------------- Include ---------------------------------------- #include "stdafx.h" #include "CurveLine.h" -#include "DistPointLine.h" #include "GeoObjFactory.h" #include "NgeWriter.h" #include "NgeReader.h" #include "Voronoi.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkStringUtils3d.h" #include "/EgtDev/Include/EgtNumUtils.h" #include "/EgtDev/Include/EgtPointerOwner.h" diff --git a/DistPointCrvAux.cpp b/DistPointCrvAux.cpp index 773df96..fee8316 100644 --- a/DistPointCrvAux.cpp +++ b/DistPointCrvAux.cpp @@ -14,9 +14,9 @@ //--------------------------- Include ---------------------------------------- #include "stdafx.h" #include "DllMain.h" -#include "DistPointCrvAux.h" -#include "DistPointLine.h" #include "GeoConst.h" +#include "DistPointCrvAux.h" +#include "/EgtDev/Include/EGkDistPointLine.h" //---------------------------------------------------------------------------- diff --git a/DistPointCurve.cpp b/DistPointCurve.cpp index 01a37f9..9590b3f 100644 --- a/DistPointCurve.cpp +++ b/DistPointCurve.cpp @@ -13,10 +13,10 @@ //--------------------------- Include ---------------------------------------- #include "stdafx.h" -#include "DistPointLine.h" #include "DistPointArc.h" #include "DistPointCrvBezier.h" #include "DistPointCrvComposite.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkDistPointCurve.h" diff --git a/DistPointLine.cpp b/DistPointLine.cpp index ad97230..afed276 100644 --- a/DistPointLine.cpp +++ b/DistPointLine.cpp @@ -1,19 +1,19 @@ //---------------------------------------------------------------------------- -// EgalTech 2013-2013 +// EgalTech 2013-2024 //---------------------------------------------------------------------------- -// File : DistPointLine.cpp Data : 17.12.13 Versione : 1.4l1 +// File : DistPointLine.cpp Data : 20.05.24 Versione : 2.6e5 // Contenuto : Implementazione della classe distanza punto da linea/segmento. // // // // Modifiche : 17.12.13 DS Creazione modulo. -// +// 20.05.24 DS Reso pubblico in Include. // //---------------------------------------------------------------------------- //--------------------------- Include ---------------------------------------- #include "stdafx.h" -#include "DistPointLine.h" +#include "/EgtDev/Include/EGkDistPointLine.h" //---------------------------------------------------------------------------- diff --git a/DistPointLine.h b/DistPointLine.h deleted file mode 100644 index 08a3bdc..0000000 --- a/DistPointLine.h +++ /dev/null @@ -1,58 +0,0 @@ -//---------------------------------------------------------------------------- -// EgalTech 2013-2014 -//---------------------------------------------------------------------------- -// File : DistPointLine.h Data : 02.01.14 Versione : 1.5a1 -// Contenuto : Dichiarazione della classe distanza punto da linea/segmento. -// -// -// -// Modifiche : 30.12.12 DS Creazione modulo. -// -// -//---------------------------------------------------------------------------- - -#pragma once - -#include "/EgtDev/Include/EGkPoint3d.h" -#include "/EgtDev/Include/EGkCurveLine.h" - - -//----------------------------------------------------------------------------- -class DistPointLine -{ - friend class DistPointCurve ; - - public : - DistPointLine( const Point3d& ptP, - const ICurveLine& crvLine, bool bIsSegment = true) ; - DistPointLine( const Point3d& ptP, - const Point3d& ptIni, const Point3d& ptFin, bool bIsSegment = true) ; - DistPointLine( const Point3d& ptP, - const Point3d& ptIni, const Vector3d& vtDir, double dLen, bool bIsSegment = true) ; - - public : - bool GetSqDist( double& dSqDist) const ; - bool GetDist( double& dDist) const ; - bool IsEpsilon( double dTol) const - { double dSqDist ; return ( GetSqDist( dSqDist) && ( dSqDist < SQ_EPS_ZERO || dSqDist < dTol * dTol)) ; } - bool IsSmall( void) const - { return IsEpsilon( EPS_SMALL) ; } - bool IsZero( void) const - { return IsEpsilon( EPS_ZERO) ; } - int GetNbrMinDist( void) const - { return (( m_dSqDist < 0) ? 0 : 1) ; } - bool GetMinDistPoint( Point3d& ptMinDist) const ; - bool GetParamAtMinDistPoint( double& dParam) const ; - - private : - DistPointLine( void) ; - void Calculate( const Point3d& ptP, - const Point3d& ptIni, const Vector3d& vtDir, double dLen, bool bIsSegment) ; - - private : - double m_dSqDist ; - mutable double m_dDist ; - double m_dParam ; - Point3d m_ptMinDist ; -} ; - diff --git a/DistPointTria.cpp b/DistPointTria.cpp index 171693e..bf250c9 100644 --- a/DistPointTria.cpp +++ b/DistPointTria.cpp @@ -14,7 +14,7 @@ //--------------------------- Include ---------------------------------------- #include "stdafx.h" #include "ProjPlane.h" -#include "DistPointLine.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkDistPointTria.h" diff --git a/EgtGeomKernel.vcxproj b/EgtGeomKernel.vcxproj index 5913a89..8aae53c 100644 --- a/EgtGeomKernel.vcxproj +++ b/EgtGeomKernel.vcxproj @@ -329,6 +329,7 @@ copy $(TargetPath) \EgtProg\Dll64 + @@ -600,7 +601,6 @@ copy $(TargetPath) \EgtProg\Dll64 - diff --git a/EgtGeomKernel.vcxproj.filters b/EgtGeomKernel.vcxproj.filters index 4f414fe..00b1d65 100644 --- a/EgtGeomKernel.vcxproj.filters +++ b/EgtGeomKernel.vcxproj.filters @@ -593,9 +593,6 @@ File di intestazione - - File di intestazione - File di intestazione @@ -1214,6 +1211,9 @@ File di intestazione\Include + + File di intestazione\Include + diff --git a/IntersLineSurfBez.cpp b/IntersLineSurfBez.cpp index d017e4a..e8e8018 100644 --- a/IntersLineSurfBez.cpp +++ b/IntersLineSurfBez.cpp @@ -13,12 +13,12 @@ //--------------------------- Include ---------------------------------------- #include "stdafx.h" +#include "CurveLine.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkIntersLineTria.h" #include "/EgtDev/Include/EGkIntersLineSurfTm.h" #include "/EgtDev/Include/EGkIntersLineSurfBez.h" #include "/EgtDev/Include/EGkSurfBezier.h" -#include "DistPointLine.h" -#include "CurveLine.h" using namespace std ; diff --git a/IntersLineTria.cpp b/IntersLineTria.cpp index c831752..2ca956c 100644 --- a/IntersLineTria.cpp +++ b/IntersLineTria.cpp @@ -17,7 +17,7 @@ #include "CurveLine.h" #include "IntersLineLine.h" #include "IntersLineTria.h" -#include "DistPointLine.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkDistLineLine.h" #include "/EgtDev/Include/EGkIntersLinePlane.h" #include "/EgtDev/Include/EGkFrame3d.h" diff --git a/IntersPlaneSurfTm.cpp b/IntersPlaneSurfTm.cpp index fc29405..318c95a 100644 --- a/IntersPlaneSurfTm.cpp +++ b/IntersPlaneSurfTm.cpp @@ -15,7 +15,7 @@ #include "stdafx.h" #include "ProjPlane.h" #include "CurveLine.h" -#include "DistPointLine.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkIntersPlaneSurfTm.h" #include "/EgtDev/Include/EGkIntersPlaneTria.h" #include "/EgtDev/Include/EGkIntersLineSurfTm.h" diff --git a/IntersSurfTmSurfTm.cpp b/IntersSurfTmSurfTm.cpp index faf37a9..2df1ce6 100644 --- a/IntersSurfTmSurfTm.cpp +++ b/IntersSurfTmSurfTm.cpp @@ -13,9 +13,9 @@ //--------------------------- Include ---------------------------------------- #include "stdafx.h" -#include "DistPointLine.h" #include "IntersLineTria.h" #include "DllMain.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkIntersSurfTmSurfTm.h" #include "/EgtDev/Include/EGkIntersTriaTria.h" #include "/EgtDev/Include/EGkPointGrid3d.h" diff --git a/LineTgCurvePerpCurve.cpp b/LineTgCurvePerpCurve.cpp index f044d9f..db201a9 100644 --- a/LineTgCurvePerpCurve.cpp +++ b/LineTgCurvePerpCurve.cpp @@ -14,7 +14,7 @@ //--------------------------- Include ---------------------------------------- #include "stdafx.h" #include "CreateCurveAux.h" -#include "DistPointLine.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkLineTgCurvePerpCurve.h" #include "/EgtDev/Include/EGkLinePntTgCurve.h" #include "/EgtDev/Include/EgtPointerOwner.h" diff --git a/LineTgTwoCurves.cpp b/LineTgTwoCurves.cpp index 16cb6e4..1e39f6d 100644 --- a/LineTgTwoCurves.cpp +++ b/LineTgTwoCurves.cpp @@ -14,7 +14,7 @@ //--------------------------- Include ---------------------------------------- #include "stdafx.h" #include "CreateCurveAux.h" -#include "DistPointLine.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkLineTgTwoCurves.h" #include "/EgtDev/Include/EgtPointerOwner.h" diff --git a/PolyArc.cpp b/PolyArc.cpp index e2e549a..d6f18b8 100644 --- a/PolyArc.cpp +++ b/PolyArc.cpp @@ -13,9 +13,9 @@ //--------------------------- Include ---------------------------------------- #include "stdafx.h" -#include "DistPointLine.h" #include "GeoConst.h" #include "CurveArc.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkPolyArc.h" #include "/EgtDev/Include/EGkFrame3d.h" #include diff --git a/PolyLine.cpp b/PolyLine.cpp index 2e1f3d1..755b064 100644 --- a/PolyLine.cpp +++ b/PolyLine.cpp @@ -14,13 +14,13 @@ //--------------------------- Include ---------------------------------------- #include "stdafx.h" #include "CurveLine.h" -#include "DistPointLine.h" #include "IntersLineLine.h" #include "PolygonPlane.h" #include "PointsPCA.h" #include "GeoConst.h" #include "/EgtDev/Include/EGkPolyLine.h" #include "/EgtDev/Include/EGkPlane3d.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGnStringUtils.h" #include "/EgtDev/Include/EgtNumUtils.h" diff --git a/ProjectCurveSurfTm.cpp b/ProjectCurveSurfTm.cpp index 1bc3167..0c9b30d 100644 --- a/ProjectCurveSurfTm.cpp +++ b/ProjectCurveSurfTm.cpp @@ -13,8 +13,8 @@ //--------------------------- Include ---------------------------------------- #include "stdafx.h" -#include "DistPointLine.h" #include "GeoConst.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkDistPointCurve.h" #include "/EgtDev/Include/EGkDistPointSurfTm.h" #include "/EgtDev/Include/EGkIntersLineSurfTm.h" diff --git a/RemoveCurveDefects.cpp b/RemoveCurveDefects.cpp index fcdd695..5d6ea14 100644 --- a/RemoveCurveDefects.cpp +++ b/RemoveCurveDefects.cpp @@ -15,8 +15,8 @@ #include "stdafx.h" #include "GeoConst.h" #include "CurveComposite.h" -#include "DistPointLine.h" #include "RemoveCurveDefects.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkDistPointCurve.h" #include diff --git a/SurfTriMesh.cpp b/SurfTriMesh.cpp index 5e847b2..e3a99f0 100644 --- a/SurfTriMesh.cpp +++ b/SurfTriMesh.cpp @@ -20,9 +20,9 @@ #include "NgeWriter.h" #include "NgeReader.h" #include "SurfFlatRegion.h" -#include "DistPointLine.h" #include "Triangulate.h" #include "GeoConst.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkDistLineLine.h" #include "/EgtDev/Include/EGkIntersLinePlane.h" #include "/EgtDev/Include/EGkPointGrid3d.h" diff --git a/SurfTriMeshBooleans.cpp b/SurfTriMeshBooleans.cpp index d4e027a..11241e0 100644 --- a/SurfTriMeshBooleans.cpp +++ b/SurfTriMeshBooleans.cpp @@ -17,11 +17,11 @@ #include "CurveLine.h" #include "CurveComposite.h" #include "SurfFlatRegion.h" -#include "DistPointLine.h" #include "Triangulate.h" #include "GeoConst.h" #include "/EgtDev/Include/EgtNumUtils.h" #include "/EgtDev/Include/EGkCurve.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkDistPointCurve.h" #include "/EgtDev/Include/EGkDistPointTria.h" #include "/EgtDev/Include/EGkIntersLineTria.h" diff --git a/SurfTriMeshCuts.cpp b/SurfTriMeshCuts.cpp index af9698a..ec8da01 100644 --- a/SurfTriMeshCuts.cpp +++ b/SurfTriMeshCuts.cpp @@ -15,10 +15,10 @@ #include "CurveComposite.h" #include "SurfTriMesh.h" #include "SurfFlatRegion.h" -#include "DistPointLine.h" #include "Triangulate.h" #include "GeoConst.h" #include "/EgtDev/Include/EGkSfrCreate.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkDistPointCurve.h" #include "/EgtDev/Include/EGkIntersLinePlane.h" #include "/EgtDev/Include/EGkIntersPlaneTria.h" diff --git a/SurfTriMeshUtilities.cpp b/SurfTriMeshUtilities.cpp index d1a374b..2f4cb2e 100644 --- a/SurfTriMeshUtilities.cpp +++ b/SurfTriMeshUtilities.cpp @@ -15,7 +15,7 @@ #include "SurfTriMesh.h" #include "CurveLine.h" #include "Triangulate.h" -#include "DistPointLine.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkDistLineLine.h" #include diff --git a/VolZmap.cpp b/VolZmap.cpp index 2eb7355..d2f802c 100644 --- a/VolZmap.cpp +++ b/VolZmap.cpp @@ -18,8 +18,8 @@ #include "GdbGeo.h" #include "NgeWriter.h" #include "NgeReader.h" -#include "DistPointLine.h" #include "GeoConst.h" +#include "/EgtDev/Include/EGkDistPointLine.h" #include "/EgtDev/Include/EGkIntersLinePlane.h" #include "/EgtDev/Include/EGkUiUnits.h" #include "/EgtDev/Include/EGkIntervals.h"