From: Vivien Delmon Date: Mon, 28 Oct 2013 12:24:45 +0000 (+0100) Subject: Remove itkSetMacro X-Git-Tag: v1.4.0~150^2~4^2 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=66b6af0f6a1b4abcf7fef86e3cde987e8385e5dd;p=clitk.git Remove itkSetMacro In debug this Macro need the operator << (std::cout) which is not defined for std::vector. Could be an idea to add a clitkSetMacroWithoutDebug. There is a discussion about this on the ITK developper ML : http://www.itk.org/pipermail/insight-developers/2011-April/018174.html But with no conclusion ... --- diff --git a/common/clitkImage2DicomRTStructFilter.h b/common/clitkImage2DicomRTStructFilter.h index b6a74b2..9455eab 100644 --- a/common/clitkImage2DicomRTStructFilter.h +++ b/common/clitkImage2DicomRTStructFilter.h @@ -2,7 +2,7 @@ Program: vv http://www.creatis.insa-lyon.fr/rio/vv Main authors : XX XX XX - Authors belongs to: + Authors belongs to: - University of LYON http://www.universite-lyon.fr/ - Léon Bérard cancer center http://www.centreleonberard.fr - CREATIS CNRS laboratory http://www.creatis.insa-lyon.fr @@ -31,7 +31,7 @@ namespace clitk { //-------------------------------------------------------------------- template class Image2DicomRTStructFilter: public clitk::FilterBase { - + public: Image2DicomRTStructFilter(); ~Image2DicomRTStructFilter(); @@ -41,17 +41,24 @@ namespace clitk { typedef typename clitk::DicomRT_StructureSet::Pointer DicomRTStructPointer; // Set inputs - itkSetMacro(InputFilenames, std::vector ); + virtual void SetInputFilenames (const std::vector _arg) + { + if ( this->m_InputFilenames != _arg ) + { + this->m_InputFilenames = _arg; + this->Modified(); + } + } itkSetMacro(StructureSetFilename, std::string); itkSetMacro(DicomFolder, std::string); itkSetMacro(OutputFilename, std::string); void SetROIType(std::string type); itkSetMacro(ThresholdValue, PixelType); itkSetMacro(SkipInitialStructuresFlag, bool); - + // Run filter - void Update(); - + void Update(); + protected: std::string m_StructureSetFilename; std::string m_DicomFolder;