mirror of
https://github.com/opencv/opencv.git
synced 2025-08-05 22:19:14 +08:00
Merge pull request #26753 from shyama7004:RotatedMarkers
Fix rotated aruco marker board generation #26753 ### Issue : [25884](https://github.com/opencv/opencv/issues/25884) ### 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 - [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable Patch to opencv_extra has the same branch name. - [ ] The feature is well documented and sample code can be built with the project CMake
This commit is contained in:
parent
d6f60d4ab8
commit
08a88816ed
@ -115,7 +115,13 @@ void Board::Impl::generateImage(Size outSize, OutputArray img, int marginSize, i
|
||||
}
|
||||
|
||||
// get marker
|
||||
Size dst_sz(outCorners[2] - outCorners[0]); // assuming CCW order
|
||||
Point2f vecWidth = outCorners[1] - outCorners[0];
|
||||
float width = (float)cv::norm(vecWidth);
|
||||
|
||||
Point2f vecHeight = outCorners[2] - outCorners[0];
|
||||
float height = (float)cv::norm(vecHeight);
|
||||
|
||||
Size dst_sz(cvRound(width), cvRound(height));
|
||||
dst_sz.width = dst_sz.height = std::min(dst_sz.width, dst_sz.height); //marker should be square
|
||||
dictionary.generateImageMarker(ids[m], dst_sz.width, marker, borderBits);
|
||||
|
||||
|
@ -325,5 +325,51 @@ TEST(CV_ArucoDictionary, extendDictionary) {
|
||||
ASSERT_EQ(custom_dictionary.bytesList.rows, 150);
|
||||
ASSERT_EQ(cv::norm(custom_dictionary.bytesList, base_dictionary.bytesList.rowRange(0, 150)), 0.);
|
||||
}
|
||||
TEST(CV_ArucoBoardGenerateImage_RotationTest, HandlesRotatedMarkersWithoutBoundingBoxError)
|
||||
{
|
||||
using namespace cv;
|
||||
using namespace cv::aruco;
|
||||
Dictionary dict = getPredefinedDictionary(DICT_4X4_50);
|
||||
DetectorParameters detectorParams;
|
||||
ArucoDetector detector(dict, detectorParams);
|
||||
std::vector<float> angles = {0.0f, 45.0f, 90.0f, 135.0f};
|
||||
for (auto angle_deg : angles)
|
||||
{
|
||||
float angle_rad = angle_deg * static_cast<float>(CV_PI) / 180.0f;
|
||||
float c = cos(angle_rad);
|
||||
float s = sin(angle_rad);
|
||||
std::vector<Point3f> markerCorners(4);
|
||||
markerCorners[0] = Point3f(0.f, 0.f, 0.f);
|
||||
markerCorners[1] = Point3f(1.f, 0.f, 0.f);
|
||||
markerCorners[2] = Point3f(1.f, 1.f, 0.f);
|
||||
markerCorners[3] = Point3f(0.f, 1.f, 0.f);
|
||||
for (auto &p : markerCorners)
|
||||
{
|
||||
float xNew = p.x * c - p.y * s;
|
||||
float yNew = p.x * s + p.y * c;
|
||||
p.x = xNew;
|
||||
p.y = yNew;
|
||||
}
|
||||
std::vector<std::vector<Point3f>> allObjPoints{markerCorners};
|
||||
std::vector<int> ids{0};
|
||||
Board board(allObjPoints, dict, ids);
|
||||
float markerSize = 1.0f;
|
||||
float rotatedSize = markerSize * std::sqrt(2.0f);
|
||||
int borderBits = 1;
|
||||
int marginSize = 20;
|
||||
int sidePixels = static_cast<int>((rotatedSize + 2.0f * borderBits) * 500) + 2 * marginSize;
|
||||
Mat outImg;
|
||||
Size outSize(sidePixels, sidePixels);
|
||||
ASSERT_NO_THROW(board.generateImage(outSize, outImg, marginSize, borderBits))
|
||||
<< "board.generateImage() threw an exception at angle " << angle_deg;
|
||||
std::vector<int> detectedIds;
|
||||
std::vector<std::vector<Point2f>> detectedCorners;
|
||||
detector.detectMarkers(outImg, detectedCorners, detectedIds);
|
||||
ASSERT_EQ(detectedIds.size(), (size_t)1)
|
||||
<< "Failed to detect single marker at angle: " << angle_deg;
|
||||
EXPECT_EQ(detectedIds[0], 0)
|
||||
<< "Marker ID mismatch at angle: " << angle_deg;
|
||||
}
|
||||
}
|
||||
|
||||
}} // namespace
|
||||
|
Loading…
Reference in New Issue
Block a user