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

EgtMachKernel 1.8f6 :

Browse Source 
- correzione arrotondamento per calcolo numero step in tagli con lama.
This commit is contained in:
Dario Sassi
2017-07-03 18:01:45 +00:00
parent d598c1a66b
commit 41a5570466
2 changed files with 6 additions and 6 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 -6
View File
@@ -1592,7 +1592,7 @@ Sawing::GenerateLineCl( const ICurveLine* pLine, const Vector3d& vtTool, const V
double dCutH = dElev - dExtraCut ;
int nStep = 2 ;
if ( m_Params.m_nStepType == SAW_ST_ZIGZAG) {
nStep = static_cast<int>( ceil( dCutH / dActStep)) ;
nStep = static_cast<int>( ceil( dCutH / ( dActStep + EPS_SMALL))) ;
if ( ( nStep % 2) == 1)
nStep += 1 ;
}
@@ -1629,7 +1629,7 @@ Sawing::GenerateLineCl( const ICurveLine* pLine, const Vector3d& vtTool, const V
// 2-3 -> lavorazione
// calcolo numero e valore degli step
double dCutH = dElev - dExtraCut ;
int nStep = static_cast<int>( ceil( dCutH / dActStep)) ;
int nStep = static_cast<int>( ceil( dCutH / ( dActStep + EPS_SMALL))) ;
double dStep = dCutH / nStep ;
// esecuzione degli step
for ( int i = nStep - 1 ; i >= 0 ; -- i) {
@@ -2215,7 +2215,7 @@ Sawing::GenerateExtCurveCl( const ICurveComposite* pCrv,
double dCutH = dElev - dExtraCut ;
int nStep = 2 ;
if ( m_Params.m_nStepType == SAW_ST_ZIGZAG) {
nStep = static_cast<int>( ceil( dCutH / m_Params.m_dStepExtArc)) ;
nStep = static_cast<int>( ceil( dCutH / ( m_Params.m_dStepExtArc + EPS_SMALL))) ;
if ( ( nStep % 2) == 1)
nStep += 1 ;
}
@@ -2308,7 +2308,7 @@ Sawing::GenerateExtCurveCl( const ICurveComposite* pCrv,
// 2-3 -> lavorazione
// calcolo numero e valore degli step
double dCutH = dElev - dExtraCut ;
int nStep = static_cast<int>( ceil( dCutH / m_Params.m_dStepExtArc)) ;
int nStep = static_cast<int>( ceil( dCutH / ( m_Params.m_dStepExtArc + EPS_SMALL))) ;
double dStep = dCutH / nStep ;
// esecuzione degli step
for ( int i = nStep - 1 ; i >= 0 ; -- i) {
@@ -2898,7 +2898,7 @@ Sawing::GenerateIntArcCl( const ICurveArc* pArc,
double dCutH = dElev - dExtraCut ;
int nStep = 2 ;
if ( m_Params.m_nStepType == SAW_ST_ZIGZAG) {
nStep = static_cast<int>( ceil( dCutH / m_Params.m_dStepIntArc)) ;
nStep = static_cast<int>( ceil( dCutH / ( m_Params.m_dStepIntArc + EPS_SMALL))) ;
if ( ( nStep % 2) == 1)
nStep += 1 ;
}
@@ -2993,7 +2993,7 @@ Sawing::GenerateIntArcCl( const ICurveArc* pArc,
// 2-3 -> lavorazione
// calcolo numero e valore degli step
double dCutH = dElev - dExtraCut ;
int nStep = static_cast<int>( ceil( dCutH / m_Params.m_dStepIntArc)) ;
int nStep = static_cast<int>( ceil( dCutH / ( m_Params.m_dStepIntArc + EPS_SMALL))) ;
double dStep = dCutH / nStep ;
// esecuzione degli step
for ( int i = nStep - 1 ; i >= 0 ; -- i) {