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

EgtGeomKernel 1.8f2 :

Browse Source 
- migliorie e correzioni a Zmap.
This commit is contained in:
Dario Sassi
2017-06-10 15:43:14 +00:00
parent 17425bc753
commit d9d8b40a02
7 changed files with 287 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VolTriZmapVolume.cpp
+4 -4
View File
@@ -185,15 +185,15 @@ VolZmap::SubtractIntervals( unsigned int nGrid, unsigned int nI, unsigned int nJ
int nMinK = max( int( floor( ( ( dMin - 0.5 * m_dStep) / m_dStep - EPS_SMALL))), 0) ;
int nMaxK = max( int( floor( ( ( dMax + 0.5 * m_dStep) / m_dStep + EPS_SMALL))), 0) ;
int nMinZBlock = max( 0, nMinK / int( m_nDexNumPBlock)) ;
int nMinZBlock = ( m_nMapNum == 1 ? 0 : max( 0, nMinK / int( m_nDexNumPBlock))) ;
int nMaxZBlock = min( int( m_nFracLin[2] - 1), nMaxK / int( m_nDexNumPBlock)) ;
for ( int k = nMinZBlock ; k <= nMaxZBlock ; ++ k) {
int nBlockNum = k * nLayerBlock + nYBlock * m_nFracLin[0] + nXBlock ;
m_BlockToUpdate[nBlockNum] = true ;
}
}
else if ( nGrid == 1) {
int nYBlock = min( nI / m_nDexNumPBlock, m_nFracLin[1] - 1) ;
@@ -210,6 +210,7 @@ VolZmap::SubtractIntervals( unsigned int nGrid, unsigned int nI, unsigned int nJ
m_BlockToUpdate[nBlockNum] = true ;
}
}
else if ( nGrid == 2) {
int nXBlock = min( nJ / m_nDexNumPBlock, m_nFracLin[0] - 1) ;
@@ -222,7 +223,6 @@ VolZmap::SubtractIntervals( unsigned int nGrid, unsigned int nI, unsigned int nJ
int nMaxYBlock = min( int( m_nFracLin[1] - 1), nMaxJ / int( m_nDexNumPBlock)) ;
for ( int k = nMinYBlock ; k <= nMaxYBlock ; ++ k) {
int nBlockNum = nZBlock * nLayerBlock + k * m_nFracLin[0] + nXBlock ;
m_BlockToUpdate[nBlockNum] = true ;
}