Skip to content

Commit 774a91a

Browse files
author
AleksandrPanov
committed
add setDetectorParameters()
1 parent 267189d commit 774a91a

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

modules/aruco/test/test_boarddetection.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ void CV_ArucoBoardPose::run(int) {
8282
cameraMatrix.at< double >(1, 2) = imgSize.height / 2;
8383
Mat distCoeffs(5, 1, CV_64FC1, Scalar::all(0));
8484
const int sizeX = 3, sizeY = 3;
85+
aruco::DetectorParameters detectorParameters = detector.getDetectorParameters();
8586

8687
// for different perspectives
8788
for(double distance = 0.2; distance <= 0.4; distance += 0.15) {
@@ -98,7 +99,8 @@ void CV_ArucoBoardPose::run(int) {
9899
imgSize, markerBorder);
99100
vector<vector<Point2f> > corners;
100101
vector<int> ids;
101-
detector.getDetectorParameters().markerBorderBits = markerBorder;
102+
detectorParameters.markerBorderBits = markerBorder;
103+
detector.setDetectorParameters(detectorParameters);
102104
detector.detectMarkers(img, corners, ids);
103105

104106
ASSERT_EQ(ids.size(), gridboard->getIds().size());
@@ -189,6 +191,7 @@ void CV_ArucoRefine::run(int) {
189191
cameraMatrix.at< double >(0, 2) = imgSize.width / 2;
190192
cameraMatrix.at< double >(1, 2) = imgSize.height / 2;
191193
Mat distCoeffs(5, 1, CV_64FC1, Scalar::all(0));
194+
aruco::DetectorParameters detectorParameters = detector.getDetectorParameters();
192195

193196
// for different perspectives
194197
for(double distance = 0.2; distance <= 0.4; distance += 0.2) {
@@ -207,7 +210,8 @@ void CV_ArucoRefine::run(int) {
207210
// detect markers
208211
vector<vector<Point2f> > corners, rejected;
209212
vector<int> ids;
210-
detector.getDetectorParameters().markerBorderBits = markerBorder;
213+
detectorParameters.markerBorderBits = markerBorder;
214+
detector.setDetectorParameters(detectorParameters);
211215
detector.detectMarkers(img, corners, ids, rejected);
212216

213217
// remove a marker from detection

modules/aruco/test/test_charucodetection.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,8 @@ void CV_CharucoDetection::run(int) {
160160
vector<vector<Point2f> > corners;
161161
vector<int> ids;
162162

163-
detector.getDetectorParameters().markerBorderBits = markerBorder;
163+
params.markerBorderBits = markerBorder;
164+
detector.setDetectorParameters(params);
164165
detector.detectMarkers(img, corners, ids);
165166

166167
if(ids.size() == 0) {
@@ -264,7 +265,8 @@ void CV_CharucoPoseEstimation::run(int) {
264265
// detect markers
265266
vector< vector< Point2f > > corners;
266267
vector< int > ids;
267-
detector.getDetectorParameters().markerBorderBits = markerBorder;
268+
params.markerBorderBits = markerBorder;
269+
detector.setDetectorParameters(params);
268270
detector.detectMarkers(img, corners, ids);
269271

270272
ASSERT_EQ(ids.size(), board->getIds().size());
@@ -348,7 +350,7 @@ void CV_CharucoDiamondDetection::run(int) {
348350
int iter = 0;
349351
Mat cameraMatrix = Mat::eye(3, 3, CV_64FC1);
350352
Size imgSize(500, 500);
351-
aruco::DetectorParameters params ;
353+
aruco::DetectorParameters params;
352354
params.minDistanceToBorder = 0;
353355
aruco::ArucoDetector detector(aruco::getPredefinedDictionary(aruco::DICT_6X6_250), params);
354356
float squareLength = 0.03f;
@@ -380,7 +382,8 @@ void CV_CharucoDiamondDetection::run(int) {
380382
// detect markers
381383
vector< vector< Point2f > > corners;
382384
vector< int > ids;
383-
detector.getDetectorParameters().markerBorderBits = markerBorder;
385+
params.markerBorderBits = markerBorder;
386+
detector.setDetectorParameters(params);
384387
detector.detectMarkers(img, corners, ids);
385388

386389
if(ids.size() != 4) {

0 commit comments

Comments
 (0)