mirror of
https://github.com/opencv/opencv.git
synced 2024-12-16 02:19:12 +08:00
b4b35cff15
Megre together with https://github.com/opencv/opencv_contrib/pull/3325 1. Move aruco_detector, aruco_board, aruco_dictionary, aruco_utils to objdetect 1.1 add virtual Board::draw(), virtual ~Board() 1.2 move `testCharucoCornersCollinear` to Board classes (and rename to `checkCharucoCornersCollinear`) 1.3 add wrappers to keep the old api working 3. Reduce inludes 4. Fix java tests (add objdetect import) 5. Refactoring ### Pull Request Readiness Checklist See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request - [x] I agree to contribute to the project under Apache 2 License. - [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV - [x] The PR is proposed to the proper branch - [x] There is a reference to the original bug report and related work - [x] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [x] The feature is well documented and sample code can be built with the project CMake ``` **WIP** force_builders=linux,win64,docs,Linux x64 Debug,Custom Xbuild_contrib:Docs=OFF build_image:Custom=ubuntu:22.04 build_worker:Custom=linux-1 ```
84 lines
3.0 KiB
Java
84 lines
3.0 KiB
Java
package org.opencv.test.aruco;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
|
|
import org.opencv.test.OpenCVTestCase;
|
|
import org.opencv.core.Scalar;
|
|
import org.opencv.core.Mat;
|
|
import org.opencv.core.Size;
|
|
import org.opencv.core.CvType;
|
|
import org.opencv.objdetect.*;
|
|
|
|
|
|
public class ArucoTest extends OpenCVTestCase {
|
|
|
|
public void testGenerateBoards() {
|
|
Dictionary dictionary = Objdetect.getPredefinedDictionary(Objdetect.DICT_4X4_50);
|
|
|
|
Mat point1 = new Mat(4, 3, CvType.CV_32FC1);
|
|
int row = 0, col = 0;
|
|
double squareLength = 40.;
|
|
point1.put(row, col, 0, 0, 0,
|
|
0, squareLength, 0,
|
|
squareLength, squareLength, 0,
|
|
0, squareLength, 0);
|
|
List<Mat>objPoints = new ArrayList<Mat>();
|
|
objPoints.add(point1);
|
|
|
|
Mat ids = new Mat(1, 1, CvType.CV_32SC1);
|
|
ids.put(row, col, 0);
|
|
|
|
Board board = Board.create(objPoints, dictionary, ids);
|
|
|
|
Mat image = new Mat();
|
|
board.generateImage(new Size(80, 80), image, 2);
|
|
|
|
assertTrue(image.total() > 0);
|
|
}
|
|
|
|
public void testArucoIssue3133() {
|
|
byte[][] marker = {{0,1,1},{1,1,1},{0,1,1}};
|
|
Dictionary dictionary = Objdetect.extendDictionary(1, 3);
|
|
dictionary.set_maxCorrectionBits(0);
|
|
Mat markerBits = new Mat(3, 3, CvType.CV_8UC1);
|
|
for (int i = 0; i < 3; i++) {
|
|
for (int j = 0; j < 3; j++) {
|
|
markerBits.put(i, j, marker[i][j]);
|
|
}
|
|
}
|
|
|
|
Mat markerCompressed = Dictionary.getByteListFromBits(markerBits);
|
|
assertMatNotEqual(markerCompressed, dictionary.get_bytesList());
|
|
|
|
dictionary.set_bytesList(markerCompressed);
|
|
assertMatEqual(markerCompressed, dictionary.get_bytesList());
|
|
}
|
|
|
|
public void testArucoDetector() {
|
|
Dictionary dictionary = Objdetect.getPredefinedDictionary(0);
|
|
DetectorParameters detectorParameters = new DetectorParameters();
|
|
ArucoDetector detector = new ArucoDetector(dictionary, detectorParameters);
|
|
|
|
Mat markerImage = new Mat();
|
|
int id = 1, offset = 5, size = 40;
|
|
Objdetect.generateImageMarker(dictionary, id, size, markerImage, detectorParameters.get_markerBorderBits());
|
|
|
|
Mat image = new Mat(markerImage.rows() + 2*offset, markerImage.cols() + 2*offset,
|
|
CvType.CV_8UC1, new Scalar(255));
|
|
Mat m = image.submat(offset, size+offset, offset, size+offset);
|
|
markerImage.copyTo(m);
|
|
|
|
List<Mat> corners = new ArrayList();
|
|
Mat ids = new Mat();
|
|
detector.detectMarkers(image, corners, ids);
|
|
|
|
assertEquals(1, corners.size());
|
|
Mat res = corners.get(0);
|
|
assertArrayEquals(new double[]{offset, offset}, res.get(0, 0), 0.0);
|
|
assertArrayEquals(new double[]{size + offset - 1, offset}, res.get(0, 1), 0.0);
|
|
assertArrayEquals(new double[]{size + offset - 1, size + offset - 1}, res.get(0, 2), 0.0);
|
|
assertArrayEquals(new double[]{offset, size + offset - 1}, res.get(0, 3), 0.0);
|
|
}
|
|
}
|