Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
Main Repositories
otb
Commits
0769470e
Commit
0769470e
authored
Mar 07, 2018
by
Julien Michel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WRG: Fix more missing override warnings
parent
40e7f2a4
Changes
20
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
with
56 additions
and
56 deletions
+56
-56
Modules/Applications/AppClassification/app/otbMultiImageSamplingRate.cxx
...tions/AppClassification/app/otbMultiImageSamplingRate.cxx
+3
-3
Modules/Applications/AppClassification/app/otbSampleExtraction.cxx
...pplications/AppClassification/app/otbSampleExtraction.cxx
+3
-3
Modules/Applications/AppClassification/app/otbSampleSelection.cxx
...Applications/AppClassification/app/otbSampleSelection.cxx
+3
-3
Modules/Applications/AppClassification/app/otbTrainVectorClassifier.cxx
...ations/AppClassification/app/otbTrainVectorClassifier.cxx
+3
-3
Modules/Applications/AppDimensionalityReduction/app/otbTrainDimensionalityReduction.cxx
...ionalityReduction/app/otbTrainDimensionalityReduction.cxx
+3
-3
Modules/Applications/AppSARUtils/app/otbComputeModulusAndPhase.cxx
...pplications/AppSARUtils/app/otbComputeModulusAndPhase.cxx
+3
-3
Modules/Filtering/Wavelet/include/otbWaveletImageFilter.h
Modules/Filtering/Wavelet/include/otbWaveletImageFilter.h
+3
-3
Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.h
.../Filtering/Wavelet/include/otbWaveletInverseImageFilter.h
+4
-4
Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h
...clude/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h
+4
-4
Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.h
...clude/otbWaveletsSynopsisImageToWaveletsBandsListFilter.h
+5
-5
Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
...nsionalityReductionLearning/include/otbAutoencoderModel.h
+4
-4
Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h
...nLearning/include/otbImageDimensionalityReductionFilter.h
+1
-1
Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h
...ing/DimensionalityReductionLearning/include/otbPCAModel.h
+3
-3
Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
...ing/DimensionalityReductionLearning/include/otbSOMModel.h
+5
-5
Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
...vised/include/otbSharkRandomForestsMachineLearningModel.h
+1
-1
Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.h
...nclude/otbSharkRandomForestsMachineLearningModelFactory.h
+2
-2
Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h
...Unsupervised/include/otbSharkKMeansMachineLearningModel.h
+1
-1
Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h
...vised/include/otbSharkKMeansMachineLearningModelFactory.h
+2
-2
Modules/Radiometry/Simulation/include/otbProSailParameters.h
Modules/Radiometry/Simulation/include/otbProSailParameters.h
+1
-1
Modules/Wrappers/SWIG/src/python/itkPyCommand.h
Modules/Wrappers/SWIG/src/python/itkPyCommand.h
+2
-2
No files found.
Modules/Applications/AppClassification/app/otbMultiImageSamplingRate.cxx
View file @
0769470e
...
...
@@ -57,7 +57,7 @@ private:
m_CalculatorList
=
RateCalculatorListType
::
New
();
}
void
DoInit
()
void
DoInit
()
ITK_OVERRIDE
{
SetName
(
"MultiImageSamplingRate"
);
SetDescription
(
"Compute sampling rate for an input set of images."
);
...
...
@@ -186,11 +186,11 @@ private:
SetOfficialDocLink
();
}
void
DoUpdateParameters
()
void
DoUpdateParameters
()
ITK_OVERRIDE
{
}
void
DoExecute
()
void
DoExecute
()
ITK_OVERRIDE
{
// Clear state
m_CalculatorList
->
Clear
();
...
...
Modules/Applications/AppClassification/app/otbSampleExtraction.cxx
View file @
0769470e
...
...
@@ -53,7 +53,7 @@ public:
private:
SampleExtraction
()
{}
void
DoInit
()
void
DoInit
()
ITK_OVERRIDE
{
SetName
(
"SampleExtraction"
);
SetDescription
(
"Extracts samples values from an image."
);
...
...
@@ -119,7 +119,7 @@ private:
SetOfficialDocLink
();
}
void
DoUpdateParameters
()
void
DoUpdateParameters
()
ITK_OVERRIDE
{
if
(
HasValue
(
"vec"
)
)
{
...
...
@@ -149,7 +149,7 @@ private:
}
}
void
DoExecute
()
void
DoExecute
()
ITK_OVERRIDE
{
ogr
::
DataSource
::
Pointer
vectors
;
ogr
::
DataSource
::
Pointer
output
;
...
...
Modules/Applications/AppClassification/app/otbSampleSelection.cxx
View file @
0769470e
...
...
@@ -80,7 +80,7 @@ private:
m_RateCalculator
=
RateCalculatorType
::
New
();
}
void
DoInit
()
void
DoInit
()
ITK_OVERRIDE
{
SetName
(
"SampleSelection"
);
SetDescription
(
"Selects samples from a training vector data set."
);
...
...
@@ -227,7 +227,7 @@ private:
SetOfficialDocLink
();
}
void
DoUpdateParameters
()
void
DoUpdateParameters
()
ITK_OVERRIDE
{
if
(
HasValue
(
"vec"
)
)
{
...
...
@@ -257,7 +257,7 @@ private:
}
}
void
DoExecute
()
void
DoExecute
()
ITK_OVERRIDE
{
// Clear state
m_RateCalculator
->
ClearRates
();
...
...
Modules/Applications/AppClassification/app/otbTrainVectorClassifier.cxx
View file @
0769470e
...
...
@@ -54,7 +54,7 @@ public:
typedef
ContingencyTableType
::
Pointer
ContingencyTablePointerType
;
protected:
void
DoInit
()
void
DoInit
()
ITK_OVERRIDE
{
SetName
(
"TrainVectorClassifier"
);
SetDescription
(
"Train a classifier based on labeled geometries and a "
...
...
@@ -73,12 +73,12 @@ protected:
Superclass
::
DoInit
();
}
void
DoUpdateParameters
()
void
DoUpdateParameters
()
ITK_OVERRIDE
{
Superclass
::
DoUpdateParameters
();
}
void
DoExecute
()
void
DoExecute
()
ITK_OVERRIDE
{
m_FeaturesInfo
.
SetClassFieldNames
(
GetChoiceNames
(
"cfield"
),
GetSelectedItems
(
"cfield"
)
);
...
...
Modules/Applications/AppDimensionalityReduction/app/otbTrainDimensionalityReduction.cxx
View file @
0769470e
...
...
@@ -68,7 +68,7 @@ public:
typedef
otb
::
DimensionalityReductionModelFactory
<
ValueType
,
ValueType
>
ModelFactoryType
;
private:
void
DoInit
()
void
DoInit
()
ITK_OVERRIDE
{
SetName
(
"TrainDimensionalityReduction"
);
SetDescription
(
"Train a dimensionality reduction model"
);
...
...
@@ -115,11 +115,11 @@ private:
" value_5 value_6 value_7 value_8 value_9"
);
}
void
DoUpdateParameters
()
void
DoUpdateParameters
()
ITK_OVERRIDE
{
}
void
DoExecute
()
void
DoExecute
()
ITK_OVERRIDE
{
std
::
string
shapefile
=
GetParameterString
(
"io.vd"
);
...
...
Modules/Applications/AppSARUtils/app/otbComputeModulusAndPhase.cxx
View file @
0769470e
...
...
@@ -57,7 +57,7 @@ public:
typedef
itk
::
ComplexToPhaseImageFilter
<
ComplexFloatImageType
,
FloatImageType
>
PhaseFilterType
;
private:
void
DoInit
()
void
DoInit
()
ITK_OVERRIDE
{
SetName
(
"ComputeModulusAndPhase"
);
SetDescription
(
"This application computes the modulus and the phase of a complex SAR image."
);
...
...
@@ -100,12 +100,12 @@ private:
}
// DoUpdateParameters() is called as soon as a parameter value change.
void
DoUpdateParameters
()
void
DoUpdateParameters
()
ITK_OVERRIDE
{
}
// DoExecute() contains the application core.
void
DoExecute
()
void
DoExecute
()
ITK_OVERRIDE
{
m_Modulus
=
ModulusFilterType
::
New
();
m_Phase
=
PhaseFilterType
::
New
();
...
...
Modules/Filtering/Wavelet/include/otbWaveletImageFilter.h
View file @
0769470e
...
...
@@ -92,11 +92,11 @@ protected:
WaveletImageFilter
();
virtual
~
WaveletImageFilter
();
virtual
void
GenerateInputRequestedRegion
();
virtual
void
GenerateInputRequestedRegion
()
ITK_OVERRIDE
;
virtual
void
GenerateData
();
virtual
void
GenerateData
()
ITK_OVERRIDE
;
virtual
void
PrintSelf
(
std
::
ostream
&
os
,
itk
::
Indent
indent
)
const
;
virtual
void
PrintSelf
(
std
::
ostream
&
os
,
itk
::
Indent
indent
)
const
ITK_OVERRIDE
;
private:
WaveletImageFilter
(
const
Self
&
);
//purposely not implemented
...
...
Modules/Filtering/Wavelet/include/otbWaveletInverseImageFilter.h
View file @
0769470e
...
...
@@ -87,17 +87,17 @@ public:
itkSetMacro
(
NumberOfDecompositions
,
unsigned
int
);
/** If the filter is modified, the internal filters need to be modified too */
virtual
void
Modified
()
const
;
virtual
void
Modified
()
const
ITK_OVERRIDE
;
protected:
WaveletInverseImageFilter
();
virtual
~
WaveletInverseImageFilter
();
virtual
void
GenerateInputRequestedRegion
();
virtual
void
GenerateInputRequestedRegion
()
ITK_OVERRIDE
;
virtual
void
GenerateData
();
virtual
void
GenerateData
()
ITK_OVERRIDE
;
virtual
void
PrintSelf
(
std
::
ostream
&
os
,
itk
::
Indent
indent
)
const
;
virtual
void
PrintSelf
(
std
::
ostream
&
os
,
itk
::
Indent
indent
)
const
ITK_OVERRIDE
;
private:
WaveletInverseImageFilter
(
const
Self
&
);
//purposely not implemented
...
...
Modules/Filtering/Wavelet/include/otbWaveletsBandsListToWaveletsSynopsisImageFilter.h
View file @
0769470e
...
...
@@ -68,19 +68,19 @@ public:
protected:
/** Main computation method */
virtual
void
ThreadedGenerateData
(
const
RegionType
&
outputRegionForThread
,
itk
::
ThreadIdType
threadId
);
virtual
void
ThreadedGenerateData
(
const
RegionType
&
outputRegionForThread
,
itk
::
ThreadIdType
threadId
)
ITK_OVERRIDE
;
/** GenerateOutputInformation
* Set the number of bands of the output.
* Copy information from the first image of the list if existing.
**/
virtual
void
GenerateOutputInformation
(
void
);
virtual
void
GenerateOutputInformation
(
void
)
ITK_OVERRIDE
;
/**
* GenerateInputRequestedRegion
* Set the requested region of each image in the list.
*/
virtual
void
GenerateInputRequestedRegion
(
void
);
virtual
void
GenerateInputRequestedRegion
(
void
)
ITK_OVERRIDE
;
/** Constructor */
WaveletsBandsListToWaveletsSynopsisImageFilter
();
...
...
@@ -89,7 +89,7 @@ protected:
virtual
~
WaveletsBandsListToWaveletsSynopsisImageFilter
();
/**PrintSelf method */
virtual
void
PrintSelf
(
std
::
ostream
&
os
,
itk
::
Indent
indent
)
const
;
virtual
void
PrintSelf
(
std
::
ostream
&
os
,
itk
::
Indent
indent
)
const
ITK_OVERRIDE
;
private:
WaveletsBandsListToWaveletsSynopsisImageFilter
(
const
Self
&
);
//purposely not implemented
...
...
Modules/Filtering/Wavelet/include/otbWaveletsSynopsisImageToWaveletsBandsListFilter.h
View file @
0769470e
...
...
@@ -80,7 +80,7 @@ public:
itkGetMacro
(
DecimationRatio
,
unsigned
int
);
/** If the filter is modified, the extract list need to be regenerated */
virtual
void
Modified
()
const
;
virtual
void
Modified
()
const
ITK_OVERRIDE
;
protected:
/** Constructor */
...
...
@@ -90,16 +90,16 @@ protected:
virtual
~
WaveletsSynopsisImageToWaveletsBandsListFilter
();
/**PrintSelf method */
virtual
void
PrintSelf
(
std
::
ostream
&
os
,
itk
::
Indent
indent
)
const
;
virtual
void
PrintSelf
(
std
::
ostream
&
os
,
itk
::
Indent
indent
)
const
ITK_OVERRIDE
;
/** Generate the input requested region from the first element in the list. */
virtual
void
GenerateInputRequestedRegion
(
void
);
virtual
void
GenerateInputRequestedRegion
(
void
)
ITK_OVERRIDE
;
/** Generate the output information by building the output list. */
virtual
void
GenerateOutputInformation
(
void
);
virtual
void
GenerateOutputInformation
(
void
)
ITK_OVERRIDE
;
/** Main computation method */
virtual
void
GenerateData
(
void
);
virtual
void
GenerateData
(
void
)
ITK_OVERRIDE
;
private:
WaveletsSynopsisImageToWaveletsBandsListFilter
(
const
Self
&
);
//purposely not implemented
...
...
Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
View file @
0769470e
...
...
@@ -119,8 +119,8 @@ public:
itkGetMacro
(
LearningCurveFileName
,
std
::
string
);
itkSetMacro
(
LearningCurveFileName
,
std
::
string
);
bool
CanReadFile
(
const
std
::
string
&
filename
);
bool
CanWriteFile
(
const
std
::
string
&
filename
);
bool
CanReadFile
(
const
std
::
string
&
filename
)
ITK_OVERRIDE
;
bool
CanWriteFile
(
const
std
::
string
&
filename
)
ITK_OVERRIDE
;
void
Save
(
const
std
::
string
&
filename
,
const
std
::
string
&
name
=
""
)
ITK_OVERRIDE
;
void
Load
(
const
std
::
string
&
filename
,
const
std
::
string
&
name
=
""
)
ITK_OVERRIDE
;
...
...
@@ -155,14 +155,14 @@ protected:
virtual
TargetSampleType
DoPredict
(
const
InputSampleType
&
input
,
ConfidenceValueType
*
quality
=
ITK_NULLPTR
)
const
;
ConfidenceValueType
*
quality
=
ITK_NULLPTR
)
const
ITK_OVERRIDE
;
virtual
void
DoPredictBatch
(
const
InputListSampleType
*
,
const
unsigned
int
&
startIndex
,
const
unsigned
int
&
size
,
TargetListSampleType
*
,
ConfidenceListSampleType
*
quality
=
ITK_NULLPTR
)
const
;
ConfidenceListSampleType
*
quality
=
ITK_NULLPTR
)
const
ITK_OVERRIDE
;
private:
/** Internal Network */
...
...
Modules/Learning/DimensionalityReductionLearning/include/otbImageDimensionalityReductionFilter.h
View file @
0769470e
...
...
@@ -115,7 +115,7 @@ protected:
~
ImageDimensionalityReductionFilter
()
ITK_OVERRIDE
{}
/** Generate output information */
virtual
void
GenerateOutputInformation
()
;
virtual
void
GenerateOutputInformation
()
ITK_OVERRIDE
;
/** Threaded generate data */
void
ThreadedGenerateData
(
const
OutputImageRegionType
&
outputRegionForThread
,
itk
::
ThreadIdType
threadId
)
ITK_OVERRIDE
;
...
...
Modules/Learning/DimensionalityReductionLearning/include/otbPCAModel.h
View file @
0769470e
...
...
@@ -80,8 +80,8 @@ public:
itkSetMacro
(
WriteEigenvectors
,
bool
);
itkGetMacro
(
WriteEigenvectors
,
bool
);
bool
CanReadFile
(
const
std
::
string
&
filename
);
bool
CanWriteFile
(
const
std
::
string
&
filename
);
bool
CanReadFile
(
const
std
::
string
&
filename
)
ITK_OVERRIDE
;
bool
CanWriteFile
(
const
std
::
string
&
filename
)
ITK_OVERRIDE
;
void
Save
(
const
std
::
string
&
filename
,
const
std
::
string
&
name
=
""
)
ITK_OVERRIDE
;
void
Load
(
const
std
::
string
&
filename
,
const
std
::
string
&
name
=
""
)
ITK_OVERRIDE
;
...
...
@@ -94,7 +94,7 @@ protected:
virtual
TargetSampleType
DoPredict
(
const
InputSampleType
&
input
,
ConfidenceValueType
*
quality
=
ITK_NULLPTR
)
const
;
ConfidenceValueType
*
quality
=
ITK_NULLPTR
)
const
ITK_OVERRIDE
;
virtual
void
DoPredictBatch
(
const
InputListSampleType
*
,
...
...
Modules/Learning/DimensionalityReductionLearning/include/otbSOMModel.h
View file @
0769470e
...
...
@@ -101,11 +101,11 @@ public:
itkSetMacro
(
Seed
,
unsigned
int
);
itkGetMacro
(
Seed
,
unsigned
int
);
bool
CanReadFile
(
const
std
::
string
&
filename
);
bool
CanWriteFile
(
const
std
::
string
&
filename
);
bool
CanReadFile
(
const
std
::
string
&
filename
)
ITK_OVERRIDE
;
bool
CanWriteFile
(
const
std
::
string
&
filename
)
ITK_OVERRIDE
;
void
Save
(
const
std
::
string
&
filename
,
const
std
::
string
&
name
=
""
)
;
void
Load
(
const
std
::
string
&
filename
,
const
std
::
string
&
name
=
""
)
;
void
Save
(
const
std
::
string
&
filename
,
const
std
::
string
&
name
=
""
)
ITK_OVERRIDE
;
void
Load
(
const
std
::
string
&
filename
,
const
std
::
string
&
name
=
""
)
ITK_OVERRIDE
;
void
Train
()
ITK_OVERRIDE
;
...
...
@@ -118,7 +118,7 @@ private:
virtual
TargetSampleType
DoPredict
(
const
InputSampleType
&
input
,
ConfidenceValueType
*
quality
=
ITK_NULLPTR
)
const
;
ConfidenceValueType
*
quality
=
ITK_NULLPTR
)
const
ITK_OVERRIDE
;
/** Map size (width, height) */
SizeType
m_MapSize
;
...
...
Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModel.h
View file @
0769470e
...
...
@@ -148,7 +148,7 @@ protected:
virtual
void
DoPredictBatch
(
const
InputListSampleType
*
,
const
unsigned
int
&
startIndex
,
const
unsigned
int
&
size
,
TargetListSampleType
*
,
ConfidenceListSampleType
*
=
ITK_NULLPTR
)
const
ITK_OVERRIDE
;
/** PrintSelf method */
void
PrintSelf
(
std
::
ostream
&
os
,
itk
::
Indent
indent
)
const
;
void
PrintSelf
(
std
::
ostream
&
os
,
itk
::
Indent
indent
)
const
ITK_OVERRIDE
;
private:
SharkRandomForestsMachineLearningModel
(
const
Self
&
);
//purposely not implemented
...
...
Modules/Learning/Supervised/include/otbSharkRandomForestsMachineLearningModelFactory.h
View file @
0769470e
...
...
@@ -42,8 +42,8 @@ public:
typedef
itk
::
SmartPointer
<
const
Self
>
ConstPointer
;
/** Class methods used to interface with the registered factories. */
virtual
const
char
*
GetITKSourceVersion
(
void
)
const
;
virtual
const
char
*
GetDescription
(
void
)
const
;
virtual
const
char
*
GetITKSourceVersion
(
void
)
const
ITK_OVERRIDE
;
virtual
const
char
*
GetDescription
(
void
)
const
ITK_OVERRIDE
;
/** Method for class instantiation. */
itkFactorylessNewMacro
(
Self
);
...
...
Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModel.h
View file @
0769470e
...
...
@@ -140,7 +140,7 @@ protected:
DataType
NormalizeData
(
const
DataType
&
data
)
const
;
/** PrintSelf method */
void
PrintSelf
(
std
::
ostream
&
os
,
itk
::
Indent
indent
)
const
;
void
PrintSelf
(
std
::
ostream
&
os
,
itk
::
Indent
indent
)
const
ITK_OVERRIDE
;
private:
SharkKMeansMachineLearningModel
(
const
Self
&
);
//purposely not implemented
...
...
Modules/Learning/Unsupervised/include/otbSharkKMeansMachineLearningModelFactory.h
View file @
0769470e
...
...
@@ -41,8 +41,8 @@ public:
typedef
itk
::
SmartPointer
<
const
Self
>
ConstPointer
;
/** Class methods used to interface with the registered factories. */
virtual
const
char
*
GetITKSourceVersion
(
void
)
const
;
virtual
const
char
*
GetDescription
(
void
)
const
;
virtual
const
char
*
GetITKSourceVersion
(
void
)
const
ITK_OVERRIDE
;
virtual
const
char
*
GetDescription
(
void
)
const
ITK_OVERRIDE
;
/** Method for class instantiation. */
itkFactorylessNewMacro
(
Self
);
...
...
Modules/Radiometry/Simulation/include/otbProSailParameters.h
View file @
0769470e
...
...
@@ -115,7 +115,7 @@ class ITK_EXPORT ProSailParameters : public itk::DataObject
/** Destructor */
virtual
~
ProSailParameters
()
{};
/** PrintSelf method */
void
PrintSelf
(
std
::
ostream
&
os
,
itk
::
Indent
indent
)
const
;
void
PrintSelf
(
std
::
ostream
&
os
,
itk
::
Indent
indent
)
const
ITK_OVERRIDE
;
private:
...
...
Modules/Wrappers/SWIG/src/python/itkPyCommand.h
View file @
0769470e
...
...
@@ -70,8 +70,8 @@ public:
PyObject
*
GetCommandCallable
();
void
Execute
(
Object
*
,
const
EventObject
&
);
void
Execute
(
const
Object
*
,
const
EventObject
&
);
void
Execute
(
Object
*
,
const
EventObject
&
)
ITK_OVERRIDE
;
void
Execute
(
const
Object
*
,
const
EventObject
&
)
ITK_OVERRIDE
;
protected:
PyCommand
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment