update octree

Author: Maxime Chamberland

src/dataset/Fibers.cpp

@@ -3773,9 +3773,9 @@ void Fibers::setFibersLength()
         {
             // The values are in pixel, we need to set them in millimeters using the spacing
             // specified in the anatomy file ( m_datasetHelper->xVoxel... ).
-            dx = ( currentFiberPoints[i].x - currentFiberPoints[i - 1].x ) * voxelX;
-            dy = ( currentFiberPoints[i].y - currentFiberPoints[i - 1].y ) * voxelY;
-            dz = ( currentFiberPoints[i].z - currentFiberPoints[i - 1].z ) * voxelZ;
+            dx = ( currentFiberPoints[i].x - currentFiberPoints[i - 1].x );
+            dy = ( currentFiberPoints[i].y - currentFiberPoints[i - 1].y );
+            dz = ( currentFiberPoints[i].z - currentFiberPoints[i - 1].z );
             FArray currentVector( dx, dy, dz );
             m_length[j] += ( float )currentVector.norm();
         }

src/dataset/Fibers.h

@@ -111,7 +111,7 @@ class Fibers : public DatasetInfo
     void    setLocalGlobal(bool value);
     void    setUsingEndpts(bool value);
 
-    void    flipAxis( AxisType i_axe );
+    void    flipAxis( AxisType i_axe);
     void    fitToAnat( bool saving);
 
     int     getFibersCount() const { return m_countLines; }

src/dataset/FibersGroup.h

@@ -66,7 +66,7 @@ class FibersGroup : public DatasetInfo
     bool    load( wxString  filename ) { return false; };
     void    draw()                      {};
     void    smooth()                    {};
-    void    flipAxis( AxisType i_axe )  {};
+    void    flipAxis( AxisType i_axe)  {};
     void    drawVectors()               {};
     void    generateTexture()           {};
     void    generateGeometry()          {};

src/dataset/Octree.cpp

@@ -37,35 +37,37 @@ Octree::~Octree()
 //////////////////////////////////////////
 void Octree::findBoundingBox()
 {
-    m_maxPointX = m_pointArray[0];
-    m_maxPointY = m_pointArray[1];
-    m_maxPointZ = m_pointArray[2];
+	DatasetManager *pDatMan = DatasetManager::getInstance();
 
-    m_minPointX = m_pointArray[0];
-    m_minPointY = m_pointArray[1];
-    m_minPointZ = m_pointArray[2];
+    m_maxPointX = pDatMan->getColumns() * pDatMan->getVoxelX();
+    m_maxPointY = pDatMan->getRows() * pDatMan->getVoxelY();
+    m_maxPointZ = pDatMan->getFrames() * pDatMan->getVoxelZ();
 
-    //Find the bounding box for the dataSet
-    for(int i=0; i < m_countPoints; i++)
-    {
-        if(m_pointArray[i*3] > m_maxPointX)
-            m_maxPointX = m_pointArray[i*3];
+    m_minPointX = 0.0f;
+    m_minPointY = 0.0f;
+    m_minPointZ = 0.0f;
 
-        if(m_pointArray[i*3+1] > m_maxPointY)
-            m_maxPointY = m_pointArray[i*3+1];
+    ////Find the bounding box for the dataSet
+    //for(int i=0; i < m_countPoints; i++)
+    //{
+    //    if(m_pointArray[i*3] > m_maxPointX)
+    //        m_maxPointX = m_pointArray[i*3];
 
-        if(m_pointArray[i*3+2] > m_maxPointZ)
-            m_maxPointZ = m_pointArray[i*3+2];
+    //    if(m_pointArray[i*3+1] > m_maxPointY)
+    //        m_maxPointY = m_pointArray[i*3+1];
 
-        if(m_pointArray[i*3] < m_minPointX)
-            m_minPointX = m_pointArray[i*3];
+    //    if(m_pointArray[i*3+2] > m_maxPointZ)
+    //        m_maxPointZ = m_pointArray[i*3+2];
 
-        if(m_pointArray[i*3+1] < m_minPointY)
-            m_minPointY = m_pointArray[i*3+1];
+    //    if(m_pointArray[i*3] < m_minPointX)
+    //        m_minPointX = m_pointArray[i*3];
 
-        if(m_pointArray[i*3+2] < m_minPointZ)
-            m_minPointZ = m_pointArray[i*3+2];
-    }
+    //    if(m_pointArray[i*3+1] < m_minPointY)
+    //        m_minPointY = m_pointArray[i*3+1];
+
+    //    if(m_pointArray[i*3+2] < m_minPointZ)
+    //        m_minPointZ = m_pointArray[i*3+2];
+    //}
 }
 
 //////////////////////////////////////////