Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions Modules/Core/Common/include/itkCellInterface.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,16 @@
// Define a macro for CellInterface sub-classes to use
// to define the Accept and GetTopologyId virtuals used
// by the MultiVisitor class
#define itkCellVisitMacro(TopologyId) \
static constexpr CellGeometryEnum GetTopologyId() { return TopologyId; } \
virtual void Accept(CellIdentifier cellid, typename CellInterface<PixelType, CellTraits>::MultiVisitor * mv) \
Comment thread
dzenanz marked this conversation as resolved.
override \
{ \
typename CellInterfaceVisitor<PixelType, CellTraits>::Pointer v = mv->GetVisitor(TopologyId); \
if (v) \
{ \
v->VisitFromCell(cellid, this); \
} \
} \
#define itkCellVisitMacro(TopologyId) \
static constexpr CellGeometryEnum GetTopologyId() { return TopologyId; } \
void Accept(CellIdentifier cellid, typename CellInterface<PixelType, CellTraits>::MultiVisitor * mv) override \
{ \
typename CellInterfaceVisitor<PixelType, CellTraits>::Pointer v = mv->GetVisitor(TopologyId); \
if (v) \
{ \
v->VisitFromCell(cellid, this); \
} \
} \
ITK_MACROEND_NOOP_STATEMENT

// Define a macro for the common type alias required by the
Expand Down
8 changes: 4 additions & 4 deletions Modules/Core/Common/include/itkEventObject.h
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,12 @@ operator<<(std::ostream & os, const EventObject & e)
using Superclass = super; \
classname() = default; \
classname(const Self & s); \
virtual ~classname() override; \
virtual const char * \
~classname() override; \
const char * \
GetEventName() const override; \
virtual bool \
bool \
CheckEvent(const itk::EventObject * e) const override; \
virtual itk::EventObject * \
itk::EventObject * \
MakeObject() const override; \
\
private: \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,29 +54,29 @@ class LandmarkRegistrationEstimator : public itk::ParametersEstimator<Point<doub
/** New method for creating an object using a factory. */
itkNewMacro(Self);

virtual void
void
Estimate(std::vector<Point<double, Dimension> *> & data, std::vector<double> & parameters) override;
Comment thread
dzenanz marked this conversation as resolved.
virtual void
void
Estimate(std::vector<Point<double, Dimension>> & data, std::vector<double> & parameters) override;

virtual void
void
LeastSquaresEstimate(std::vector<Point<double, Dimension> *> & data, std::vector<double> & parameters) override;
virtual void
void
LeastSquaresEstimate(std::vector<Point<double, Dimension>> & data, std::vector<double> & parameters) override;

virtual bool
bool
Agree(std::vector<double> & parameters, Point<double, Dimension> & data) override;

virtual std::vector<double>
std::vector<double>
AgreeMultiple(std::vector<double> & parameters,
std::vector<Point<double, Dimension>> & data,
unsigned int currentBest) override;

virtual bool
bool
CheckCorresspondenceDistance(std::vector<double> & parameters,
std::vector<Point<double, Dimension> *> & data) override;

virtual bool
bool
CheckCorresspondenceEdgeLength(std::vector<double> & parameters,
std::vector<Point<double, Dimension> *> & data,
double edgeLength) override;
Expand Down
Loading