...

diff --git a/dependencies/cpPlugins_ThirdParty_Install_linux.sh b/dependencies/cpPlugins_ThirdParty_Install_linux.sh
index 0077ac7119d74371e8b5cf8c5b79661f4a28aaa4..a2c92dc06a461874c0346766e61cef940567b3b4 100755 (executable)
--- a/dependencies/cpPlugins_ThirdParty_Install_linux.sh
+++ b/dependencies/cpPlugins_ThirdParty_Install_linux.sh
@@ -145,7 +145,7 @@ fi
 ## ===============
 
 cont=true
-vtk_sources=`which cmake`
+vtk_sources=""
 while [ $cont == true ]; do
     if [ -z "$vtk_sources" ]; then
         read -e -p "Please provide a valid location for VTK: " tmp
@@ -239,7 +239,7 @@ echo "==> Installing package... done."
 ## ===============
 
 cont=true
-itk_sources=`which cmake`
+itk_sources=""
 while [ $cont == true ]; do
     if [ -z "$itk_sources" ]; then
         read -e -p "Please provide a valid location for ITK: " tmp
@@ -290,32 +290,18 @@ itk_build_type=MinSizeRel
 
 echo "==> Configuring sources... "
 cd $itk_binary_dir
-if [ -x "$qmake_exe" ]; then
-    $cmake_exe \
-        -DCMAKE_CXX_FLAGS:STRING=-std=c++11 \
-        -DBUILD_DOCUMENTATION:BOOL=OFF \
-        -DBUILD_EXAMPLES:BOOL=OFF \
-        -DBUILD_SHARED_LIBS:BOOL=ON \
-        -DBUILD_TESTING:BOOL=OFF \
-        -DQT_QMAKE_EXECUTABLE:PATH=$qmake_exe \
-        -DCMAKE_BUILD_TYPE:STRING=$itk_build_type \
-        -DModule_itkGUISupportQt:BOOL=ON \
-        -DModule_itkGUISupportQtOpenGL:BOOL=ON \
-        -DModule_itkGUISupportQtSQL:BOOL=OFF \
-        -DModule_itkGUISupportQtWebkit:BOOL=OFF \
-        -DCMAKE_INSTALL_PREFIX:PATH=$itk_prefix \
-        $itk_source_dir
-else
-    $cmake_exe \
-        -DCMAKE_CXX_FLAGS:STRING=-std=c++11 \
-        -DBUILD_DOCUMENTATION:BOOL=OFF \
-        -DBUILD_EXAMPLES:BOOL=OFF \
-        -DBUILD_SHARED_LIBS:BOOL=ON \
-        -DBUILD_TESTING:BOOL=OFF \
-        -DCMAKE_BUILD_TYPE:STRING=$build_type \
-        -DCMAKE_INSTALL_PREFIX:PATH=$itk_prefix \
-        $itk_source_dir
-fi
+$cmake_exe \
+    -DCMAKE_CXX_FLAGS:STRING=-std=c++11 \
+    -DBUILD_DOCUMENTATION:BOOL=OFF \
+    -DBUILD_EXAMPLES:BOOL=OFF \
+    -DBUILD_SHARED_LIBS:BOOL=ON \
+    -DBUILD_TESTING:BOOL=OFF \
+    -DCMAKE_BUILD_TYPE:STRING=$itk_build_type \
+    -DModule_ITKReview:BOOL=ON \
+    -DModule_ITKVtkGlue:BOOL=OFF \
+    -DModule_ParabolicMorphology:BOOL=ON \
+    -DCMAKE_INSTALL_PREFIX:PATH=$itk_prefix \
+    $itk_source_dir
 echo "==> Configuring sources... done."
 
 echo "==> Compiling sources..."
@@ -328,6 +314,4 @@ cd $itk_binary_dir
 make -j install
 echo "==> Installing package... done."
 
-
-
 ## eof - $RCSfile$

diff --git a/lib/cpExtensions/DataStructures/Skeleton.h b/lib/cpExtensions/DataStructures/Skeleton.h
index 9d0bd9b6296fabe2ab70993346984bda11054aa3..671b8acc529f282c7fd1427dddb5d497ec1d1a25 100644 (file)
--- a/lib/cpExtensions/DataStructures/Skeleton.h
+++ b/lib/cpExtensions/DataStructures/Skeleton.h
@@ -3,6 +3,7 @@
 
 #include <cpExtensions/DataStructures/Graph.h>
 #include <cpExtensions/DataStructures/PolyLineParametricPath.h>
+#include <vector>
 
 namespace cpExtensions
 {
@@ -35,6 +36,9 @@ namespace cpExtensions
       void AddBranch( TPath* path );
       const TPath* GetBranch( const TIndex& a, const TIndex& b ) const;
 
+      std::vector< TIndex > GetEndPoints( ) const;
+      std::vector< TIndex > GetBifurcations( ) const;
+
     protected:
       Skeleton( );
       virtual ~Skeleton( );

diff --git a/lib/cpExtensions/DataStructures/Skeleton.hxx b/lib/cpExtensions/DataStructures/Skeleton.hxx
index e6635ae25c38c169e980bf854d22489757ce6600..579f425d7ff6a394fe94e2d6a97ce6fef7a6100a 100644 (file)
--- a/lib/cpExtensions/DataStructures/Skeleton.hxx
+++ b/lib/cpExtensions/DataStructures/Skeleton.hxx
@@ -38,6 +38,26 @@ GetBranch( const TIndex& a, const TIndex& b ) const
     return( null_path );
 }
 
+// -------------------------------------------------------------------------
+template< unsigned int _VDim >
+std::vector< typename cpExtensions::DataStructures::Skeleton< _VDim >::TIndex >
+cpExtensions::DataStructures::Skeleton< _VDim >::
+GetEndPoints( ) const
+{
+  std::vector< TIndex > res;
+  return( res );
+}
+
+// -------------------------------------------------------------------------
+template< unsigned int _VDim >
+std::vector< typename cpExtensions::DataStructures::Skeleton< _VDim >::TIndex >
+cpExtensions::DataStructures::Skeleton< _VDim >::
+GetBifurcations( ) const
+{
+  std::vector< TIndex > res;
+  return( res );
+}
+
 // -------------------------------------------------------------------------
 template< unsigned int _VDim >
 cpExtensions::DataStructures::Skeleton< _VDim >::