From e10c304c0b758d8a9b5aa51bfc6f89b78353647a Mon Sep 17 00:00:00 2001 From: Dario Sassi Date: Thu, 21 Nov 2019 12:30:12 +0000 Subject: [PATCH] EgtGeomKernel : - correzione a GetPartLocalBBox e GetPartlBBox di VolZmap. --- VolZmap.cpp | 40 ++-------------------------------------- 1 file changed, 2 insertions(+), 38 deletions(-) diff --git a/VolZmap.cpp b/VolZmap.cpp index 31ec874..99b7858 100644 --- a/VolZmap.cpp +++ b/VolZmap.cpp @@ -508,7 +508,7 @@ VolZmap::GetPartLocalBBox( int nPart, BBox3d& b3Loc, int nFlag) const for ( int nMap = 0 ; nMap < 3 ; ++ nMap) { for ( int nDex = 0 ; nDex < m_nDim[nMap] ; ++ nDex) { for ( int nInt = 0 ; nInt < int( m_Values[nMap][nDex].size()) ; ++ nInt) { - if ( m_Values[nMap][nDex][nInt].nCompo == nPart) { + if ( m_Values[nMap][nDex][nInt].nCompo == nPart + 1) { // Indici del dexel int nI = nDex % m_nNx[nMap] ; int nJ = nDex / m_nNx[nMap] ; @@ -567,7 +567,7 @@ VolZmap::GetPartBBox( int nPart, const Frame3d& frRef, BBox3d& b3Ref, int nFlag) for ( int nMap = 0 ; nMap < 3 ; ++ nMap) { for ( int nDex = 0 ; nDex < m_nDim[nMap] ; ++ nDex) { for ( int nInt = 0 ; nInt < int( m_Values[nMap][nDex].size()) ; ++ nInt) { - if ( m_Values[nMap][nDex][nInt].nCompo == nPart) { + if ( m_Values[nMap][nDex][nInt].nCompo == nPart + 1) { // Indici del dexel int nI = nDex % m_nNx[nMap] ; int nJ = nDex / m_nNx[nMap] ; @@ -730,43 +730,7 @@ VolZmap::CheckMapConnection( void) for ( int tMap = 0 ; tMap < m_nMapNum ; ++ tMap) { for ( int tDex = 0 ; tDex < m_nDim[tMap] ; ++ tDex) { for ( int tInt = 0 ; tInt < int( m_Values[tMap][tDex].size()) ; ++ tInt) { - m_Values[tMap][tDex][tInt].nCompo = 0 ; - - //// Controlli sui tratti di dexel non incidenti su nodi del reticolo - // if ( tMap == 0) { - // // Z degli estremi del segmento - // double dZMin = m_Values[tMap][tDex][tInt].dMin ; - // double dZMax = m_Values[tMap][tDex][tInt].dMax ; - // // Indici k dei voxels in cui cadono le Z - // int nKmin = int( floor( ( dZMin - 2 * EPS_SMALL) / m_dStep - 0.5)) ; - // int nKmax = int( floor( ( dZMax + 2 * EPS_SMALL) / m_dStep - 0.5)) ; - // // Se cadono nello stesso voxel imposto a -1 il valore della componente connessa - // if ( nKmax - nKmin == 0) - // m_Values[tMap][tDex][tInt].nCompo = -1 ; - // } - // else if ( tMap == 1) { - // // X degli estremi del segmento - // double dXMin = m_Values[tMap][tDex][tInt].dMin ; - // double dXMax = m_Values[tMap][tDex][tInt].dMax ; - // // Indici i dei voxels in cui cadono le X - // int nImin = int( floor( ( dXMin - 2 * EPS_SMALL) / m_dStep - 0.5)) ; - // int nImax = int( floor( ( dXMax + 2 * EPS_SMALL) / m_dStep - 0.5)) ; - // // Se cadono nello stesso voxel imposto a -1 il valore della componente connessa - // if ( nImax - nImin == 0) - // m_Values[tMap][tDex][tInt].nCompo = -1 ; - // } - // else { - // // Y degli estremi del segmento - // double dYMin = m_Values[tMap][tDex][tInt].dMin ; - // double dYMax = m_Values[tMap][tDex][tInt].dMax ; - // // Indici j dei voxels in cui cadono le X - // int nJmin = int( floor( ( dYMin - 2 * EPS_SMALL) / m_dStep - 0.5)) ; - // int nJmax = int( floor( ( dYMax + 2 * EPS_SMALL) / m_dStep - 0.5)) ; - // // Se cadono nello stesso voxel imposto a -1 il valore della componente connessa - // if ( nJmax - nJmin == 0) - // m_Values[tMap][tDex][tInt].nCompo = -1 ; - // } } } }