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

EgtMachKernel 1.6t1 :

Browse Source 
- aggiunto a Disposizione flag di presenza movimenti manuali
- portata in interfaccia funzione per rimovere movimento finale in home da operazione.
This commit is contained in:
Dario Sassi
2016-08-05 18:40:59 +00:00
parent fec9890054
commit aaa94a79a0
23 changed files with 100 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Sawing.cpp
+4 -3
View File
@@ -715,7 +715,7 @@ Sawing::GetGeometry( SELVECTOR& vIds) const
//----------------------------------------------------------------------------
bool
Sawing::AdjustEndPointForAxesCalc( const CamData* pCamData, Point3d& ptP)
Sawing::AdjustEndPointForAxesCalc( const CamData* pCamData, Point3d& ptP) const
{
// compenso il raggio dell'utensile
ptP += pCamData->GetCorrDir() * ( m_TParams.m_dDiam / 2) ;
@@ -1187,8 +1187,9 @@ Sawing::ProcessLine( const ICurve* pCrvP, const ICurveLine* pLineC, const ICurve
pLine->Translate( - vtCorr * dDepth) ;
// calcolo elevazione (sui due bordi della striscia, leggermente allargata)
double dElev, dElev2 ;
Vector3d vtSafe = vtTool * ( 10 * EPS_SMALL) ;
Vector3d vtThick = vtTool * ( m_TParams.m_dThick + 10 * EPS_SMALL) ;
Vector3d vtToolH( vtTool.x, vtTool.y, 0) ;
Vector3d vtSafe = vtToolH * ( 10 * EPS_SMALL) ;
Vector3d vtThick = vtToolH * ( m_TParams.m_dThick / vtToolH.SqLen() + 10 * EPS_SMALL) ;
if ( ! GetElevation( m_nPhase, pLine->GetStart() - vtSafe, pLine->GetEnd() - vtSafe, vtCorr, dElev) ||
! GetElevation( m_nPhase, pLine->GetStart() + vtThick, pLine->GetEnd() + vtThick, vtCorr, dElev2) ) {
LOG_INFO( GetEMkLogger(), "Error in Sawing : Entity GetElevation") ;