From: Leonardo Flórez-Valencia <florez-l@javeriana.edu.co>
Date: Fri, 10 Nov 2017 19:49:54 +0000 (-0500)
Subject: ...
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=ed058f340046aaf017fb4274cd392f385c20e040;p=FrontAlgorithms.git

...
---

diff --git a/appli/CTBronchi/CMakeLists.txt b/appli/CTBronchi/CMakeLists.txt
index 79a58ad..d2ffd71 100644
--- a/appli/CTBronchi/CMakeLists.txt
+++ b/appli/CTBronchi/CMakeLists.txt
@@ -22,6 +22,13 @@ if(fpa_BUILD_CTBronchi)
       LINKS fpa cpPlugins::tclap
       )
   endforeach(_e)
+
+  configure_file(
+    Process.sh
+    ${PROJECT_BINARY_DIR}/${_pfx}Process.sh
+    COPYONLY
+    )
+
 endif(fpa_BUILD_CTBronchi)
 
 ## eof - $RCSfile$
diff --git a/appli/CTBronchi/MoriLabelling.h b/appli/CTBronchi/MoriLabelling.h
index fc5edc4..d6f1790 100644
--- a/appli/CTBronchi/MoriLabelling.h
+++ b/appli/CTBronchi/MoriLabelling.h
@@ -94,7 +94,22 @@ namespace CTBronchi
         double vStd = double( stats->GetSigma( ) );
         double vMin = double( stats->GetMinimum( ) );
         double vMax = double( stats->GetMaximum( ) );
-        std::exit( 1 );
+
+        this->m_MinVesselness = vAvg + ( vStd * double( 5 ) );
+        /* TODO
+           std::cout
+           << vAvg << std::endl
+           << vStd << std::endl
+           << vMin << std::endl
+           << vMax << std::endl;
+
+           std::cout
+           << ( this->m_VesselnessThreshold / double( 100 ) ) * double( vMax )
+           << std::endl
+           << vAvg + ( vStd * double( 3 ) ) << std::endl;
+
+           std::exit( 1 );
+        */
         /* TODO
            this->m_MinVesselness =
            ( this->m_VesselnessThreshold / double( 100 ) ) *
diff --git a/appli/CTBronchi/Process.sh b/appli/CTBronchi/Process.sh
index bebf539..009829f 100755
--- a/appli/CTBronchi/Process.sh
+++ b/appli/CTBronchi/Process.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 ## -- Command line options
+curr_dir=`dirname $0`
 vesselness_sigma="0.5"
 vesselness_alpha1="0.5"
 vesselness_alpha2="2"
@@ -11,7 +12,8 @@ mori_signal_influence="0.5"
 mori_lower="-1024"
 mori_upper="0"
 mori_delta="1"
-labels_vesselness_thr="5"
+slice_by_slice_vesselness_thr="5"
+labels_vesselness_thr="65"
 labels_upper_thr="-400"
 beta="2.5"
 epsilon="1e-5"
@@ -69,6 +71,10 @@ while [[ "$#" -gt 0 ]]; do
         labels_vesselness_thr="$2"
         shift
         ;;
+        -slice_by_slice_vesselness_thr)
+        slice_by_slice_vesselness_thr="$2"
+        shift
+        ;;
         -labels_upper_thr)
         labels_upper_thr="$2"
         shift
@@ -114,13 +120,13 @@ echo "************************************************"
 (>&2 echo "Processing $input... ")
 echo "Processing $input..."
 if [ ! -f $vesselness ] || [ -n "$force" ] ; then
-    ./fpa_CTBronchi_Vesselness \
+    $curr_dir/fpa_CTBronchi_Vesselness \
         -i $input -o $vesselness \
         -s $vesselness_sigma -a $vesselness_alpha1 -b $vesselness_alpha2
 fi
 
 if [ ! -f $mori ] || [ -n "$force" ] ; then
-    ./fpa_CTBronchi_MoriSegmentation \
+    $curr_dir/fpa_CTBronchi_MoriSegmentation \
         -i $input \
         -o $mori \
         -s $mori_signal \
@@ -135,7 +141,7 @@ if [ ! -f $mori ] || [ -n "$force" ] ; then
 fi
 
 if [ ! -f $labels ] || [ -n "$force" ] ; then
-    ./fpa_CTBronchi_MoriLabelling \
+    $curr_dir/fpa_CTBronchi_MoriLabelling \
         -i $input \
         -l $mori \
         -v $vesselness \
@@ -145,7 +151,7 @@ if [ ! -f $labels ] || [ -n "$force" ] ; then
 fi
 
 if [ ! -f $fastrw ] || [ -n "$force" ] ; then
-    ./fpa_CTBronchi_FastRandomWalker \
+    $curr_dir/fpa_CTBronchi_FastRandomWalker \
         -i $input \
         -l $labels \
         -o $fastrw \
@@ -154,12 +160,12 @@ if [ ! -f $fastrw ] || [ -n "$force" ] ; then
 fi
 
 if [ ! -f $slicerw ] || [ -n "$force" ] ; then
-    ./fpa_CTBronchi_SliceBySliceRandomWalker \
+    $curr_dir/fpa_CTBronchi_SliceBySliceRandomWalker \
         -i $input \
         -l $mori \
         -v $vesselness \
         -o $slicerw \
-        -t $labels_vesselness_thr \
+        -t $slice_by_slice_vesselness_thr \
         -b $beta \
         -e $epsilon
 fi