Commit 05816fae authored by Emmanuel Christophe's avatar Emmanuel Christophe
Browse files

ENH: minor fixes on Simulation

parent 4b826004
......@@ -38,6 +38,12 @@ LeafParameters
m_N=1.2;
}
/**
* Destructor
*/
LeafParameters
::~LeafParameters()
{}
/**PrintSelf method */
void
......
......@@ -68,18 +68,15 @@ class ITK_EXPORT LeafParameters : public itk::DataObject
/** Set/Get leaf structure coef*/
itkSetMacro(N, double);
itkGetMacro(N, double);
protected:
/** Constructor */
LeafParameters();
/** Destructor */
virtual ~LeafParameters() {};
~LeafParameters();
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
private:
LeafParameters(const Self&); //purposely not implemented
void operator=(const Self&); //purposely not implemented
......
......@@ -43,6 +43,11 @@ ProspectModel
this->itk::ProcessObject::SetNthOutput(1, outputTrans.GetPointer());
}
/** Destructor */
ProspectModel
::~ProspectModel()
{}
/** Set Input */
void
ProspectModel
......
......@@ -49,7 +49,6 @@ class ITK_EXPORT ProspectModel : public SimulationStep1Base
typedef Superclass::SpectralResponseType SpectralResponseType;
typedef Superclass::ParametersType ParametersType;
/** Standard macros */
itkNewMacro(Self);
itkTypeMacro(ProspectModel, SpectrumGeneratorBase);
......@@ -59,7 +58,6 @@ class ITK_EXPORT ProspectModel : public SimulationStep1Base
void SetInput(const LeafParametersType *object);
LeafParametersType * GetInput();
/** GenerateData */
virtual void GenerateData();
......@@ -67,13 +65,11 @@ class ITK_EXPORT ProspectModel : public SimulationStep1Base
virtual SpectralResponseType * GetReflectance();
virtual SpectralResponseType * GetTransmittance();
protected:
/** Constructor */
ProspectModel();
/** Destructor */
virtual ~ProspectModel() {};
~ProspectModel();
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
......@@ -90,9 +86,4 @@ class ITK_EXPORT ProspectModel : public SimulationStep1Base
}// end namespace otb
#ifndef OTB_MANUAL_INSTANTIATION
// #include "otbProspectModel.cxx"
#endif
#endif
......@@ -52,6 +52,10 @@ SailModel
m_PSI=0;
}
/** Destructor */
SailModel
::~SailModel()
{}
/** Set/Get input reflectance */
void
......
......@@ -109,7 +109,7 @@ class ITK_EXPORT SailModel : public SimulationStep2Base
/** Constructor */
SailModel();
/** Destructor */
virtual ~SailModel() {};
virtual ~SailModel();
/** PrintSelf method */
void PrintSelf(std::ostream& os, itk::Indent indent) const;
......
......@@ -18,9 +18,6 @@
// this file defines the otbCommonTest for the test driver
// and all it expects is that you have a function called RegisterTests
#if defined(_MSC_VER)
#pragma warning ( disable : 4786 )
#endif
#include "otbTestMain.h"
......
......@@ -18,9 +18,6 @@
// this file defines the otbCommonTest for the test driver
// and all it expects is that you have a function called RegisterTests
#if defined(_MSC_VER)
#pragma warning ( disable : 4786 )
#endif
#include "otbTestMain.h"
......
......@@ -18,9 +18,6 @@
// this file defines the otbCommonTest for the test driver
// and all it expects is that you have a function called RegisterTests
#if defined(_MSC_VER)
#pragma warning ( disable : 4786 )
#endif
#include "otbTestMain.h"
......
......@@ -18,9 +18,6 @@
// this file defines the otbCommonTest for the test driver
// and all it expects is that you have a function called RegisterTests
#if defined(_MSC_VER)
#pragma warning ( disable : 4786 )
#endif
#include "otbTestMain.h"
......
......@@ -18,9 +18,6 @@
// this file defines the otbCommonTest for the test driver
// and all it expects is that you have a function called RegisterTests
#if defined(_MSC_VER)
#pragma warning ( disable : 4786 )
#endif
#include "otbTestMain.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment