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

EgtExecutor 1.9l4 :

Browse Source 
- fabs sostituito da abs.
This commit is contained in:
Dario Sassi
2018-12-27 11:22:01 +00:00
parent 542a4aee99
commit da88af65ed
7 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
EXE_NstBoxNesting.cpp
+3 -3
View File
@@ -121,7 +121,7 @@ ExePackBox( int nId, double dXmin, double dYmin, double dXmax, double dYmax, dou
sort( vY.begin(), vY.end(), greater<double>()) ;
}
// Elimino i valori coincidenti
vY.erase( unique( vY.begin(), vY.end(), [](double a, double b){ return fabs( a - b) < EPS_SMALL ;}), vY.end()) ;
vY.erase( unique( vY.begin(), vY.end(), [](double a, double b){ return abs( a - b) < EPS_SMALL ;}), vY.end()) ;
// Testo le Y in ordine opportuno
bool bFound = false ;
double dXok = INFINITO, dYok = INFINITO ;
@@ -232,7 +232,7 @@ ExePackBoxCluster( const INTVECTOR& vIds, double dXmin, double dYmin, double dXm
sort( vY.begin(), vY.end(), greater<double>()) ;
}
// Elimino i valori coincidenti
vY.erase( unique( vY.begin(), vY.end(), [](double a, double b){ return fabs( a - b) < EPS_SMALL ;}), vY.end()) ;
vY.erase( unique( vY.begin(), vY.end(), [](double a, double b){ return abs( a - b) < EPS_SMALL ;}), vY.end()) ;
// Testo le Y in ordine opportuno
bool bFound = false ;
double dXok = INFINITO, dYok = INFINITO ;
@@ -446,7 +446,7 @@ ExeMoveBoxCluster( const INTVECTOR& vIds, Vector3d& vtMove,
nId2 = ( bInRoot ? ExeGetNextPart( nId2, true) : ExeGetNextGroup( nId2)) ;
}
// Ordino questi box in senso contrario al movimento
if ( fabs( vtMoveXY.x) >= fabs( vtMoveXY.y)) {
if ( abs( vtMoveXY.x) >= abs( vtMoveXY.y)) {
if ( vtMoveXY.x > 0)
// movimento prevalente in X+ -> ordine secondo X decrescente
sort( vBox.begin(), vBox.end(), []( const BBox3d& a, const BBox3d& b)