Commit 36fbabf2 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

Merge pull request #189 from mshabunin/fix-headers

Replaced property macros in headers
parents 63a86ac4 da7ff82d
...@@ -20,13 +20,19 @@ namespace cv { namespace face { ...@@ -20,13 +20,19 @@ namespace cv { namespace face {
class CV_EXPORTS_W BasicFaceRecognizer : public FaceRecognizer class CV_EXPORTS_W BasicFaceRecognizer : public FaceRecognizer
{ {
public: public:
CV_PURE_PROPERTY(int, NumComponents) /** @see setNumComponents */
CV_PURE_PROPERTY(double, Threshold) virtual int getNumComponents() const = 0;
CV_PURE_PROPERTY_RO(std::vector<cv::Mat>, Projections) /** @copybrief getNumComponents @see getNumComponents */
CV_PURE_PROPERTY_RO(cv::Mat, Labels) virtual void setNumComponents(int val) = 0;
CV_PURE_PROPERTY_RO(cv::Mat, EigenValues) /** @see setThreshold */
CV_PURE_PROPERTY_RO(cv::Mat, EigenVectors) virtual double getThreshold() const = 0;
CV_PURE_PROPERTY_RO(cv::Mat, Mean) /** @copybrief getThreshold @see getThreshold */
virtual void setThreshold(double val) = 0;
virtual std::vector<cv::Mat> getProjections() const = 0;
virtual cv::Mat getLabels() const = 0;
virtual cv::Mat getEigenValues() const = 0;
virtual cv::Mat getEigenVectors() const = 0;
virtual cv::Mat getMean() const = 0;
}; };
/** /**
...@@ -95,13 +101,28 @@ CV_EXPORTS_W Ptr<BasicFaceRecognizer> createFisherFaceRecognizer(int num_compone ...@@ -95,13 +101,28 @@ CV_EXPORTS_W Ptr<BasicFaceRecognizer> createFisherFaceRecognizer(int num_compone
class CV_EXPORTS_W LBPHFaceRecognizer : public FaceRecognizer class CV_EXPORTS_W LBPHFaceRecognizer : public FaceRecognizer
{ {
public: public:
CV_PURE_PROPERTY(int, GridX) /** @see setGridX */
CV_PURE_PROPERTY(int, GridY) virtual int getGridX() const = 0;
CV_PURE_PROPERTY(int, Radius) /** @copybrief getGridX @see getGridX */
CV_PURE_PROPERTY(int, Neighbors) virtual void setGridX(int val) = 0;
CV_PURE_PROPERTY(double, Threshold) /** @see setGridY */
CV_PURE_PROPERTY_RO(std::vector<cv::Mat>, Histograms) virtual int getGridY() const = 0;
CV_PURE_PROPERTY_RO(cv::Mat, Labels) /** @copybrief getGridY @see getGridY */
virtual void setGridY(int val) = 0;
/** @see setRadius */
virtual int getRadius() const = 0;
/** @copybrief getRadius @see getRadius */
virtual void setRadius(int val) = 0;
/** @see setNeighbors */
virtual int getNeighbors() const = 0;
/** @copybrief getNeighbors @see getNeighbors */
virtual void setNeighbors(int val) = 0;
/** @see setThreshold */
virtual double getThreshold() const = 0;
/** @copybrief getThreshold @see getThreshold */
virtual void setThreshold(double val) = 0;
virtual std::vector<cv::Mat> getHistograms() const = 0;
virtual cv::Mat getLabels() const = 0;
}; };
/** /**
......
This diff is collapsed.
...@@ -76,8 +76,22 @@ public: ...@@ -76,8 +76,22 @@ public:
void read( const FileNode& fn ); void read( const FileNode& fn );
void write( FileStorage& fs ) const; void write( FileStorage& fs ) const;
CV_IMPL_PROPERTY(int, ImageWidth, resImWidth) int getImageWidth() const
CV_IMPL_PROPERTY(int, ImageHeight, resImHeight) {
return resImWidth;
}
inline void setImageWidth(int val)
{
resImWidth = val;
}
int getImageHeight() const
{
return resImHeight;
}
void setImageHeight(int val)
{
resImHeight = val;
}
protected: protected:
bool computeSaliencyImpl( const InputArray image, OutputArray saliencyMap ); bool computeSaliencyImpl( const InputArray image, OutputArray saliencyMap );
...@@ -114,8 +128,22 @@ public: ...@@ -114,8 +128,22 @@ public:
*/ */
bool init(); bool init();
CV_IMPL_PROPERTY(int, ImageWidth, imageWidth) int getImageWidth() const
CV_IMPL_PROPERTY(int, ImageHeight, imageHeight) {
return imageWidth;
}
inline void setImageWidth(int val)
{
imageWidth = val;
}
int getImageHeight() const
{
return imageHeight;
}
void setImageHeight(int val)
{
imageHeight = val;
}
protected: protected:
/** @brief Performs all the operations and calls all internal functions necessary for the accomplishment of the /** @brief Performs all the operations and calls all internal functions necessary for the accomplishment of the
...@@ -205,9 +233,30 @@ public: ...@@ -205,9 +233,30 @@ public:
*/ */
void setBBResDir( std::string resultsDir ); void setBBResDir( std::string resultsDir );
CV_IMPL_PROPERTY(double, Base, _base) double getBase() const
CV_IMPL_PROPERTY(int, NSS, _NSS) {
CV_IMPL_PROPERTY(int, W, _W) return _base;
}
inline void setBase(double val)
{
_base = val;
}
int getNSS() const
{
return _NSS;
}
void setNSS(int val)
{
_NSS = val;
}
int getW() const
{
return _W;
}
void setW(int val)
{
_W = val;
}
protected: protected:
/** @brief Performs all the operations and calls all internal functions necessary for the /** @brief Performs all the operations and calls all internal functions necessary for the
......
...@@ -217,12 +217,30 @@ public: ...@@ -217,12 +217,30 @@ public:
CV_WRAP static Ptr<AdaptiveManifoldFilter> create(); CV_WRAP static Ptr<AdaptiveManifoldFilter> create();
CV_PURE_PROPERTY(double, SigmaS) /** @see setSigmaS */
CV_PURE_PROPERTY(double, SigmaR) virtual double getSigmaS() const = 0;
CV_PURE_PROPERTY(int, TreeHeight) /** @copybrief getSigmaS @see getSigmaS */
CV_PURE_PROPERTY(int, PCAIterations) virtual void setSigmaS(double val) = 0;
CV_PURE_PROPERTY(bool, AdjustOutliers) /** @see setSigmaR */
CV_PURE_PROPERTY(bool, UseRNG) virtual double getSigmaR() const = 0;
/** @copybrief getSigmaR @see getSigmaR */
virtual void setSigmaR(double val) = 0;
/** @see setTreeHeight */
virtual int getTreeHeight() const = 0;
/** @copybrief getTreeHeight @see getTreeHeight */
virtual void setTreeHeight(int val) = 0;
/** @see setPCAIterations */
virtual int getPCAIterations() const = 0;
/** @copybrief getPCAIterations @see getPCAIterations */
virtual void setPCAIterations(int val) = 0;
/** @see setAdjustOutliers */
virtual bool getAdjustOutliers() const = 0;
/** @copybrief getAdjustOutliers @see getAdjustOutliers */
virtual void setAdjustOutliers(bool val) = 0;
/** @see setUseRNG */
virtual bool getUseRNG() const = 0;
/** @copybrief getUseRNG @see getUseRNG */
virtual void setUseRNG(bool val) = 0;
}; };
/** @brief Factory method, create instance of AdaptiveManifoldFilter and produce some initialization routines. /** @brief Factory method, create instance of AdaptiveManifoldFilter and produce some initialization routines.
......
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