Merge pull request #141 from chamberm/SelectFiberBugFix

Fiber selection and display behavior
scilus · Sep 3, 2013 · f31251a · f31251a
2 parents 3cf2aa7 + e8c5456
commit f31251a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 10 deletions.
diff --git a/src/dataset/Fibers.cpp b/src/dataset/Fibers.cpp
@@ -8,6 +8,7 @@
 
 #include "Anatomy.h"
 #include "DatasetManager.h"
+#include "RTTrackingHelper.h"
 
 #include "../main.h"
 #include "../Logger.h"
@@ -3599,7 +3600,12 @@ void Fibers::updatePropertiesSizer()
 bool Fibers::toggleShow()
 {
     SceneManager::getInstance()->getSelectionTree().notifyAllObjectsNeedUpdating();
-    return DatasetInfo::toggleShow();
+	DatasetInfo::toggleShow();
+	if(getShow())
+	{
+		SceneManager::getInstance()->setSelBoxChanged(true);
+	}
+	return getShow();
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -3858,13 +3864,9 @@ void Fibers::convertFromRTT( std::vector<std::vector<Vector> >* RTT )
     createColorArray( false );
     m_type = FIBERS;
     m_fullPath = MyApp::frame->m_pMainGL->m_pRealTimeFibers->getRTTFileName();
-
-    // TODO what is the use of this?
-#ifdef __WXMSW__
-    m_name = wxT( "RTTFibers" );
-#else
-    m_name = wxT( "RTTFibers" );
-#endif
+
+	wxString id = wxString::Format(_T("%d"), RTTrackingHelper::getInstance()->generateId());
+    m_name = wxT( "RTTFibers" + id );
 
 	m_pOctree = new Octree( 2, m_pointArray, m_countPoints );
 }
diff --git a/src/dataset/FibersGroup.cpp b/src/dataset/FibersGroup.cpp
@@ -10,6 +10,7 @@
 #include "../Logger.h"
 #include "../main.h"
 #include "../gui/MainFrame.h"
+#include "../gui/SceneManager.h"
 #include "../misc/XmlHelper.h"
 
 #include <wx/tglbtn.h>
@@ -439,6 +440,11 @@ void FibersGroup::OnToggleVisibleBtn()
     {
         (*it)->setShow( show );
     }
+
+	if(getShow())
+	{
+		SceneManager::getInstance()->setSelBoxChanged(true);
+	}
 }
 
 void FibersGroup::OnToggleIntensityBtn()

diff --git a/src/dataset/RTTrackingHelper.cpp b/src/dataset/RTTrackingHelper.cpp
@@ -13,7 +13,8 @@ RTTrackingHelper::RTTrackingHelper()
     m_isRTTDirty( false ),
     m_isRTTReady( false ),
     m_isTrackActionPlaying( false ),
-    m_isPaused( true )
+    m_isPaused( true ),
+	m_id( 0 )
 {
 }
 

diff --git a/src/dataset/RTTrackingHelper.h b/src/dataset/RTTrackingHelper.h
@@ -34,7 +34,7 @@ class RTTrackingHelper
     void setTrackActionPause(bool paused) {m_isPaused = paused;}
 	void setShellSeed(bool enabled) {m_isShellSeeds = enabled;}
 	void setSeedMap(bool enabled) {m_isSeedMap = enabled;}
-
+	int generateId() {return (++m_id);}
 
 protected:
     RTTrackingHelper(void);
@@ -55,6 +55,7 @@ class RTTrackingHelper
     bool m_isRTTReady;
     bool m_isTrackActionPlaying;
     bool m_isPaused;
+	int m_id;
 
 };