X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=segmentation%2FclitkRelativePositionList.txx;h=4f4702b981c809b6705f1102bd1b4cebc32ac95d;hb=ee568ccc2ae2be4d9d60967e522e2d81cb148d95;hp=3ce555993b3d8d9131982517f68f87c01b478d8e;hpb=4824cfde923f5f1d70fbb0e63aaf08886a8fb28d;p=clitk.git

diff --git a/segmentation/clitkRelativePositionList.txx b/segmentation/clitkRelativePositionList.txx
index 3ce5559..4f4702b 100644
--- a/segmentation/clitkRelativePositionList.txx
+++ b/segmentation/clitkRelativePositionList.txx
@@ -16,11 +16,28 @@
   - CeCILL-B   http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
   ======================================================================-====*/
 
+#include "clitkLabelImageOverlapMeasureFilter.h"
 
 //--------------------------------------------------------------------
 template <class TImageType>
 clitk::RelativePositionList<TImageType>::
-RelativePositionList() {
+RelativePositionList():  
+  clitk::FilterBase(),
+  clitk::FilterWithAnatomicalFeatureDatabaseManagement(),
+  itk::ImageToImageFilter<TImageType, TImageType>()
+{
+  ComputeOverlapFlagOff();
+}
+//--------------------------------------------------------------------
+
+
+//--------------------------------------------------------------------
+template <class TImageType>
+void
+clitk::RelativePositionList<TImageType>::
+SetReferenceImageForOverlapMeasure(ImagePointer ref) {
+  m_reference = ref;
+  ComputeOverlapFlagOn();
 }
 //--------------------------------------------------------------------
 
@@ -77,7 +94,6 @@ Read(std::string filename) {
       if (!is) stop = true;
       else {
         std::getline(is, s);
-        // DD(s);
         if (s.find("object") != std::string::npos) stop=true;
         else ss << s << std::endl;
         if (!is) stop = true;
@@ -88,6 +104,8 @@ Read(std::string filename) {
       std::ofstream os;
       openFileForWriting(os, tmpfilename);
       os << text;
+      os << "input = nothing" << std::endl;
+      os << "output = nothing" << std::endl;
       os.close();
 
       // Create a struct to store options. I use two step to allow to
@@ -96,15 +114,13 @@ Read(std::string filename) {
       ArgsInfoType args_info;
       std::vector<char> writable(tmpfilename.size() + 1);
       std::copy(tmpfilename.begin(), tmpfilename.end(), writable.begin());
-      char ** argv;
-      cmdline_parser_clitkRelativePosition2(0, argv, &args_info, 1, 1, 0);
-      args_info.input_given = 1;
-      args_info.input_arg = new char[1];
-      args_info.output_given = 1;
-      args_info.output_arg = new char[1];
-      cmdline_parser_clitkRelativePosition_configfile(&writable[0], &args_info, 0, 0, 1);
-      
-      // Store the args
+      char ** argv = new char*[1];
+      argv[0] = new char[1];
+      struct cmdline_parser_clitkRelativePosition_params params;
+      params.override = 0;
+      params.initialize = 1;
+      params.check_required = 0;
+      cmdline_parser_clitkRelativePosition_configfile(&writable[0], &args_info, 1, 1, 1);
       mArgsInfoList.push_back(args_info);
       
       // Delete the temporary file
@@ -142,18 +158,32 @@ GenerateOutputInformation() {
 
   // Get input
   m_working_input = dynamic_cast<ImageType*>(itk::ProcessObject::GetInput(0));
+  std::string s = GetInputName();
+
+  // Debug
+  if (GetDisplayUsedStructuresOnlyFlag()) {
+    for(uint i=0; i<mArgsInfoList.size(); i++) {
+      // Check if we only want to display structure name
+      AddUsedStructures(s, mArgsInfoList[i].object_arg);
+    }
+    return;
+  }
 
   // Loop on RelativePositionList of operations
-  std::string s = GetInputName();
   for(uint i=0; i<mArgsInfoList.size(); i++) {
-    std::string text = "["+s+"] limits "+
-      mArgsInfoList[i].orientation_arg[0]+" "+
-      mArgsInfoList[i].object_arg+" "+
-      toString(mArgsInfoList[i].threshold_arg);
+
+    // clitk::PrintMemory(true, "Start"); 
+    std::string text = "["+s+"] limits ";
+    if (mArgsInfoList[i].orientation_given) text += std::string(mArgsInfoList[i].orientation_arg[0])+" ";
+    else text = text+"("+toString(mArgsInfoList[i].angle1_arg)+" "+
+           toString(mArgsInfoList[i].angle2_arg)+" "+
+           (mArgsInfoList[i].inverse_flag?"true":"false")+") ";
+    text = text+mArgsInfoList[i].object_arg+" "+toString(mArgsInfoList[i].threshold_arg);
     if (mArgsInfoList[i].sliceBySlice_flag) {
       text += " slice by slice";
     }
     else text += " 3D";
+    text += " spacing=" + toString(mArgsInfoList[i].spacing_arg);
 
     StartNewStep(text);  
     typename RelPosFilterType::Pointer relPosFilter;
@@ -188,6 +218,16 @@ GenerateOutputInformation() {
     relPosFilter->Update();
     m_working_input = relPosFilter->GetOutput();  
     StopCurrentStep<ImageType>(m_working_input);
+
+    // Compute overlap with reference if needed
+    if (GetComputeOverlapFlag()) {
+      typedef clitk::LabelImageOverlapMeasureFilter<ImageType> FilterType;
+      typename FilterType::Pointer filter = FilterType::New();
+      filter->SetInput(0, m_working_input);
+      filter->SetInput(1, m_reference);
+      filter->Update();
+    }
+    
   }
 }
 //--------------------------------------------------------------------
@@ -211,9 +251,10 @@ void
 clitk::RelativePositionList<TImageType>::
 SetFilterOptions(typename RelPosFilterType::Pointer filter, ArgsInfoType & options) {
 
-  if (options.orientation_given != 1) {
-    DD("ERRROR DEBUG TODO no more than 1 orientation yet");
-    exit(0);
+  if (options.orientation_given > 1) {
+    clitkExceptionMacro("Error in the RelPos options. I need a single --orientation (for the moment)."
+                        << " Current options are for obj = '" << options.object_arg
+                        << "', threshold = " << options.threshold_arg << std::endl);
   }
 
   ImagePointer object = GetAFDB()->template GetImage<ImageType>(options.object_arg);
@@ -222,8 +263,21 @@ SetFilterOptions(typename RelPosFilterType::Pointer filter, ArgsInfoType & optio
   filter->SetVerboseImageSizeFlag(GetVerboseImageSizeFlag());
   filter->SetFuzzyThreshold(options.threshold_arg);
   filter->SetInverseOrientationFlag(options.inverse_flag); // MUST BE BEFORE AddOrientationTypeString
-  for(uint i=0; i<options.orientation_given; i++) 
-    filter->AddOrientationTypeString(options.orientation_arg[i]);
+
+  if (options.orientation_given == 1)  {
+    for(uint i=0; i<options.orientation_given; i++) 
+      filter->AddOrientationTypeString(options.orientation_arg[i]);
+  }
+  else {
+    if (options.angle1_given && options.angle2_given) {
+      filter->AddAnglesInDeg(options.angle1_arg, options.angle2_arg);
+    }
+    else {
+      clitkExceptionMacro("Error in the RelPos options. I need --orientation or (--angle1 and --angle2)."
+                          << " Current options are for obj = '" << options.object_arg
+                          << "', threshold = " << options.threshold_arg << std::endl);
+    }
+  }
   filter->SetIntermediateSpacing(options.spacing_arg);
   if (options.spacing_arg == -1) filter->IntermediateSpacingFlagOff();
   else filter->IntermediateSpacingFlagOn();
@@ -231,3 +285,5 @@ SetFilterOptions(typename RelPosFilterType::Pointer filter, ArgsInfoType & optio
   filter->SetAutoCropFlag(!options.noAutoCrop_flag); 
 }
 //--------------------------------------------------------------------
+
+