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

Layer logic done, dispatcher simplified

Browse Source
This commit is contained in:
Raphael Maenle
2018-01-22 19:20:25 +01:00
parent 1161b972ba
commit 7979d28422
7 changed files with 101 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Source/functions/AbstractionLayers/Layer1/AbstractionLayer_1.cpp
View File

@ -21,11 +21,14 @@ bool AbstractionLayer_1::PreProcessing(coor mySize, const vector<Part*>* partAr
for(int i = 0; i < mySize.row*mySize.col; i++)
{
unsigned char poempel = analyse.getTabs(i);
PSum+=PoempelSum(poempel); //preprocess correct check
for (int j=0;j<4;j++)
{
ref_partArray[iterator]->m_a1.m_connections=poempel;
ref_partArray[iterator]->m_a3.SideLength=analyse.getPoempelPosition(i); //do abstraction Layer 3 check
shift(poempel,1);
ref_partArray[iterator]->m_a3.shift(j);//rotate information
iterator++;
}
}
@ -428,7 +431,9 @@ bool analyseParts::getImages(){
return false;
}
mask.setCorners(corners);
mask.setTabs(analyseContour(corners,contours[0]));
vector<double> tmpPoempelPosition={0,0,0,0,0,0,0,0};//TODO somehow make this code section bearable
mask.setTabs(analyseContour(corners,contours[0],tmpPoempelPosition));
mask.setPoempelPosition(tmpPoempelPosition);
mask.setLens(analyseLens(lens, corners));
mask.setMidpoint(calcMidpoint(corners));
masks.push_back(mask);
@ -633,7 +638,8 @@ vector<Point> analyseParts::findCorners(vector<Point> contour, Point center){
if(DISPLAY) imshow("draw",drawing);
return corners;
}
unsigned char analyseParts::analyseContour(vector<Point> corners, vector<Point> contour) {
unsigned char analyseParts::analyseContour(vector<Point> corners, vector<Point> contour,vector<double>& PoempelPosition){
vector<Point> contour_right;
vector<Point> contour_top;
vector<Point> contour_left;
@ -1066,6 +1072,12 @@ unsigned char analyseParts::analyseContour(vector<Point> corners, vector<Point>
max_dist_idx = i;
}
}
//saves length between Corners and Poempel right
Point diff = corners[2] - contour_right_new[max_dist_idx];
PoempelPosition[2] = cv::sqrt(diff.x*diff.x + diff.y*diff.y);
diff = corners[0] - contour_right_new[max_dist_idx];
PoempelPosition[3] = cv::sqrt(diff.x*diff.x + diff.y*diff.y);
/*-------------------------------------*/
unsigned char tabs = 0;
int poembel_threshold = 15;
@ -1090,6 +1102,13 @@ unsigned char analyseParts::analyseContour(vector<Point> corners, vector<Point>
max_dist_idx = i;
}
}
//saves length between Corners and Poempel
diff = corners[3] - contour_top_new[max_dist_idx];
PoempelPosition[0] = cv::sqrt(diff.x*diff.x + diff.y*diff.y);
diff = corners[2] - contour_top_new[max_dist_idx];
PoempelPosition[1] = cv::sqrt(diff.x*diff.x + diff.y*diff.y);
/*-------------------------------------*/
if (ref_top - contour_top_new[max_dist_idx].y <= -poembel_threshold) {
@ -1113,6 +1132,12 @@ unsigned char analyseParts::analyseContour(vector<Point> corners, vector<Point>
max_dist_idx = i;
}
}
//saves length between Corners and Poempel
diff = corners[1] - contour_left_new[max_dist_idx];
PoempelPosition[6] = cv::sqrt(diff.x*diff.x + diff.y*diff.y);
diff = corners[3] - contour_left_new[max_dist_idx];
PoempelPosition[7] = cv::sqrt(diff.x*diff.x + diff.y*diff.y);
/*-------------------------------------*/
if (ref_left - contour_left_new[max_dist_idx].x <= -poembel_threshold) {
tabs |= (1 << LEFT);
@ -1124,7 +1149,7 @@ unsigned char analyseParts::analyseContour(vector<Point> corners, vector<Point>
tabs |= (0 << LEFT);
}
/*---------Suche Poempel Oben---------------*/
/*---------Suche Poempel Unten---------------*/
max_dist = 0;
dist = 0;
max_dist_idx = 0;
@ -1135,6 +1160,10 @@ unsigned char analyseParts::analyseContour(vector<Point> corners, vector<Point>
max_dist_idx = i;
}
}
diff = corners[0] - contour_bottom_new[max_dist_idx];
PoempelPosition[4] = cv::sqrt(diff.x*diff.x + diff.y*diff.y);
diff = corners[1] - contour_bottom_new[max_dist_idx];
PoempelPosition[5] = cv::sqrt(diff.x*diff.x + diff.y*diff.y);
/*-------------------------------------*/
if (ref_bottom - contour_bottom_new[max_dist_idx].y <= -poembel_threshold) {
tabs |= (2 << BOTTOM);

7
Source/functions/AbstractionLayers/Layer1/AbstractionLayer_1.h
View File

@ -82,11 +82,13 @@ public:
void setLens(vector<double> l ){len = l;}
Point getMidpoint(){return midpoint;}
void setMidpoint(Point m ){midpoint = m;}
vector<double> getPoempelPosition(){return PoempelPosition;}
void setPoempelPosition(vector<double>& newPP){PoempelPosition=newPP;}
vector<Point> getCorners(){return corners;}
private:
Mat image;
vector<double> PoempelPosition;
vector<Point> corners;
vector<vector<Point>> contour;
vector<Vec4i> hierarchy;
@ -105,12 +107,13 @@ public:
vector<Vec4i> getHierarchy(int i){if(i>= nr_parts)return masks[nr_parts-1].getHierarchy(); else return masks[i].getHierarchy();}
unsigned char getTabs(int i){if(i>= nr_parts)return masks[nr_parts-1].getTabs(); else return masks[i].getTabs();}
vector<double> getLen(int i ){return masks[i].getLen();}
vector<double> getPoempelPosition(int i){return masks[i].getPoempelPosition();}
vector<double> analyseLens(vector<double>, vector<Point>);
Point calcMidpoint(vector<Point>);
Point getMidpoint(int i){return masks[i].getMidpoint();}
Point findCenter(Mat);
vector<Point> findCorners(vector<Point>,Point);
unsigned char analyseContour(vector<Point>, vector<Point>);
unsigned char analyseContour(vector<Point>, vector<Point>,vector<double>&);
Mat makeBorder(Mat&);
Mat readImages(int);
Mat morphDilateErode(Mat&);