From: Prueba Date: Fri, 1 Apr 2016 01:35:07 +0000 (-0500) Subject: ... X-Git-Tag: v0.1~214 X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=dbf6c650d8de949a5b20f146555e0d8646c6aaea;p=cpPlugins.git ... --- diff --git a/lib/cpExtensions/Algorithms/BezierCurveFunction.h b/lib/cpExtensions/Algorithms/BezierCurveFunction.h index 2deba45..6bc0582 100644 --- a/lib/cpExtensions/Algorithms/BezierCurveFunction.h +++ b/lib/cpExtensions/Algorithms/BezierCurveFunction.h @@ -42,7 +42,7 @@ namespace cpExtensions virtual void AddPoint( const TVector& v ); virtual unsigned int GetNumberOfPoints( ) const; - virtual TVector Evaluate( const TScalar& u ) const; + virtual TVector Evaluate( const TScalar& u ) const ITK_OVERRIDE; virtual TFrame EvaluateFrenetFrame( const TScalar& u ) const; virtual TScalar EvaluateLength( ) const; diff --git a/lib/cpExtensions/Algorithms/IsoImageSlicer.h b/lib/cpExtensions/Algorithms/IsoImageSlicer.h index 19410c3..d3dec08 100644 --- a/lib/cpExtensions/Algorithms/IsoImageSlicer.h +++ b/lib/cpExtensions/Algorithms/IsoImageSlicer.h @@ -86,7 +86,7 @@ namespace cpExtensions itkSetMacro( SpacingFromMinimum, bool ); public: - virtual unsigned long GetMTime( ) const; + virtual unsigned long GetMTime( ) const ITK_OVERRIDE; const TInterpolateFunction* GetInterpolator( ) const; const TMatrix& GetRotation( ) const; @@ -105,9 +105,9 @@ namespace cpExtensions BaseImageSlicer( ); virtual ~BaseImageSlicer( ); - virtual void GenerateOutputInformation( ); // TODO { } - virtual void GenerateInputRequestedRegion( ); - virtual void GenerateData( ); + virtual void GenerateOutputInformation( ) ITK_OVERRIDE; // TODO { } + virtual void GenerateInputRequestedRegion( ) ITK_OVERRIDE; + virtual void GenerateData( ) ITK_OVERRIDE; private: // Purposely not implemented diff --git a/lib/cpExtensions/Algorithms/MultiScaleGaussianImageFilter.h b/lib/cpExtensions/Algorithms/MultiScaleGaussianImageFilter.h index c0612a2..272e839 100644 --- a/lib/cpExtensions/Algorithms/MultiScaleGaussianImageFilter.h +++ b/lib/cpExtensions/Algorithms/MultiScaleGaussianImageFilter.h @@ -58,7 +58,7 @@ namespace cpExtensions MultiScaleGaussianImageFilter( ); virtual ~MultiScaleGaussianImageFilter( ); - virtual void GenerateData( ); + virtual void GenerateData( ) ITK_OVERRIDE; template< class F > void _GenerateData( ); diff --git a/lib/cpPlugins_ITKInstances/Base_explicit_description.txt b/lib/cpPlugins_ITKInstances/Base_explicit_description.txt index 38010d4..92aa6ab 100644 --- a/lib/cpPlugins_ITKInstances/Base_explicit_description.txt +++ b/lib/cpPlugins_ITKInstances/Base_explicit_description.txt @@ -23,6 +23,7 @@ i itkTransform.h c itk::Array< #1 > c itk::FixedArray< #1 , #2 > c itk::FixedArray< float , 6 > +c itk::FixedArray< double , 6 > c itk::Point< #5 , #2 > c itk::Vector< #5 , #2 > c itk::CovariantVector< #5 , #2 > diff --git a/plugins/cpPluginsImageFilters/HistogramThresholdImageFilter.cxx b/plugins/cpPluginsImageFilters/HistogramThresholdImageFilter.cxx index 1c9a673..c890d83 100644 --- a/plugins/cpPluginsImageFilters/HistogramThresholdImageFilter.cxx +++ b/plugins/cpPluginsImageFilters/HistogramThresholdImageFilter.cxx @@ -5,6 +5,9 @@ #include #include #include +#include +#include +#include // ------------------------------------------------------------------------- cpPluginsImageFilters::HistogramThresholdImageFilter:: diff --git a/plugins/cpPluginsImageFilters/ImageToHistogramFilter.cxx b/plugins/cpPluginsImageFilters/ImageToHistogramFilter.cxx index 4b1d62c..968e5a5 100644 --- a/plugins/cpPluginsImageFilters/ImageToHistogramFilter.cxx +++ b/plugins/cpPluginsImageFilters/ImageToHistogramFilter.cxx @@ -57,8 +57,8 @@ _GD0( _TImage* image ) filter->SetUpperThreshold( upper_val ); filter->SetInsideValue( in_val ); filter->SetOutsideValue( out_val ); - filter->Update( ); */ + filter->Update( ); // Connect output this->GetOutputData( "Output" )->SetITK( filter->GetOutput( ) ); diff --git a/plugins/cpPluginsImageFilters/IsoImageSlicer.cxx b/plugins/cpPluginsImageFilters/IsoImageSlicer.cxx index 942a6e4..5869746 100644 --- a/plugins/cpPluginsImageFilters/IsoImageSlicer.cxx +++ b/plugins/cpPluginsImageFilters/IsoImageSlicer.cxx @@ -9,6 +9,11 @@ #include #include #include +#include +#include +#include +#include + /* #include #include diff --git a/plugins/cpPluginsImageFilters/MaskedImageToHistogramFilter.cxx b/plugins/cpPluginsImageFilters/MaskedImageToHistogramFilter.cxx index 61b2bbe..b2dd577 100644 --- a/plugins/cpPluginsImageFilters/MaskedImageToHistogramFilter.cxx +++ b/plugins/cpPluginsImageFilters/MaskedImageToHistogramFilter.cxx @@ -4,6 +4,7 @@ #include #include +#include // ------------------------------------------------------------------------- cpPluginsImageFilters::MaskedImageToHistogramFilter:: diff --git a/plugins/cpPluginsImageFilters/MultiScaleGaussianImageFilter.cxx b/plugins/cpPluginsImageFilters/MultiScaleGaussianImageFilter.cxx index 07e5956..b3f2210 100644 --- a/plugins/cpPluginsImageFilters/MultiScaleGaussianImageFilter.cxx +++ b/plugins/cpPluginsImageFilters/MultiScaleGaussianImageFilter.cxx @@ -21,6 +21,8 @@ #include #include #include +#include +#include // ------------------------------------------------------------------------- cpPluginsImageFilters::MultiScaleGaussianImageFilter:: diff --git a/plugins/cpPluginsImageFilters/OtsuThresholdImageFilter.cxx b/plugins/cpPluginsImageFilters/OtsuThresholdImageFilter.cxx index e836d59..b765f44 100644 --- a/plugins/cpPluginsImageFilters/OtsuThresholdImageFilter.cxx +++ b/plugins/cpPluginsImageFilters/OtsuThresholdImageFilter.cxx @@ -5,6 +5,10 @@ #include #include #include +#include +#include +#include +#include // ------------------------------------------------------------------------- cpPluginsImageFilters::OtsuThresholdImageFilter:: diff --git a/plugins/cpPluginsImageFilters/SignedMaurerDistanceMapImageFilter.cxx b/plugins/cpPluginsImageFilters/SignedMaurerDistanceMapImageFilter.cxx index fcdb255..6e3ca34 100644 --- a/plugins/cpPluginsImageFilters/SignedMaurerDistanceMapImageFilter.cxx +++ b/plugins/cpPluginsImageFilters/SignedMaurerDistanceMapImageFilter.cxx @@ -4,13 +4,13 @@ #include #include -/* - #include - #include - #include - #include - #include -*/ + +#include +#include +#include +#include +#include + // ------------------------------------------------------------------------- cpPluginsImageFilters::SignedMaurerDistanceMapImageFilter:: diff --git a/plugins/cpPluginsWidgets/SeedWidget.h b/plugins/cpPluginsWidgets/SeedWidget.h index 1417f1c..2ae4976 100644 --- a/plugins/cpPluginsWidgets/SeedWidget.h +++ b/plugins/cpPluginsWidgets/SeedWidget.h @@ -23,7 +23,7 @@ namespace cpPluginsWidgets cpPlugins_Id_Macro( SeedWidget, Widgets ); public: - virtual itk::ModifiedTimeType GetMTime( ) const; + virtual itk::ModifiedTimeType GetMTime( ) const ITK_OVERRIDE; protected: SeedWidget( );