EgtGeomKernel 1.6c4 :

- aggiunti raccordi e smussi di curve
- aggiunte a curve funzioni che danno parametro e distanza da inizio di punto di curva.
This commit is contained in:
Dario Sassi
2015-03-20 08:31:41 +00:00
parent e2eb379aa2
commit 52b9b411cd
12 changed files with 344 additions and 0 deletions
+23
View File
@@ -968,6 +968,29 @@ CurveArc::IsPointOn( const Point3d& ptP, double dTol) const
return ( DistPointArc( ptP, *this).GetSqDist( dSqDist) && dSqDist < dTol * dTol) ;
}
//----------------------------------------------------------------------------
bool
CurveArc::GetParamAtPoint( const Point3d& ptP, double& dPar, double dTol) const
{
double dSqDist ;
dTol = max( dTol, EPS_ZERO) ;
DistPointArc DPA( ptP, *this) ;
if ( ! DPA.GetSqDist( dSqDist) || dSqDist > dTol * dTol)
return false ;
int nFlag ;
return DPA.GetParamAtMinDistPoint( 0, dPar, nFlag) ;
}
//----------------------------------------------------------------------------
bool
CurveArc::GetLengthAtPoint( const Point3d& ptP, double& dLen, double dTol) const
{
double dU ;
if ( ! GetParamAtPoint( ptP, dU, dTol))
return false ;
return GetLengthAtParam( dU, dLen) ;
}
//----------------------------------------------------------------------------
bool
CurveArc::ApproxWithLines( double dLinTol, double dAngTolDeg, PolyLine& PL) const
+2
View File
@@ -94,6 +94,8 @@ class CurveArc : public ICurveArc, public IGeoObjRW
{ oDiffG.nFlag = CrvPointDiffGeom::STD ;
return ::GetPointDiffGeom( *this, dU, nS, oDiffG) ; }
virtual bool IsPointOn( const Point3d& ptP, double dTol = EPS_SMALL) const ;
virtual bool GetParamAtPoint( const Point3d& ptP, double& dPar, double dTol = EPS_SMALL) const ;
virtual bool GetLengthAtPoint( const Point3d& ptP, double& dLen, double dTol = EPS_SMALL) const ;
virtual bool ApproxWithLines( double dLinTol, double dAngTolDeg, PolyLine& PL) const ;
virtual bool ApproxWithArcs( double dLinTol, double dAngTolDeg, PolyArc& PA) const ;
virtual ICurve* CopyParamRange( double dUStart, double dUEnd) const ;
+23
View File
@@ -1278,6 +1278,29 @@ CurveBezier::IsPointOn( const Point3d& ptP, double dTol) const
return ( DistPointCrvBezier( ptP, *this).GetSqDist( dSqDist) && dSqDist < dTol * dTol) ;
}
//----------------------------------------------------------------------------
bool
CurveBezier::GetParamAtPoint( const Point3d& ptP, double& dPar, double dTol) const
{
double dSqDist ;
dTol = max( dTol, EPS_ZERO) ;
DistPointCrvBezier DPB( ptP, *this) ;
if ( ! DPB.GetSqDist( dSqDist) || dSqDist > dTol * dTol)
return false ;
int nFlag ;
return DPB.GetParamAtMinDistPoint( 0, dPar, nFlag) ;
}
//----------------------------------------------------------------------------
bool
CurveBezier::GetLengthAtPoint( const Point3d& ptP, double& dLen, double dTol) const
{
double dU ;
if ( ! GetParamAtPoint( ptP, dU, dTol))
return false ;
return GetLengthAtParam( dU, dLen) ;
}
//----------------------------------------------------------------------------
bool
CurveBezier::ApproxWithLines( double dLinTol, double dAngTolDeg, PolyLine& PL) const
+2
View File
@@ -95,6 +95,8 @@ class CurveBezier : public ICurveBezier, public IGeoObjRW
{ oDiffG.nFlag = CrvPointDiffGeom::STD ;
return ::GetPointDiffGeom( *this, dU, nS, oDiffG) ; }
virtual bool IsPointOn( const Point3d& ptP, double dTol = EPS_SMALL) const ;
virtual bool GetParamAtPoint( const Point3d& ptP, double& dPar, double dTol = EPS_SMALL) const ;
virtual bool GetLengthAtPoint( const Point3d& ptP, double& dLen, double dTol = EPS_SMALL) const ;
virtual bool ApproxWithLines( double dLinTol, double dAngTolDeg, PolyLine& PL) const ;
virtual bool ApproxWithArcs( double dLinTol, double dAngTolDeg, PolyArc& PA) const ;
virtual ICurve* CopyParamRange( double dUStart, double dUEnd) const ;
+27
View File
@@ -1183,6 +1183,29 @@ CurveComposite::IsPointOn( const Point3d& ptP, double dTol) const
return ( DistPointCrvComposite( ptP, *this).GetSqDist( dSqDist) && dSqDist < dTol * dTol) ;
}
//----------------------------------------------------------------------------
bool
CurveComposite::GetParamAtPoint( const Point3d& ptP, double& dPar, double dTol) const
{
double dSqDist ;
dTol = max( dTol, EPS_ZERO) ;
DistPointCrvComposite DPC( ptP, *this) ;
if ( ! DPC.GetSqDist( dSqDist) || dSqDist > dTol * dTol)
return false ;
int nFlag ;
return DPC.GetParamAtMinDistPoint( 0, dPar, nFlag) ;
}
//----------------------------------------------------------------------------
bool
CurveComposite::GetLengthAtPoint( const Point3d& ptP, double& dLen, double dTol) const
{
double dU ;
if ( ! GetParamAtPoint( ptP, dU, dTol))
return false ;
return GetLengthAtParam( dU, dLen) ;
}
//----------------------------------------------------------------------------
bool
CurveComposite::ApproxWithLines( double dLinTol, double dAngTolDeg, PolyLine& PL) const
@@ -1322,6 +1345,10 @@ CurveComposite::Invert( void)
bool
CurveComposite::SimpleOffset( double dDist, int nType)
{
// se distanza di offset nulla, non devo fare alcunché
if ( fabs( dDist) < EPS_SMALL)
return true ;
// --- l'offset va effettuato in un piano perpendicolare al vettore estrusione ---
// verifico il vettore estrusione
+2
View File
@@ -94,6 +94,8 @@ class CurveComposite : public ICurveComposite, public IGeoObjRW
{ oDiffG.nFlag = ( IsParamAtJoint( dU) ? CrvPointDiffGeom::TO_VERIFY : CrvPointDiffGeom::STD) ;
return ::GetPointDiffGeom( *this, dU, nS, oDiffG) ; }
virtual bool IsPointOn( const Point3d& ptP, double dTol = EPS_SMALL) const ;
virtual bool GetParamAtPoint( const Point3d& ptP, double& dPar, double dTol = EPS_SMALL) const ;
virtual bool GetLengthAtPoint( const Point3d& ptP, double& dLen, double dTol = EPS_SMALL) const ;
virtual bool ApproxWithLines( double dLinTol, double dAngTolDeg, PolyLine& PL) const ;
virtual bool ApproxWithArcs( double dLinTol, double dAngTolDeg, PolyArc& PA) const ;
virtual ICurve* CopyParamRange( double dUStart, double dUEnd) const ;
+22
View File
@@ -444,6 +444,28 @@ CurveLine::IsPointOn( const Point3d& ptP, double dTol) const
return ( DistPointLine( ptP, *this).GetSqDist( dSqDist) && dSqDist < dTol * dTol) ;
}
//----------------------------------------------------------------------------
bool
CurveLine::GetParamAtPoint( const Point3d& ptP, double& dPar, double dTol) const
{
double dSqDist ;
dTol = max( dTol, EPS_ZERO) ;
DistPointLine DPL( ptP, *this) ;
if ( ! DPL.GetSqDist( dSqDist) || dSqDist > dTol * dTol)
return false ;
return DPL.GetParamAtMinDistPoint( dPar) ;
}
//----------------------------------------------------------------------------
bool
CurveLine::GetLengthAtPoint( const Point3d& ptP, double& dLen, double dTol) const
{
double dU ;
if ( ! GetParamAtPoint( ptP, dU, dTol))
return false ;
return GetLengthAtParam( dU, dLen) ;
}
//----------------------------------------------------------------------------
bool
CurveLine::ApproxWithLines( double dLinTol, double dAngTolDeg, PolyLine& PL) const
+2
View File
@@ -95,6 +95,8 @@ class CurveLine : public ICurveLine, public IGeoObjRW
{ oDiffG.nFlag = CrvPointDiffGeom::STD ;
return ::GetPointDiffGeom( *this, dU, nS, oDiffG) ; }
virtual bool IsPointOn( const Point3d& ptP, double dTol = EPS_SMALL) const ;
virtual bool GetParamAtPoint( const Point3d& ptP, double& dPar, double dTol = EPS_SMALL) const ;
virtual bool GetLengthAtPoint( const Point3d& ptP, double& dLen, double dTol = EPS_SMALL) const ;
virtual bool ApproxWithLines( double dLinTol, double dAngTolDeg, PolyLine& PL) const ;
virtual bool ApproxWithArcs( double dLinTol, double dAngTolDeg, PolyArc& PA) const ;
virtual ICurve* CopyParamRange( double dUStart, double dUEnd) const ;
BIN
View File
Binary file not shown.
+2
View File
@@ -267,6 +267,7 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
<ClCompile Include="DistPointCurve.cpp" />
<ClCompile Include="DistPointLine.cpp" />
<ClCompile Include="ExtText.cpp" />
<ClCompile Include="FilletChamfer.cpp" />
<ClCompile Include="FontAux.cpp" />
<ClCompile Include="FontManager.cpp" />
<ClCompile Include="GdbExecutor.cpp" />
@@ -355,6 +356,7 @@ copy $(TargetPath) \EgtProg\Dll64</Command>
<ClInclude Include="..\Include\EGkDistPointCurve.h" />
<ClInclude Include="..\Include\EGkDllMain.h" />
<ClInclude Include="..\Include\EGkExtText.h" />
<ClInclude Include="..\Include\EGkFilletChamfer.h" />
<ClInclude Include="..\Include\EGkFrame3d.h" />
<ClInclude Include="..\Include\EGkGdbConst.h" />
<ClInclude Include="..\Include\EGkGdbFunct.h" />
+6
View File
@@ -273,6 +273,9 @@
<ClCompile Include="ArcSpecial.cpp">
<Filter>File di origine\GeoCreate</Filter>
</ClCompile>
<ClCompile Include="FilletChamfer.cpp">
<Filter>File di origine\GeoCreate</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="stdafx.h">
@@ -629,6 +632,9 @@
<ClInclude Include="..\Include\EgkArcSpecial.h">
<Filter>File di intestazione\Include</Filter>
</ClInclude>
<ClInclude Include="..\Include\EGkFilletChamfer.h">
<Filter>File di intestazione\Include</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="EgtGeomKernel.rc">
+233
View File
@@ -0,0 +1,233 @@
//----------------------------------------------------------------------------
// EgalTech 2015-2015
//----------------------------------------------------------------------------
// File : FilletChamfer.cpp Data : 19.03.15 Versione : 1.6c4
// Contenuto : Implementazione funzioni per fillet e chamfer.
//
//
//
// Modifiche : 19.03.15 DS Creazione modulo.
//
//
//----------------------------------------------------------------------------
//--------------------------- Include ----------------------------------------
#include "stdafx.h"
#include "CurveArc.h"
#include "CurveLine.h"
#include "/EgtDev/Include/EgkFilletChamfer.h"
#include "/EgtDev/Include/EgkDistPointCurve.h"
#include "/EgtDev/Include/EgkIntersCurveCurve.h"
#include "/EgtDev/Include/EgtPointerOwner.h"
using namespace std ;
//----------------------------------------------------------------------------
ICurveArc*
CreateFillet( const ICurve& cCrv1, const Point3d& ptNear1,
const ICurve& cCrv2, const Point3d& ptNear2,
const Vector3d& vtNorm, double dRadius, double& dPar1, double& dPar2)
{
// verifico validità parametri ricevuti
if ( &cCrv1 == nullptr || &ptNear1 == nullptr ||
&cCrv2 == nullptr || &ptNear2 == nullptr ||
&vtNorm == nullptr || &dPar1 == nullptr || &dPar2 == nullptr)
return nullptr ;
// calcolo un riferimento sul piano perpendicolare alla normale
Frame3d frIntr ;
if ( ! frIntr.Set( ORIG, vtNorm))
return nullptr ;
// determino il lato di offset della curva 1
DistPointCurve dPC1( ptNear2, cCrv1) ;
int nSide1 ;
if ( ! dPC1.GetSideAtMinDistPoint( 0, vtNorm, nSide1))
return nullptr ;
double dOffs1 = ( nSide1 == MDS_RIGHT ? dRadius : - dRadius) ;
// calcolo l'offset nel piano locale e dal lato opportuno di una copia della curva 1
PtrOwner<ICurve> pCopy1( cCrv1.Clone()) ;
if ( IsNull( pCopy1))
return nullptr ;
pCopy1->ToLoc( frIntr) ;
pCopy1->SetExtrusion( Z_AX) ;
if ( ! pCopy1->SimpleOffset( dOffs1, ICurve::OFF_FILLET))
return nullptr ;
// determino il lato di offset della curva 2
DistPointCurve dPC2( ptNear1, cCrv2) ;
int nSide2 ;
if ( ! dPC2.GetSideAtMinDistPoint( 0, vtNorm, nSide2))
return nullptr ;
double dOffs2 = ( nSide2 == MDS_RIGHT ? dRadius : - dRadius) ;
// calcolo l'offset nel piano locale e dal lato opportuno di una copia della curva 2
PtrOwner<ICurve> pCopy2( cCrv2.Clone()) ;
if ( IsNull( pCopy2))
return nullptr ;
pCopy2->ToLoc( frIntr) ;
pCopy2->SetExtrusion( Z_AX) ;
if ( ! pCopy2->SimpleOffset( dOffs2, ICurve::OFF_FILLET))
return nullptr ;
// calcolo l'intersezione tra le due curve
Point3d ptInt1, ptInt2 ;
Point3d ptNear1I = ptNear1 ;
ptNear1I.ToLoc( frIntr) ;
IntersCurveCurve intCC( *Get( pCopy1), *Get( pCopy2)) ;
if ( ! intCC.GetIntersPointNearTo( 0, ptNear1I, ptInt1) ||
! intCC.GetIntersPointNearTo( 1, ptNear1I, ptInt2))
return nullptr ;
ptInt1.ToGlob( frIntr) ;
ptInt2.ToGlob( frIntr) ;
// proiezione del punto di intersezione sulla prima curva
DistPointCurve dPCI1( ptInt1, cCrv1) ;
double dTgPar1 ;
int nFlag1 ;
if ( ! dPCI1.GetParamAtMinDistPoint( 0, dTgPar1, nFlag1) || nFlag1 != MDPCI_NORMAL)
return nullptr ;
Point3d ptTg1 ;
Vector3d vtTg1 ;
if ( ! cCrv1.GetPointTang( dTgPar1, ICurve::FROM_MINUS, ptTg1, vtTg1))
return nullptr ;
// proiezione del punto di intersezione sulla seconda curva
DistPointCurve dPCI2( ptInt2, cCrv2) ;
double dTgPar2 ;
int nFlag2 ;
if ( ! dPCI2.GetParamAtMinDistPoint( 0, dTgPar2, nFlag2) || nFlag2 != MDPCI_NORMAL)
return nullptr ;
Point3d ptTg2 ;
Vector3d vtTg2 ;
if ( ! cCrv2.GetPointTang( dTgPar2, ICurve::FROM_MINUS, ptTg2, vtTg2))
return nullptr ;
// determino rotazione tra le curve
bool bCCW = (( vtTg1 ^ vtTg2) * vtNorm) > 0 ;
// assegno i valori dei parametri di trim (+ da inizio, - da fine)
if ( bCCW) {
dPar1 = ( nSide2 == MDS_RIGHT ? dTgPar1 : - dTgPar1) ;
dPar2 = ( nSide1 == MDS_RIGHT ? - dTgPar2 : + dTgPar2) ;
}
else {
dPar1 = ( nSide2 == MDS_RIGHT ? - dTgPar1 : dTgPar1) ;
dPar2 = ( nSide1 == MDS_RIGHT ? dTgPar2 : - dTgPar2) ;
}
// creo l'arco di fillet
PtrOwner<CurveArc> crvFillet( CreateBasicCurveArc()) ;
if ( IsNull( crvFillet) ||
! crvFillet->SetC2PN( ptInt1, ptTg1, ptTg2, vtNorm))
return nullptr ;
return Release(crvFillet) ;
}
//----------------------------------------------------------------------------
ICurveLine*
CreateChamfer( const ICurve& cCrv1, const Point3d& ptNear1,
const ICurve& cCrv2, const Point3d& ptNear2,
const Vector3d& vtNorm, double dDist, double& dPar1, double& dPar2)
{
// verifico validità parametri ricevuti
if ( &cCrv1 == nullptr || &ptNear1 == nullptr ||
&cCrv2 == nullptr || &ptNear2 == nullptr ||
&vtNorm == nullptr || &dPar1 == nullptr || &dPar2 == nullptr)
return nullptr ;
// calcolo un riferimento sul piano perpendicolare alla normale
Frame3d frIntr ;
if ( ! frIntr.Set( ORIG, vtNorm))
return nullptr ;
// determino il lato di offset della curva 1
DistPointCurve dPC1( ptNear2, cCrv1) ;
int nSide1 ;
if ( ! dPC1.GetSideAtMinDistPoint( 0, vtNorm, nSide1))
return nullptr ;
// porto la curva1 nel piano locale
PtrOwner<ICurve> pCopy1( cCrv1.Clone()) ;
if ( IsNull( pCopy1))
return nullptr ;
pCopy1->ToLoc( frIntr) ;
pCopy1->SetExtrusion( Z_AX) ;
// determino il lato di offset della curva 2
DistPointCurve dPC2( ptNear1, cCrv2) ;
int nSide2 ;
if ( ! dPC2.GetSideAtMinDistPoint( 0, vtNorm, nSide2))
return nullptr ;
// porto la curva2 nel piano locale
PtrOwner<ICurve> pCopy2( cCrv2.Clone()) ;
if ( IsNull( pCopy2))
return nullptr ;
pCopy2->ToLoc( frIntr) ;
pCopy2->SetExtrusion( Z_AX) ;
// calcolo l'intersezione tra le due curve
Point3d ptInt1, ptInt2 ;
Point3d ptNear1I = ptNear1 ;
ptNear1I.ToLoc( frIntr) ;
IntersCurveCurve intCC( *Get( pCopy1), *Get( pCopy2)) ;
if ( ! intCC.GetIntersPointNearTo( 0, ptNear1I, ptInt1) ||
! intCC.GetIntersPointNearTo( 1, ptNear1I, ptInt2))
return nullptr ;
ptInt1.ToGlob( frIntr) ;
ptInt2.ToGlob( frIntr) ;
// determino le posizioni parametriche e le distanze dell'intersezione sulle due curve
double dU1, dDist1 ;
if ( ! cCrv1.GetParamAtPoint( ptInt1, dU1) || ! cCrv1.GetLengthAtParam( dU1, dDist1))
return nullptr ;
double dU2, dDist2 ;
if ( ! cCrv2.GetParamAtPoint( ptInt2, dU2) || ! cCrv2.GetLengthAtParam( dU2, dDist2))
return nullptr ;
// tangenti alle curve nel punto di intersezione
Point3d ptTg1 ;
Vector3d vtTg1 ;
if ( ! cCrv1.GetPointTang( dU1, ICurve::FROM_MINUS, ptTg1, vtTg1))
return nullptr ;
Point3d ptTg2 ;
Vector3d vtTg2 ;
if ( ! cCrv2.GetPointTang( dU2, ICurve::FROM_MINUS, ptTg2, vtTg2))
return nullptr ;
// determino rotazione tra le curve
bool bCCW = (( vtTg1 ^ vtTg2) * vtNorm) > 0 ;
// assegno i valori delle distanze degli estremi dello smusso
if ( bCCW) {
dDist1 += ( nSide2 == MDS_RIGHT ? dDist : - dDist) ;
dDist2 += ( nSide1 == MDS_RIGHT ? - dDist : + dDist) ;
}
else {
dDist1 += ( nSide2 == MDS_RIGHT ? - dDist : dDist) ;
dDist2 += ( nSide1 == MDS_RIGHT ? dDist : - dDist) ;
}
// li converto in posizioni parametriche
if ( ! cCrv1.GetParamAtLength( dDist1, dU1) ||
! cCrv2.GetParamAtLength( dDist2, dU2))
return nullptr ;
// assegno i valori dei parametri di trim (+ da inizio, - da fine)
if ( bCCW) {
dPar1 = ( nSide2 == MDS_RIGHT ? dU1 : - dU1) ;
dPar2 = ( nSide1 == MDS_RIGHT ? - dU2 : + dU2) ;
}
else {
dPar1 = ( nSide2 == MDS_RIGHT ? - dU1 : dU1) ;
dPar2 = ( nSide1 == MDS_RIGHT ? dU2 : - dU2) ;
}
// calcolo la linea di smusso
Point3d ptP1, ptP2 ;
if ( ! cCrv1.GetPointD1D2( dU1, ICurve::FROM_MINUS, ptP1) ||
! cCrv2.GetPointD1D2( dU2, ICurve::FROM_MINUS, ptP2))
return nullptr ;
PtrOwner<CurveLine> crvChamfer( CreateBasicCurveLine()) ;
if ( IsNull( crvChamfer) ||
! crvChamfer->Set( ptP1, ptP2))
return nullptr ;
return Release(crvChamfer) ;
}