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

EgtMachKernel 2.5a4 :

Browse Source 
- corretto controllo e modifica approcci e retrazioni lame in milling.
This commit is contained in:
DarioS
2023-01-31 19:53:35 +01:00
parent 4f264ee64e
commit 8b0bbe4ab0
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EgtMachKernel.rc
BIN
View File
Binary file not shown.
Milling.cpp
+7 -7
View File
@@ -2338,21 +2338,21 @@ Milling::AddStandardMilling( const ICurveComposite* pCompo, const Vector3d& vtTo
Vector3d vtAppr2 = ptP1 - ptStart ;
if ( ! vtAppr2.Normalize())
vtAppr2 = CalcCorrDir( pCompo, i) ;
double dSawStartElev1, dSawStartElev2 ;
double dSawStartElev1 = -1, dSawStartElev2 = -1 ;
GetElevation( m_nPhase, ptTest, vtTool, 0.5 * m_TParams.m_dDiam, vtAppr1, dSawStartElev1) ;
GetElevation( m_nPhase, ptTest, vtTool, 0.5 * m_TParams.m_dDiam, vtAppr2, dSawStartElev2) ;
if ( dSawStartElev1 > EPS_SMALL && dSawStartElev2 > EPS_SMALL) {
if ( dSawStartElev1 > -EPS_SMALL && dSawStartElev2 > -EPS_SMALL) {
bool bFirst = ( dSawStartElev1 < dSawStartElev2) ;
vtAppr = ( bFirst ? vtAppr1 : vtAppr2) ;
dSawStartElev = ( bFirst ? dSawStartElev1 : dSawStartElev2) ;
bSideStart = true ;
}
else if ( dSawStartElev1 > EPS_SMALL) {
else if ( dSawStartElev1 > -EPS_SMALL) {
vtAppr = vtAppr1 ;
dSawStartElev = dSawStartElev1 ;
bSideStart = true ;
}
else if ( dSawStartElev2 > EPS_SMALL) {
else if ( dSawStartElev2 > -EPS_SMALL) {
vtAppr = vtAppr2 ;
dSawStartElev = dSawStartElev2 ;
bSideStart = true ;
@@ -2497,18 +2497,18 @@ Milling::AddStandardMilling( const ICurveComposite* pCompo, const Vector3d& vtTo
double dSawEndElev1, dSawEndElev2 ;
GetElevation( m_nPhase, ptTest, vtTool, 0.5 * m_TParams.m_dDiam, vtRetr1, dSawEndElev1) ;
GetElevation( m_nPhase, ptTest, vtTool, 0.5 * m_TParams.m_dDiam, vtRetr2, dSawEndElev2) ;
if ( dSawEndElev1 > EPS_SMALL && dSawEndElev2 > EPS_SMALL) {
if ( dSawEndElev1 > -EPS_SMALL && dSawEndElev2 > -EPS_SMALL) {
bool bFirst = ( dSawEndElev1 < dSawEndElev2) ;
vtRetr = ( bFirst ? vtRetr1 : vtRetr2) ;
dSawEndElev = ( bFirst ? dSawEndElev1 : dSawEndElev2) ;
bSideEnd = true ;
}
else if ( dSawEndElev1 > EPS_SMALL) {
else if ( dSawEndElev1 > -EPS_SMALL) {
vtRetr = vtRetr1 ;
dSawEndElev = dSawEndElev1 ;
bSideEnd = true ;
}
else if ( dSawEndElev2 > EPS_SMALL) {
else if ( dSawEndElev2 > -EPS_SMALL) {
vtRetr = vtRetr2 ;
dSawEndElev = dSawEndElev2 ;
bSideEnd = true ;