Skip to content

Commit c9667fd

Browse files
thewtexthewtex
committed
Merge pull request #8 from LucasGandel/master
BUG: Fixing Dashboard errors
2 parents 03b98ff + e990b66 commit c9667fd

18 files changed

+198
-88
lines changed

‎include/itkArrivalFunctionToPathFilter.h‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
PURPOSE. See the above copyright notices for more information.
1515
1616
=========================================================================*/
17-
#ifndef __itkArrivalFunctionToPathFilter_h
18-
#define __itkArrivalFunctionToPathFilter_h
17+
#ifndef itkArrivalFunctionToPathFilter_h
18+
#define itkArrivalFunctionToPathFilter_h
1919

2020
#include "itkImage.h"
2121
#include "itkCommand.h"
@@ -27,16 +27,25 @@
2727

2828
namespace itk
2929
{
30+
/**
31+
* \class ArrivalFunctionToPathCommand
32+
* \brief A command to listen for Optimizer Iteration events.
33+
* \author Dan Mueller, Queensland University of Technology,
34+
* dan.muel[at]gmail.com
35+
*
36+
*
37+
* \ingroup MinimalPathExtraction
38+
*
39+
*/
3040

31-
/** A command to listen for Optimizer Iteration events. */
3241
template <class TFilter>
3342
class ArrivalFunctionToPathCommand : public itk::Command
3443
{
3544
public:
3645
/** Standard class typedefs. */
37-
typedef ArrivalFunctionToPathCommand Self;
38-
typedef itk::Command Superclass;
39-
typedef itk::SmartPointer<Self> Pointer;
46+
typedef ArrivalFunctionToPathCommand Self;
47+
typedef itk::Command Superclass;
48+
typedef itk::SmartPointer<Self> Pointer;
4049

4150
/** Method for creation through the object factory. */
4251
itkNewMacro( Self );
@@ -188,7 +197,7 @@ class ITK_EXPORT ArrivalFunctionToPathFilter :
188197
virtual void AddPathEndPoint( const PointType & point );
189198

190199
/** Clear the list of end points. */
191-
virtual void ClearPathEndPoints();;
200+
virtual void ClearPathEndPoints();
192201

193202
/** Get/set the termination. Once the current optimizer value falls below
194203
* TerminationValue, no further points will be appended to the path.

‎include/itkArrivalFunctionToPathFilter.hxx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
1616
=========================================================================*/
1717

18-
#ifndef __itkArrivalFunctionToPathFilter_hxx
19-
#define __itkArrivalFunctionToPathFilter_hxx
18+
#ifndef itkArrivalFunctionToPathFilter_hxx
19+
#define itkArrivalFunctionToPathFilter_hxx
2020

2121
#include "vnl/vnl_math.h"
2222
#include "itkArrivalFunctionToPathFilter.h"
@@ -42,7 +42,7 @@ ArrivalFunctionToPathFilter<TInputImage,TOutputPath>
4242
template <class TInputImage, class TOutputPath>
4343
void
4444
ArrivalFunctionToPathFilter<TInputImage,TOutputPath>
45-
::SetPathEndPoint(const ArrivalFunctionToPathFilter::PointType &point)
45+
::SetPathEndPoint(const PointType &point)
4646
{
4747
this->ClearPathEndPoints();
4848
this->AddPathEndPoint( point );
@@ -51,7 +51,7 @@ ArrivalFunctionToPathFilter<TInputImage,TOutputPath>
5151
template <class TInputImage, class TOutputPath>
5252
void
5353
ArrivalFunctionToPathFilter<TInputImage,TOutputPath>
54-
::AddPathEndPoint(const ArrivalFunctionToPathFilter::PointType &point)
54+
::AddPathEndPoint(const PointType &point)
5555
{
5656
m_PointList.push_back( point );
5757
this->Modified();

‎include/itkIterateNeighborhoodOptimizer.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
PURPOSE. See the above copyright notices for more information.
1515
1616
=========================================================================*/
17-
#ifndef __itkIterateNeighborhoodOptimizer_h
18-
#define __itkIterateNeighborhoodOptimizer_h
17+
#ifndef itkIterateNeighborhoodOptimizer_h
18+
#define itkIterateNeighborhoodOptimizer_h
1919

2020
#include "itkArray.h"
2121
#include "itkSingleValuedNonLinearOptimizer.h"

‎include/itkPhysicalCentralDifferenceImageFunction.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
PURPOSE. See the above copyright notices for more information.
1515
1616
=========================================================================*/
17-
#ifndef __itkPhysicalCentralDifferenceImageFunction_h
18-
#define __itkPhysicalCentralDifferenceImageFunction_h
17+
#ifndef itkPhysicalCentralDifferenceImageFunction_h
18+
#define itkPhysicalCentralDifferenceImageFunction_h
1919

2020
#include "itkImageFunction.h"
2121
#include "itkCovariantVector.h"

‎include/itkPhysicalCentralDifferenceImageFunction.hxx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*=========================================================================
22
33
Program: Insight Segmentation & Registration Toolkit
4-
Module: $RCSfile: itkPhysicalCentralDifferenceImageFunction.txx,v $
4+
Module: $RCSfile: itkPhysicalCentralDifferenceImageFunction.hxx,v $
55
Language: C++
66
Date: $Date$
77
Version: $Revision$
@@ -14,8 +14,8 @@
1414
PURPOSE. See the above copyright notices for more information.
1515
1616
=========================================================================*/
17-
#ifndef __itkPhysicalCentralDifferenceImageFunction_txx
18-
#define __itkPhysicalCentralDifferenceImageFunction_txx
17+
#ifndef itkPhysicalCentralDifferenceImageFunction_hxx
18+
#define itkPhysicalCentralDifferenceImageFunction_hxx
1919

2020
#include "itkPhysicalCentralDifferenceImageFunction.h"
2121

‎include/itkSingleImageCostFunction.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
PURPOSE. See the above copyright notices for more information.
1515
1616
=========================================================================*/
17-
#ifndef __itkSingleImageCostFunction_h
18-
#define __itkSingleImageCostFunction_h
17+
#ifndef itkSingleImageCostFunction_h
18+
#define itkSingleImageCostFunction_h
1919

2020
#include "itkNumericTraits.h"
2121
#include "itkExceptionObject.h"
@@ -89,7 +89,7 @@ class ITK_EXPORT SingleImageCostFunction :
8989
typedef Superclass::ParametersValueType CoordRepType;
9090

9191
/** Type for locations */
92-
typedef Index< ImageDimension > IndexType;
92+
typedef Index< ImageDimension > IndexType;
9393
typedef Point< CoordRepType, ImageDimension > PointType;
9494
typedef ContinuousIndex< CoordRepType, ImageDimension >
9595
ContinuousIndexType;

‎include/itkSingleImageCostFunction.hxx‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
PURPOSE. See the above copyright notices for more information.
1515
1616
=========================================================================*/
17-
#ifndef __itkSingleImageCostFunction_hxx
18-
#define __itkSingleImageCostFunction_hxx
17+
#ifndef itkSingleImageCostFunction_hxx
18+
#define itkSingleImageCostFunction_hxx
1919

2020
#include "vnl/vnl_math.h"
2121
#include "itkSingleImageCostFunction.h"
@@ -142,9 +142,9 @@ SingleImageCostFunction<TImage>
142142
derivative[i] = static_cast<typename DerivativeType::ValueType>( output[i] );
143143

144144
// NOTE: The cost function may undefined / unreachable areas
145-
// (indicated by very large values) which may skew the gradient.
146-
// To avoid this skewing effect, we reset gradient values larger
147-
// than a given threshold.
145+
// (indicated by very large values) which may skew the gradient.
146+
// To avoid this skewing effect, we reset gradient values larger
147+
// than a given threshold.
148148
if ( vnl_math_abs(derivative[i]) > DerivativeThreshold )
149149
{
150150
derivative[i] = 0.0;

‎include/itkSpeedFunctionPathInformation.h‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
11
/*=========================================================================
22
3-
* Copyright Insight Software Consortium
4-
*
5-
* Licensed under the Apache License, Version 2.0 (the "License");
6-
* you may not use this file except in compliance with the License.
7-
* You may obtain a copy of the License at
8-
*
9-
* http://www.apache.org/licenses/LICENSE-2.0.txt
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
16-
3+
Program: Insight Segmentation & Registration Toolkit
4+
Module: $RCSfile: itkSpeedFunctionPathInformation.h,v $
5+
Language: C++
6+
Date: $Date$
7+
Version: $Revision$
178
18-
* Program: Insight Segmentation & Registration Toolkit
19-
* Module: $RCSfile: itkSpeedFunctionPathInformation.h,v $
20-
* Language: C++
21-
* Date: $Date$
22-
* Version: $Revision$
9+
Copyright (c) Insight Software Consortium. All rights reserved.
10+
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
2311
24-
* Copyright (c) Insight Software Consortium. All rights reserved.
25-
* See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
12+
This software is distributed WITHOUT ANY WARRANTY; without even
13+
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
14+
PURPOSE. See the above copyright notices for more information.
2615
27-
* This software is distributed WITHOUT ANY WARRANTY; without even
28-
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
29-
* PURPOSE. See the above copyright notices for more information.
16+
Copyright Insight Software Consortium
3017
18+
Licensed under the Apache License, Version 2.0 (the "License");
19+
you may not use this file except in compliance with the License.
20+
You may obtain a copy of the License at
21+
22+
http://www.apache.org/licenses/LICENSE-2.0.txt
23+
24+
Unless required by applicable law or agreed to in writing, software
25+
distributed under the License is distributed on an "AS IS" BASIS,
26+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
27+
See the License for the specific language governing permissions and
28+
limitations under the License.
29+
3130
=========================================================================*/
3231
#ifndef itkSpeedFunctionPathInformation_h
3332
#define itkSpeedFunctionPathInformation_h
@@ -110,7 +109,7 @@ class SpeedFunctionPathInformation :
110109
virtual void PrintSelf( std::ostream& os, Indent indent ) const;
111110

112111
std::vector< PointType > m_Info;
113-
SizeValueType m_Front;
112+
SizeValueType m_Front;
114113

115114

116115
private:

‎include/itkSpeedFunctionPathInformation.hxx‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,32 @@
11
/*=========================================================================
22
3-
* Copyright Insight Software Consortium
4-
*
5-
* Licensed under the Apache License, Version 2.0 (the "License");
6-
* you may not use this file except in compliance with the License.
7-
* You may obtain a copy of the License at
8-
*
9-
* http://www.apache.org/licenses/LICENSE-2.0.txt
10-
*
11-
* Unless required by applicable law or agreed to in writing, software
12-
* distributed under the License is distributed on an "AS IS" BASIS,
13-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14-
* See the License for the specific language governing permissions and
15-
* limitations under the License.
16-
3+
Program: Insight Segmentation & Registration Toolkit
4+
Module: $RCSfile: itkSpeedFunctionPathInformation.hxx,v $
5+
Language: C++
6+
Date: $Date$
7+
Version: $Revision$
8+
9+
Copyright (c) Insight Software Consortium. All rights reserved.
10+
See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
1711
18-
* Program: Insight Segmentation & Registration Toolkit
19-
* Module: $RCSfile: itkSpeedFunctionPathInformation.hxx,v $
20-
* Language: C++
21-
* Date: $Date$
22-
* Version: $Revision$
12+
This software is distributed WITHOUT ANY WARRANTY; without even
13+
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
14+
PURPOSE. See the above copyright notices for more information.
2315
24-
* Copyright (c) Insight Software Consortium. All rights reserved.
25-
* See ITKCopyright.txt or http://www.itk.org/HTML/Copyright.htm for details.
16+
Copyright Insight Software Consortium
2617
27-
* This software is distributed WITHOUT ANY WARRANTY; without even
28-
* the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
29-
* PURPOSE. See the above copyright notices for more information.
18+
Licensed under the Apache License, Version 2.0 (the "License");
19+
you may not use this file except in compliance with the License.
20+
You may obtain a copy of the License at
21+
22+
http://www.apache.org/licenses/LICENSE-2.0.txt
3023
24+
Unless required by applicable law or agreed to in writing, software
25+
distributed under the License is distributed on an "AS IS" BASIS,
26+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
27+
See the License for the specific language governing permissions and
28+
limitations under the License.
29+
3130
=========================================================================*/
3231

3332
#ifndef itkSpeedFunctionPathInformation_hxx

‎include/itkSpeedFunctionToPathFilter.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
PURPOSE. See the above copyright notices for more information.
1515
1616
=========================================================================*/
17-
#ifndef __itkSpeedFunctionToPathFilter_h
18-
#define __itkSpeedFunctionToPathFilter_h
17+
#ifndef itkSpeedFunctionToPathFilter_h
18+
#define itkSpeedFunctionToPathFilter_h
1919

2020
#include "itkArrivalFunctionToPathFilter.h"
2121
#include "itkSpeedFunctionPathInformation.h"
@@ -68,7 +68,7 @@ class ITK_EXPORT SpeedFunctionToPathFilter :
6868
{
6969
public:
7070
/** Standard class typedefs. */
71-
typedef SpeedFunctionToPathFilter Self;
71+
typedef SpeedFunctionToPathFilter Self;
7272
typedef ArrivalFunctionToPathFilter<TInputImage,TOutputPath> Superclass;
7373
typedef SmartPointer<Self> Pointer;
7474
typedef SmartPointer<const Self> ConstPointer;
@@ -84,14 +84,14 @@ class ITK_EXPORT SpeedFunctionToPathFilter :
8484
TInputImage::ImageDimension);
8585

8686
/** Some image typedefs. */
87-
typedef TInputImage InputImageType;
87+
typedef TInputImage InputImageType;
8888
typedef typename InputImageType::Pointer InputImagePointer;
8989
typedef typename InputImageType::ConstPointer InputImageConstPointer;
9090
typedef typename InputImageType::RegionType InputImageRegionType;
9191
typedef typename InputImageType::PixelType InputImagePixelType;
9292

9393
/** Some path typedefs. */
94-
typedef TOutputPath OutputPathType;
94+
typedef TOutputPath OutputPathType;
9595
typedef typename OutputPathType::Pointer OutputPathPointer;
9696
typedef typename OutputPathType::ConstPointer OutputPathConstPointer;
9797

@@ -166,7 +166,7 @@ class ITK_EXPORT SpeedFunctionToPathFilter :
166166
virtual const PointType & GetNextEndPoint( );
167167

168168
std::vector< typename PathInformation::Pointer > m_Info;
169-
InputImagePointer m_CurrentArrivalFunction;
169+
InputImagePointer m_CurrentArrivalFunction;
170170

171171
private:
172172
SpeedFunctionToPathFilter( const Self& ); //purposely not implemented

0 commit comments

Comments
 (0)