rm-archive/PuzzleSolver
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

added better visualization

Browse Source
This commit is contained in:
g-spacewhale 2018-01-19 16:12:45 +01:00
parent 6bfa5b1f7c
commit 229afbc68a
1 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/functions/solve/puzzleExtension.cpp
View File

@ -6,9 +6,9 @@
typedef std::vector<std::vector<Point>> Contour_t; typedef std::vector<std::vector<Point>> Contour_t;
typedef std::vector<Vec4i> Hierarchy_t; //hierarchy object is needed for drawContours apparently typedef std::vector<Vec4i> Hierarchy_t; //hierarchy object is needed for drawContours apparently
Mat crop2ContourInv(const Mat & img); Mat crop2ContourInv(const Mat & img);
Contour_t getLongestContour(Mat bw); Contour_t getLongestContour(Mat bw);
int getLongestContourIndex(Contour_t contours);
void Puzzle::printPuzzle() void Puzzle::printPuzzle()
{ {
@ -131,7 +131,7 @@ Mat Puzzle::readImage(int fileIndex, const char* inputDir){
Mat source = imread(inputstr,1); Mat source = imread(inputstr,1);
return source; return source;
} }
Mat Puzzle::resultImage_for_merging( vector<LogEntry>& log){ Mat Puzzle::resultImage( vector<LogEntry>& log){
int Y_size = 1200; // chose this to fit your monitor! int Y_size = 1200; // chose this to fit your monitor!
int separator = 1; int separator = 1;
int partHeight = 90; int partHeight = 90;
@ -189,7 +189,7 @@ Mat Puzzle::resultImage_for_merging( vector<LogEntry>& log){
center.x = img.cols/2; center.x = img.cols/2;
center.y = img.rows/2; center.y = img.rows/2;
Mat RotMatrix = getRotationMatrix2D(center,angle,1); Mat RotMatrix = getRotationMatrix2D(center,angle,1);
warpAffine(img,img,RotMatrix, img.size()); warpAffine(invert,invert,RotMatrix, invert.size());
bitwise_not(invert,img); bitwise_not(invert,img);
Mat cropped = crop2ContourInv(img); Mat cropped = crop2ContourInv(img);
auto ROI_X = int(round(it.myCoor.col*partWidth)); auto ROI_X = int(round(it.myCoor.col*partWidth));
@ -220,12 +220,7 @@ Mat crop2ContourInv(const Mat & img){ // for white background images
return cropped; return cropped;
} }
Contour_t getLongestContour(Mat bw){ int getLongestContourIndex(Contour_t contours){
Mat mask = Mat::zeros(bw.size(), CV_8UC1);
Hierarchy_t hierarchy;
Contour_t contours;
findContours(bw, contours, hierarchy, CV_RETR_EXTERNAL, CV_CHAIN_APPROX_SIMPLE);
double area = 0; double area = 0;
double largestArea = 0; double largestArea = 0;
size_t largestIndex = 0; size_t largestIndex = 0;
@ -238,12 +233,5 @@ Contour_t getLongestContour(Mat bw){
largestIndex = i; // i is type size_t, should be converted to int. largestIndex = i; // i is type size_t, should be converted to int.
} }
} }
return(largestIndex);
Contour_t largestContour;
largestContour.resize(contours.size()); //Otherwise it is just a null pointer and the program crashes!
size_t index = 0;
int strength = 2; // distance between the original contour and the approximated contour
approxPolyDP(Mat(contours[largestIndex]), largestContour[index], strength, true);
return(largestContour);
} }