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

diff --git a/segmentation/clitkExtractLung.ggo b/segmentation/clitkExtractLung.ggo
index 0cae0f89ad0a926ba70e365d0e0e779e56b06435..44b99a201f468840b8a1e9c12c5154562f098699 100644 (file)
--- a/segmentation/clitkExtractLung.ggo
+++ b/segmentation/clitkExtractLung.ggo
@@ -67,5 +67,5 @@ option "dir"                  d  "Directions (axes) to perform filling (defaults to 2
 
 section "Step 7 : lung separation (labelling)"
 option "doNotSeparateLungs"   -  "Do not separate lungs if set"                 flag off
-
+option "removeSmallLabel"     -  "Remove small label (stomach?) before separation"  flag on
 option "noAutoCrop"    -       "If set : do no crop final mask to BoundingBox"                         flag    off

diff --git a/segmentation/clitkExtractLungFilter.h b/segmentation/clitkExtractLungFilter.h
index ead4d988f36597401d3684ada7e69da62ee68851..6f31cee1626a334d53f8042684bf8bbdb62a96d6 100644 (file)
--- a/segmentation/clitkExtractLungFilter.h
+++ b/segmentation/clitkExtractLungFilter.h
@@ -175,6 +175,10 @@ namespace clitk {
     itkGetConstMacro(VerboseRegionGrowingFlag, bool);
     itkBooleanMacro(VerboseRegionGrowingFlag);    
 
+    itkSetMacro(RemoveSmallLabelBeforeSeparationFlag, bool);
+    itkGetConstMacro(RemoveSmallLabelBeforeSeparationFlag, bool);
+    itkBooleanMacro(RemoveSmallLabelBeforeSeparationFlag);    
+
     // Step 3 options ExtractLung
     itkSetMacro(NumberOfHistogramBins, int);
     itkGetConstMacro(NumberOfHistogramBins, int);
@@ -234,6 +238,7 @@ namespace clitk {
     MaskImagePixelType m_ForegroundValue;
     int m_MinimalComponentSize;
     bool m_AutoCrop;
+    bool m_RemoveSmallLabelBeforeSeparationFlag;
 
     // Step 1
     InputImagePixelType m_UpperThreshold;

diff --git a/segmentation/clitkExtractLungGenericFilter.txx b/segmentation/clitkExtractLungGenericFilter.txx
index 1fbb5c04ba41c611bbb9a3de8f138597fb2c4520..b9a94d86aeef3b3b273ff9176786eb5ba214bc50 100644 (file)
--- a/segmentation/clitkExtractLungGenericFilter.txx
+++ b/segmentation/clitkExtractLungGenericFilter.txx
@@ -113,6 +113,8 @@ SetOptionsFromArgsInfoToFilter(FilterType * f)
   else
     f->SetFillHolesFlag(true);
 
+  f->SetRemoveSmallLabelBeforeSeparationFlag(mArgsInfo.removeSmallLabel_flag);
+
   if (mArgsInfo.doNotSeparateLungs_given)
     f->SetSeparateLungsFlag(false);
   else

diff --git a/vv/vvMainWindow.cxx b/vv/vvMainWindow.cxx
index 2eea26d866b81d6c89793d62b8afe91a1cabca7a..b8d4b3cabbb3a26ff3a36aa9deb9397df9fd3645 100644 (file)
--- a/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@ -100,9 +100,11 @@
 #define COLUMN_RELOAD_IMAGE 6
 #define COLUMN_IMAGE_NAME 7
 
+#ifdef CLITK_PRIVATE_FEATURES
 #define EXTENSIONS "Images ( *.bmp *.png *.jpeg *.jpg *.tif *.mhd *.mha *.hdr *.vox *.his *.xdr *.SCAN *.nii *.nrrd *.nhdr *.refscan *.nii.gz *.usf)"
 #else
 #define EXTENSIONS "Images ( *.bmp *.png *.jpeg *.jpg *.tif *.mhd *.mha *.hdr *.vox *.his *.xdr *.SCAN *.nii *.nrrd *.nhdr *.refscan *.nii.gz)"
+#endif
 
 
 /*Data Tree values