Merge branch 'master' of ssh://git.creatis.insa-lyon.fr/clitk

diff --git a/cmake/dependencies.cmake b/cmake/dependencies.cmake
index a871fecd0d19523b2fa28823856adcf5637c32ed..bdd63163dd9f99822bef2e5d4743d0817d840f3e 100644 (file)
--- a/cmake/dependencies.cmake
+++ b/cmake/dependencies.cmake
@@ -44,15 +44,15 @@ find_package(Gengetopt)
 
 #=========================================================
 # Find libstatgrab is installed, add clitkMemoryUsage.cxx in the library
-if(NOT DEFINED CLITK_MEMORY_INFO OR CLITK_MEMORY_INFO)
-  find_library(LIBSTATGRAB NAMES statgrab PATHS)
-  if(${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
+#if(NOT DEFINED CLITK_MEMORY_INFO OR CLITK_MEMORY_INFO)
+#  find_library(LIBSTATGRAB NAMES statgrab PATHS)
+#  if(${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
 #  message("Install libstatgrab (http://www.i-scream.org/libstatgrab/) for memory usage information")
     set(CLITK_MEMORY_INFO OFF)
-  else(${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
-    set(CLITK_MEMORY_INFO ON)
-  endif(${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
-endif()
+#  else(${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
+#    set(CLITK_MEMORY_INFO ON)
+#  endif(${LIBSTATGRAB} MATCHES "LIBSTATGRAB-NOTFOUND")
+#endif()
 #=========================================================
 
 

diff --git a/vv/vvSlicer.cxx b/vv/vvSlicer.cxx
index db4b0cf525811c16c20b2742fc081d3c06be4336..7efaf2675c4caa351f090d1ce2de2a5d3e397972 100644 (file)
--- a/vv/vvSlicer.cxx
+++ b/vv/vvSlicer.cxx
@@ -916,9 +916,9 @@ int vvSlicer::GetTSlice()
 int vvSlicer::GetMaxCurrentTSlice()
 { 
   int t = mCurrentTSlice;
-  if(mOverlay)
+  if(mOverlay && mOverlayActor->GetVisibility())
     t = std::max(t, mCurrentOverlayTSlice);
-  if(mFusion&& (mFusionSequenceCode<0)) //ignore fusionSequence data: for these, the times are not to be related (this way)
+  if(mFusion&& (mFusionSequenceCode<0) && mFusionActor->GetVisibility()) //ignore fusionSequence data: for these, the times are not to be related (this way)
     t = std::max(t, mCurrentFusionTSlice);
   return t;
 }