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

added Histogramm Layer

Browse Source 
multiple errors
This commit is contained in:
Raphael Maenle
2018-01-30 18:16:26 +01:00
parent 564053797a
commit 6f02bf4f97
9 changed files with 277 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/header/input.h
View File

@ -10,7 +10,7 @@
#include "../functions/AbstractionLayers/Layer3_PoempelPosition/AbstractionLayer_PoempelPosition_Properties.h"
#include "../functions/AbstractionLayers/Layer_ColorMatching/AbstractionLayer_ColorMatching_Properties.h"
#include "../functions/AbstractionLayers/Layer_SURFFeatures/AbstractionLayer_SURFFeatures_Properties.h"
#include "../functions/AbstractionLayers/Layer_Histogram/AbstractionLayer_Histogram_Properties.h"
class LayerContainer;
class Part
@ -47,6 +47,7 @@ public:
AbstractionLayer_PoempelPosition_Properties m_a3;
AbstractionLayer_SURFFeatures_Properties m_a4;
AbstractionLayer_ColorMatching_Properties m_acm;
AbstractionLayer_Histogram_Properties m_his;
private:
int32_t m_partID;
uint8_t m_numOfRotations;

3
Source/header/solve.h
View File

@ -9,6 +9,7 @@
#include "../functions/AbstractionLayers/Layer3_PoempelPosition/AbstractionLayer_PoempelPosition.h"
#include "../functions/AbstractionLayers/Layer_SURFFeatures/AbstractionLayer_SURFFeatures.h"
#include "../functions/AbstractionLayers/Layer_ColorMatching/AbstractionLayer_ColorMatching.h"
#include "../functions/AbstractionLayers/Layer_Histogram/AbstractionLayer_Histogram.h"
#include "../functions/AbstractionLayers/DestructionPower/DestructionPower.h"
using namespace std;
@ -56,6 +57,7 @@ public:
if(!a3.PreProcessing({cols,rows}, &p_myBox)) return false;
if(!a4.PreProcessing({cols,rows}, &p_myBox)) return false;
if(!acm.PreProcessing({cols,rows}, &p_myBox)) return false;
if(!his.PreProcessing({cols,rows}, &p_myBox)) return false;
return true;
}
@ -67,6 +69,7 @@ public:
AbstractionLayer_PoempelPosition a3;
AbstractionLayer_SURFFeatures a4;
AbstractionLayer_ColorMatching acm;
AbstractionLayer_Histogram his;
void removeConstrains(coor removeCoordinates);
void setConstraints(coor setConstraints, Part *constraintPiece);