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

EgtMachKernel 2.2e1 :

Browse Source 
- tolto piccolo offset interno per evitare problemi in preview di attacchi e uscite lama su archi.
This commit is contained in:
Dario Sassi
2020-05-07 06:56:02 +00:00
parent 5d843f376f
commit 2f4b643a32
3 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtMachKernel.rc
BIN
View File
Binary file not shown.
Sawing.cpp
+6 -10
View File
@@ -2401,7 +2401,7 @@ Sawing::GenerateExtCurvePv( const ICurveComposite* pCrv, double dOffs,
m_pGeomDB->SetMaterial( nId, colCut) ;
// contorno per parte iniziale di taglio
PtrOwner<ICurveComposite> pCompo2( GenerateExtArcPvPreCut( pArc, dIntRad, dExtRad, dDeltaT, 0, 0)) ;
PtrOwner<ICurveComposite> pCompo2( GenerateExtArcPvPreCut( pArc, dIntRad, dExtRad, dDeltaT, 0)) ;
if ( IsNull( pCompo2))
return false ;
pCompo2->Translate( dMyZmove * vtCorr) ;
@@ -2410,7 +2410,7 @@ Sawing::GenerateExtCurvePv( const ICurveComposite* pCrv, double dOffs,
m_pGeomDB->SetMaterial( nId2, ( bFirst ? BLUE : colCut)) ;
// contorno per parte finale di taglio
PtrOwner<ICurveComposite> pCompo3( GenerateExtArcPvPostCut( pArc, dIntRad, dExtRad, dDeltaT, 0, 0)) ;
PtrOwner<ICurveComposite> pCompo3( GenerateExtArcPvPostCut( pArc, dIntRad, dExtRad, dDeltaT, 0)) ;
if ( IsNull( pCompo3))
return false ;
pCompo3->Translate( dMyZmove * vtCorr) ;
@@ -2433,7 +2433,7 @@ Sawing::GenerateExtCurvePv( const ICurveComposite* pCrv, double dOffs,
m_pGeomDB->SetMaterial( nRrId, INVISIBLE) ;
// regione di pre-taglio
PtrOwner<ICurveComposite> pCmpRs( GenerateExtArcPvPreCut( pArc, dIntRad, dExtRad, dDeltaT, 10 * EPS_SMALL, dExtraL)) ;
PtrOwner<ICurveComposite> pCmpRs( GenerateExtArcPvPreCut( pArc, dIntRad, dExtRad, dDeltaT, dExtraL)) ;
if ( IsNull( pCmpRs))
return false ;
SurfFlatRegionByContours SfrCntrRs ;
@@ -2447,7 +2447,7 @@ Sawing::GenerateExtCurvePv( const ICurveComposite* pCrv, double dOffs,
m_pGeomDB->SetMaterial( nRsId, INVISIBLE) ;
// regione di post-taglio
PtrOwner<ICurveComposite> pCmpRe( GenerateExtArcPvPostCut( pArc, dIntRad, dExtRad, dDeltaT, 10 * EPS_SMALL, dExtraL)) ;
PtrOwner<ICurveComposite> pCmpRe( GenerateExtArcPvPostCut( pArc, dIntRad, dExtRad, dDeltaT, dExtraL)) ;
if ( IsNull( pCmpRe))
return false ;
SurfFlatRegionByContours SfrCntrRe ;
@@ -2526,7 +2526,7 @@ Sawing::GenerateExtArcPvTrueCut( const ICurveArc* pArc, double dIntRad, double d
//----------------------------------------------------------------------------
ICurveComposite*
Sawing::GenerateExtArcPvPreCut( const ICurveArc* pArc, double dIntRad, double dExtRad,
double dDeltaT, double dIntOffs, double dSafety)
double dDeltaT, double dSafety)
{
// direzione iniziale del taglio
Vector3d vtStaDir ;
@@ -2538,8 +2538,6 @@ Sawing::GenerateExtArcPvPreCut( const ICurveArc* pArc, double dIntRad, double dE
pArc->GetStartPoint( ptStart) ;
if ( ! AreHeadWorkOnSameSide())
ptStart -= vtStaVer * m_TParams.m_dThick ;
if ( dIntOffs > EPS_SMALL)
ptStart += vtStaVer * dIntOffs ;
// punto prima di inizio
Point3d ptPre = ptStart - vtStaDir * dDeltaT ;
// punto fuori prima di inizio
@@ -2588,7 +2586,7 @@ Sawing::GenerateExtArcPvPreCut( const ICurveArc* pArc, double dIntRad, double dE
//----------------------------------------------------------------------------
ICurveComposite*
Sawing::GenerateExtArcPvPostCut( const ICurveArc* pArc, double dIntRad, double dExtRad,
double dDeltaT, double dIntOffs, double dSafety)
double dDeltaT, double dSafety)
{
// direzione finale del taglio
Vector3d vtEndDir ;
@@ -2600,8 +2598,6 @@ Sawing::GenerateExtArcPvPostCut( const ICurveArc* pArc, double dIntRad, double d
vtEndVer.Normalize() ;
if ( ! AreHeadWorkOnSameSide())
ptEnd -= vtEndVer * m_TParams.m_dThick ;
if ( dIntOffs > EPS_SMALL)
ptEnd += vtEndVer * dIntOffs ;
// punto dopo fine
Point3d ptPost = ptEnd + vtEndDir * dDeltaT ;
// punto fuori dopo fine
Sawing.h
+2 -2
View File
@@ -94,9 +94,9 @@ class Sawing : public Machining
ICurveComposite* GenerateExtArcPvTrueCut( const ICurveArc* pArc, double dIntRad, double dExtRad,
double dSafety) ;
ICurveComposite* GenerateExtArcPvPreCut( const ICurveArc* pArc, double dIntRad, double dExtRad,
double dDeltaT, double dIntOffs, double dSafety) ;
double dDeltaT, double dSafety) ;
ICurveComposite* GenerateExtArcPvPostCut( const ICurveArc* pArc, double dIntRad, double dExtRad,
double dDeltaT, double dIntOffs, double dSafety) ;
double dDeltaT, double dSafety) ;
bool GenerateExtCurveCl( const ICurveComposite* pCrv,
double dElev, double dExtraCut, const std::string& sName, int nClId) ;
bool ProcessIntArc( const ICurve* pCrvP, const ICurveArc* pArcC, const ICurve* pCrvN,