From 4701720d3aba699fdc88e38c13ac85b596c4f4bc Mon Sep 17 00:00:00 2001 From: Raphael Maenle <17550607+g-spacewhale@users.noreply.github.com> Date: Tue, 16 Jan 2018 22:53:05 +0100 Subject: [PATCH] edited in puzzlecreator --- Source/functions/solve/puzzleExtension.cpp | 74 ++++++++++++++++++++-- Source/functions/solve/structure.cpp | 2 +- Source/header/solve.h | 2 + Source/main.cpp | 3 + 4 files changed, 76 insertions(+), 5 deletions(-) diff --git a/Source/functions/solve/puzzleExtension.cpp b/Source/functions/solve/puzzleExtension.cpp index e46999c..c7e9a00 100644 --- a/Source/functions/solve/puzzleExtension.cpp +++ b/Source/functions/solve/puzzleExtension.cpp @@ -3,12 +3,13 @@ // #include "../../header/solve.h" - +#include "../../header/input.h" void Puzzle::printPuzzle() { cout << "a1: " << endl; a1.printConstraintMatrix(); + } void Puzzle::printBox() @@ -22,6 +23,7 @@ void Puzzle::printBox() } } + //puts a puzzlepiece back into its box void Puzzle::putIntoBox() { @@ -92,10 +94,7 @@ void Puzzle::createBox(){ temp.SetNumOfRotations(j); myBox.push_back(temp); } - - } - } bool Puzzle::allSet() { @@ -115,3 +114,70 @@ void Puzzle::clearMat() } } } + +Mat Puzzle::readImage(int fileIndex, const char* inputDir){ + + char indexstr[12]; + sprintf(indexstr,"%d.jpg",fileIndex); + char * inputstr = (char *) malloc(1 + strlen(inputDir)+ strlen(indexstr) ); + strcpy(inputstr, inputDir); + strcat(inputstr,indexstr); + //cout<& log){ + + int Y_size = 600; // chose this to fit your monitor! + int separator = 1; + int partHeight = 90; + int partWidth; + auto imageH = int(round(partHeight* cols)); + + if(imageH > Y_size){ + imageH = Y_size; + } + partHeight = int(round(imageH / cols)); + partWidth= partHeight; + int imageW = int(round( partWidth*rows)); + + cout<<"imageW "<GetPartID() << endl; + + int imageNumber = it.PieceCollector[0].second->GetPartID(); + //cout<<"imageIndex: "<< imageNumber << endl; + + Mat img = readImage(imageNumber,PATH); + int angle = it.PieceCollector[0].second->GetNumOfRotations()*90; + Point2f center; + center.x = img.cols/2; + center.y = img.rows/2; + Mat RotMatrix = getRotationMatrix2D(center,angle,1); + warpAffine(img,img,RotMatrix, img.size()); +// imshow("readImg",img); // you can comment with Ctrl + / did you know? :D +// waitKey(0); + + auto ROI_X = int(round(it.myCoor.col*partWidth)); + auto ROI_Y = int(round(it.myCoor.row*partHeight)); +// cout<<"ROI X: "<< ROI_X<& log, Puzzle& puzzleMat) //tell log entry that it is set log.back().Set(); puzzleMat.setConstraints(log.back().myCoor,log.back().PieceCollector.begin()->second); - cout << "set:" << log.back().myCoor.col << "," << log.back().myCoor.row << endl; + //cout << "set:" << log.back().myCoor.col << "," << log.back().myCoor.row << endl; } bool backtrack(vector& log, Puzzle& puzzleMat) diff --git a/Source/header/solve.h b/Source/header/solve.h index 0c1a0e5..7bbc49a 100755 --- a/Source/header/solve.h +++ b/Source/header/solve.h @@ -58,6 +58,7 @@ public: void setConstraints(coor setConstraints, Part *constraintPiece); void printPuzzle(); void printBox(); + Mat resultImage(vector&); void createRandomBox(){ myBox.clear();p_myBox.clear(); @@ -81,6 +82,7 @@ public: private: + Mat readImage(int fileIndex, const char* inputDir); unsigned int cols; unsigned int rows; }; diff --git a/Source/main.cpp b/Source/main.cpp index 7f71bf6..001c09c 100644 --- a/Source/main.cpp +++ b/Source/main.cpp @@ -21,6 +21,9 @@ int main() while(next(log, puzzleMat)); cout << "Done!" << endl; + + cout << log.size() << endl; + puzzleMat.resultImage(log); puzzleMat.printPuzzle(); return 0; }