Chiebot-Mirror
/
opencv_contrib
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Replaced CV_PURE_PROPERTY macros with the code

Browse Source
pull/189/head
Maksim Shabunin 10 years ago
parent 63a86ac44e
commit 05405e3dca
3 changed files with 80 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 49
      modules/face/include/opencv2/face/facerec.hpp
  2. 18
      modules/rgbd/include/opencv2/rgbd.hpp
  3. 30
      modules/ximgproc/include/opencv2/ximgproc/edge_filter.hpp

49
modules/face/include/opencv2/face/facerec.hpp
Unescape View File

@ -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
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;
}; };
/** /**

18
modules/rgbd/include/opencv2/rgbd.hpp
Unescape View File

@ -466,16 +466,14 @@ namespace rgbd
static Ptr<Odometry> create(const String & odometryType); static Ptr<Odometry> create(const String & odometryType);
//TODO: which properties are common for all Odometry successors? /** @see setCameraMatrix */
CV_PURE_PROPERTY_S(cv::Mat, CameraMatrix) virtual cv::Mat getCameraMatrix() const = 0;
// CV_PURE_PROPERTY(double, MinDepth) /** @copybrief getCameraMatrix @see getCameraMatrix */
// CV_PURE_PROPERTY(double, MaxDepth) virtual void setCameraMatrix(const cv::Mat &val) = 0;
// CV_PURE_PROPERTY(double, MaxDepthDiff) /** @see setTransformType */
// CV_PURE_PROPERTY_S(cv::Mat, IterationCounts) virtual int getTransformType() const = 0;
// CV_PURE_PROPERTY(double, MaxPointsPart) /** @copybrief getTransformType @see getTransformType */
CV_PURE_PROPERTY(int, TransformType) virtual void setTransformType(int val) = 0;
// CV_PURE_PROPERTY(double, MaxTranslation)
// CV_PURE_PROPERTY(double, MaxRotation)
protected: protected:
virtual void virtual void

30
modules/ximgproc/include/opencv2/ximgproc/edge_filter.hpp
Unescape View File

@ -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.

Write Preview
Loading…
Cancel
Save