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

EgtGeomKernel 1.6p1 :

Browse Source 
- piccole migliorie stilistiche.
This commit is contained in:
Dario Sassi
2016-04-13 06:28:05 +00:00
parent 3e51485b13
commit 9a0acd1e5c
19 changed files with 232 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GdbExecutor.cpp
+21 -21
View File
@@ -1858,13 +1858,13 @@ GdbExecutor::CurveCompoFromCurveApproximation( const STRVECTOR& vsParams)
return false ;
if ( nType == 1) { // con linee
PolyLine PL ;
if ( ! CrvLoc.Get()->ApproxWithLines( dLinTol, ANG_TOL_STD_DEG, ICurve::APL_STD, PL) ||
if ( ! CrvLoc->ApproxWithLines( dLinTol, ANG_TOL_STD_DEG, ICurve::APL_STD, PL) ||
! pCC->FromPolyLine( PL))
return false ;
}
else { // con bi-archi
PolyArc PA ;
if ( ! CrvLoc.Get()->ApproxWithArcsEx( dLinTol, ANG_TOL_STD_DEG, LIN_FEA_LEN_STD, PA) ||
if ( ! CrvLoc->ApproxWithArcsEx( dLinTol, ANG_TOL_STD_DEG, LIN_FEA_LEN_STD, PA) ||
! pCC->FromPolyArc( PA))
return false ;
}
@@ -2343,7 +2343,7 @@ GdbExecutor::SurfTriMeshByFlatContour( const STRVECTOR& vsParams)
if ( vsParams.size() == 4)
FromString( vsParams[3], dLinTol) ;
// calcolo la superficie
ISurfTriMesh* pSTM = GetSurfTriMeshByFlatContour( CrvLoc.Get(), dLinTol) ;
ISurfTriMesh* pSTM = GetSurfTriMeshByFlatContour( CrvLoc, dLinTol) ;
if ( pSTM == nullptr)
return false ;
// inserisco la superficie trimesh nel DB
@@ -2375,7 +2375,7 @@ GdbExecutor::SurfTriMeshByExtrusion( const STRVECTOR& vsParams)
if ( vsParams.size() == 5)
FromString( vsParams[4], dLinTol) ;
// calcolo la superficie
ISurfTriMesh* pSTM = GetSurfTriMeshByExtrusion( CrvLoc.Get(), vtExtr, false, dLinTol) ;
ISurfTriMesh* pSTM = GetSurfTriMeshByExtrusion( CrvLoc, vtExtr, false, dLinTol) ;
if ( pSTM == nullptr)
return false ;
// inserisco la superficie trimesh nel DB
@@ -2408,7 +2408,7 @@ GdbExecutor::SurfTriMeshByTwoPaths( const STRVECTOR& vsParams)
if ( vsParams.size() == 5)
FromString( vsParams[4], dLinTol) ;
// calcolo la superficie
ISurfTriMesh* pSTM = GetSurfTriMeshRuled( CrvLoc1.Get(), CrvLoc2.Get(), dLinTol) ;
ISurfTriMesh* pSTM = GetSurfTriMeshRuled( CrvLoc1, CrvLoc2, dLinTol) ;
if ( pSTM == nullptr)
return false ;
// inserisco la superficie trimesh nel DB
@@ -2466,7 +2466,7 @@ GdbExecutor::SurfTriMeshByScrewing( bool bMove, const STRVECTOR& vsParams)
if ( ! FromString( vsParams[5], dAngRotDeg))
return false ;
// calcolo la superficie
ISurfTriMesh* pSTM = GetSurfTriMeshByScrewing( CrvLoc.Get(), ptAx, vtAx, dAngRotDeg, dMove, dLinTol) ;
ISurfTriMesh* pSTM = GetSurfTriMeshByScrewing( CrvLoc, ptAx, vtAx, dAngRotDeg, dMove, dLinTol) ;
if ( pSTM == nullptr)
return false ;
// inserisco la superficie trimesh nel DB
@@ -3441,13 +3441,13 @@ GdbExecutor::GetPointParam( const string& sParam, const Frame3d& frPnt, Point3d&
if ( ! m_pGDB->GetGlobFrame( nIdEnt2, frEnt2))
return false ;
// se il riferimento è diverso da quello della prima entità, devo trasformarla
PtrOwner<ICurve> crvTrans( nullptr) ;
PtrOwner<ICurve> pcrvTrans( nullptr) ;
if ( ! AreSameFrame( frEnt, frEnt2)) {
crvTrans.Set( pCrv2->Clone()) ;
if ( IsNull( crvTrans))
pcrvTrans.Set( pCrv2->Clone()) ;
if ( IsNull( pcrvTrans))
return false ;
crvTrans->LocToLoc( frEnt2, frEnt) ;
pCrv2 = ::Get( crvTrans) ;
pcrvTrans->LocToLoc( frEnt2, frEnt) ;
pCrv2 = pcrvTrans ;
}
// eventuale terzo parametro : punto di riferimento
Point3d ptRef ;
@@ -5212,13 +5212,13 @@ GdbExecutor::CurveCopyBySplitClass( const STRVECTOR& vsParams)
if ( ! m_pGDB->GetGlobFrame( nIdCloCrv, frCloCrv))
return false ;
// se i riferimenti sono diversi, porto la seconda curva nel riferimento della prima
PtrOwner<ICurve> crvTrans ;
PtrOwner<ICurve> pcrvTrans ;
if ( ! AreSameFrame( frCrv, frCloCrv)) {
crvTrans.Set( pCloCrv->Clone()) ;
if ( IsNull( crvTrans))
pcrvTrans.Set( pCloCrv->Clone()) ;
if ( IsNull( pcrvTrans))
return false ;
crvTrans->LocToLoc( frCloCrv, frCrv) ;
pCloCrv = ::Get( crvTrans) ;
pcrvTrans->LocToLoc( frCloCrv, frCrv) ;
pCloCrv = pcrvTrans ;
}
// calcolo le intersezioni tra le due curve
IntersCurveCurve intCC( *pCrv, *pCloCrv, true) ;
@@ -5472,13 +5472,13 @@ GdbExecutor::ExecuteOutTextIcci( const string& sCmd2, const STRVECTOR& vsParams)
if ( ! m_pGDB->GetGlobFrame( nIdEnt2, frEnt2))
return false ;
// se i riferimenti sono diversi, porto la seconda entità nel riferimento della prima
PtrOwner<ICurve> crvTrans ;
PtrOwner<ICurve> pcrvTrans ;
if ( ! AreSameFrame( frEnt1, frEnt2)) {
crvTrans.Set( pCrv2->Clone()) ;
if ( IsNull( crvTrans))
pcrvTrans.Set( pCrv2->Clone()) ;
if ( IsNull( pcrvTrans))
return false ;
crvTrans->LocToLoc( frEnt2, frEnt1) ;
pCrv2 = ::Get( crvTrans) ;
pcrvTrans->LocToLoc( frEnt2, frEnt1) ;
pCrv2 = pcrvTrans ;
}
// calcolo le intersezioni tra le due curve
IntersCurveCurve intCC( *pCrv1, *pCrv2, true) ;