Merge branch 'MergeBranch_resultImage' of https://github.com/MMRVZ2017/MPK.Puzzle into MergeBranch_resultImage
This commit is contained in:
		| @@ -1,7 +1,6 @@ | ||||
| // | ||||
| // Created by Raphael Maenle on 21/12/2017. | ||||
| // | ||||
|  | ||||
| #include "../../header/solve.h" | ||||
| #include "../../header/input.h" | ||||
|  | ||||
| @@ -41,7 +40,7 @@ void Puzzle::putIntoBox() | ||||
|             for(int rotations=0;rotations<4;rotations++) | ||||
|             { | ||||
|                 tmpPart.m_a1.shift(1); | ||||
|                 //TODO! add all other layerswith their rotaionvariance here | ||||
|                 //TODO! add all other layers with their rotaionvariance here | ||||
|                 myBox.emplace_back(tmpPart); | ||||
|  | ||||
|             } | ||||
| @@ -193,11 +192,6 @@ Mat Puzzle::resultImage( vector<LogEntry>& log){ | ||||
|         Rect ROI(ROI_X,ROI_Y , partWidth-separator, partHeight-separator); // j is the x coordinate not i!! | ||||
|         Mat temp; resize(img,temp, Size(ROI.width, ROI.height)); | ||||
|         temp.copyTo(result(ROI)); | ||||
|  | ||||
| //            imshow("result",result); | ||||
| //            waitKey(0); | ||||
|  | ||||
|  | ||||
|     } | ||||
|     imshow("result",result); | ||||
|     waitKey(0); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user