mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-01-20 15:59:24 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

remove print

Browse Source
This commit is contained in:
Alexander Panov 2024-07-29 16:23:48 +03:00
parent a253ff44b8
commit f622901518
4 changed files with 8 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/calib3d/CMakeLists.txt
View File

@ -6,7 +6,7 @@ set(debug_modules "")
if(DEBUG_opencv_calib3d) if(DEBUG_opencv_calib3d)
list(APPEND debug_modules opencv_highgui) list(APPEND debug_modules opencv_highgui)
endif() endif()
ocv_define_module(calib3d opencv_imgproc opencv_features2d opencv_flann opencv_highgui ${debug_modules} ocv_define_module(calib3d opencv_imgproc opencv_features2d opencv_flann ${debug_modules}
WRAP java objc python js WRAP java objc python js
) )
ocv_target_link_libraries(${the_module} ${LAPACK_LIBRARIES}) ocv_target_link_libraries(${the_module} ${LAPACK_LIBRARIES})

6
modules/calib3d/src/calibinit.cpp
View File

@ -72,7 +72,6 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "circlesgrid.hpp" #include "circlesgrid.hpp"
#include "opencv2/flann.hpp" #include "opencv2/flann.hpp"
#include "opencv2/highgui.hpp"
#include <stack> #include <stack>
@ -2243,8 +2242,9 @@ bool findCirclesGridNew(InputArray _image, Size patternSize,
} }
int mainCornerId = getMainCorner(cornerIds, points, pointTypes, patternSize, isSymmetricGrid); int mainCornerId = getMainCorner(cornerIds, points, pointTypes, patternSize, isSymmetricGrid);
imshow("image", image); cv::circle(image, points[mainCornerId], 25, Scalar(100, 100, 100), 5);
waitKey(0); //imshow("image", image);
//waitKey(0);
return false; return false;
} }

34
modules/calib3d/src/circlesgrid.cpp
View File

@ -43,7 +43,6 @@
#include "precomp.hpp" #include "precomp.hpp"
#include "circlesgrid.hpp" #include "circlesgrid.hpp"
#include <limits> #include <limits>
#include "opencv2/highgui.hpp"
// Requires CMake flag: DEBUG_opencv_calib3d=ON // Requires CMake flag: DEBUG_opencv_calib3d=ON
//#define DEBUG_CIRCLES //#define DEBUG_CIRCLES
@ -628,45 +627,16 @@ bool CirclesGridFinder::findHoles()
{ {
std::vector<Point2f> vectors, tmpVectors, filteredVectors, basis; std::vector<Point2f> vectors, tmpVectors, filteredVectors, basis;
Graph rng(0); Graph rng(0);
computeRNG(rng, tmpVectors);
Mat tmp = img.clone();
computeRNG(rng, tmpVectors, &tmp);
cv::imshow("computeRNG", tmp);
//cv::waitKey(0);
rng2gridGraph(rng, vectors); rng2gridGraph(rng, vectors);
filterOutliersByDensity(vectors, filteredVectors); filterOutliersByDensity(vectors, filteredVectors);
std::vector<Graph> basisGraphs; std::vector<Graph> basisGraphs;
findBasis(filteredVectors, basis, basisGraphs); // filteredVectors, basis, basisGraphs findBasis(filteredVectors, basis, basisGraphs);
tmp = img.clone();
drawBasisGraphs(basisGraphs, tmp, true, true);
cv::imshow("drawBasisGraphs", tmp);
//cv::waitKey(0);
findMCS(basis, basisGraphs); findMCS(basis, basisGraphs);
tmp = img.clone();
drawBasisGraphs(basisGraphs, tmp, true, true);
cv::imshow("findMCS", tmp);
//cv::waitKey(0);
eraseUsedGraph(basisGraphs); eraseUsedGraph(basisGraphs);
tmp = img.clone();
drawBasisGraphs(basisGraphs, tmp, true, true);
cv::imshow("eraseUsedGraph", tmp);
//cv::waitKey(0);
holes2 = holes; holes2 = holes;
holes.clear(); holes.clear();
findMCS(basis, basisGraphs); findMCS(basis, basisGraphs);
tmp = img.clone();
drawBasisGraphs(basisGraphs, tmp, true, true);
cv::imshow("findMCS2", tmp);
//cv::waitKey(0);
break; break;
} }

4
modules/calib3d/test/test_chesscorners.cpp
View File

@ -848,7 +848,7 @@ TEST(Calib3d_AsymmetricCirclesPatternDetector, issue_x1)
} }
bool found = false; bool found = false;
found = findCirclesGrid(image, parrernSize, centers, CALIB_CB_ASYMMETRIC_GRID | CALIB_CB_CLUSTERING); found = findCirclesGrid(image, parrernSize, centers, CALIB_CB_ASYMMETRIC_GRID);
drawChessboardCorners(image, parrernSize, centers,found); drawChessboardCorners(image, parrernSize, centers,found);
imshow("image", image); imshow("image", image);
@ -862,7 +862,7 @@ TEST(Calib3d_AsymmetricCirclesPatternDetector, issue_x1)
TEST(Calib3d_AsymmetricCirclesPatternDetector, issue_x2) TEST(Calib3d_AsymmetricCirclesPatternDetector, issue_x2)
{ {
string path = cvtest::findDataFile("cv/cameracalibration/asymmetric_circles/test1.png"); string path = cvtest::findDataFile("cv/cameracalibration/asymmetric_circles/test7.png");
Mat image = cv::imread(path); Mat image = cv::imread(path);
ASSERT_FALSE(image.empty()) << "Can't read image: " << path; ASSERT_FALSE(image.empty()) << "Can't read image: " << path;