From cc1d0af7743d0eb1cace9d142be7a10b7b153332 Mon Sep 17 00:00:00 2001 From: chamberm Date: Wed, 4 Nov 2015 11:42:57 -0500 Subject: [PATCH 1/2] Update README.rst --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 99e2b4dc..29a5910a 100644 --- a/README.rst +++ b/README.rst @@ -20,6 +20,7 @@ Tutorials New rs-fMRI and real-time fiber tractography tutorials soon available: `Tutorial Page`_. New **video tutorials** of the Fibernavigator are available. +- `Optic radiation`_ : Real-time tractography of the optic radiation using HCP data - `Scene navigation`_: how to interact with the 3D view, move planes, etc. - `Mesh display and interaction`_: how to create and modify the display of meshes. - `Drawing tool`_: how to draw on empty or already existing anatomies. @@ -72,6 +73,5 @@ All issues have been moved to the new `issue tracker`_. New issues will also be .. _Opacity rendering: https://www.youtube.com/watch?v=IzJ537KNpR0 .. _Image Gallery: http://chamberm.github.io/media.html .. _Tutorial Page: http://chamberm.github.io/fibernavigator_single.html - - +.. _Optic radiation: https://www.youtube.com/watch?v=UDFpvyrXNyA From 3797a276312277878e56c0257bdb9614de30ebdb Mon Sep 17 00:00:00 2001 From: Maxime C Date: Fri, 13 Nov 2015 14:42:51 -0500 Subject: [PATCH 2/2] fixed important RTT initialization problem where backward and forward directions where not equivalent --- src/dataset/RTTFibers.cpp | 14 +++++++++++++- src/dataset/RTTFibers.h | 2 ++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/src/dataset/RTTFibers.cpp b/src/dataset/RTTFibers.cpp index 38bcc08f..46250143 100644 --- a/src/dataset/RTTFibers.cpp +++ b/src/dataset/RTTFibers.cpp @@ -147,6 +147,8 @@ void RTTFibers::clearFibersRTT() m_streamlinesColors.clear(); m_streamlinesPoints.clear(); + m_storedDir.clear(); + if( SceneManager::getInstance()->isUsingVBO() ) { glDeleteBuffers( 2, m_bufferObjectsRTT ); @@ -1500,7 +1502,17 @@ void RTTFibers::performHARDIRTT(Vector seed, int bwdfwd, vector& points, if( withinMapThreshold(sticksNumber, currPosition) && !m_stop && absPeak != 0) { bool initWithDir = RTTrackingHelper::getInstance()->isInitSeed(); - sticks = pickDirection(m_pMaximasInfo->getMainDirData()->at(sticksNumber), initWithDir, currPosition); + + if(bwdfwd != -1) + { + sticks = pickDirection(m_pMaximasInfo->getMainDirData()->at(sticksNumber), initWithDir, currPosition); + m_storedDir = sticks; + } + else + { + sticks = m_storedDir; + } + currDirection.x = flippedAxes.x * sticks[0]; currDirection.y = flippedAxes.y * sticks[1]; diff --git a/src/dataset/RTTFibers.h b/src/dataset/RTTFibers.h index 62712ee2..f8d9f828 100644 --- a/src/dataset/RTTFibers.h +++ b/src/dataset/RTTFibers.h @@ -127,6 +127,8 @@ class RTTFibers std::vector m_streamlinesPoints; // Points to be rendered Forward std::vector m_streamlinesColors; //Color (local directions)Forward + + std::vector m_storedDir; float m_alpha;