Included the Layer_SURFFeature in code

This commit is contained in:
Maximilian Papa
2018-01-25 22:14:00 +01:00
parent ec4a5da05c
commit b4641fe65b
10 changed files with 82 additions and 3 deletions

View File

@ -5,10 +5,11 @@
#pragma once
#include <cstdint>
#include "../functions/AbstractionLayers/Layer1/AbstractionLayer_1_Properties.h"
#include "../functions/AbstractionLayers/DestructionPower/DestructionPower_Properties.h"
#include "../functions/AbstractionLayers/Layer3_PoempelPosition/AbstractionLayer_PoempelPosition_Properties.h"
#include "../functions/AbstractionLayers/Layer_SURFFeatures/AbstractionLayer_SURFFeatures_Properties.h"
class LayerContainer;
class Part
@ -43,6 +44,7 @@ public:
bool set;
AbstractionLayer_1_Properties m_a1;
AbstractionLayer_PoempelPosition_Properties m_a3;
AbstractionLayer_SURFFeatures_Properties m_a4;
private:
int32_t m_partID;
uint8_t m_numOfRotations;

View File

@ -1,4 +1,5 @@
#pragma once
#include <vector>
#include <iostream>
#include <opencv2/highgui/highgui.hpp>
@ -6,6 +7,7 @@
#include "../functions/AbstractionLayers/Layer1/AbstractionLayer_1.h"
#include "../functions/AbstractionLayers/Layer3_PoempelPosition/AbstractionLayer_PoempelPosition.h"
#include "../functions/AbstractionLayers/Layer_SURFFeatures/AbstractionLayer_SURFFeatures.h"
#include "../functions/AbstractionLayers/DestructionPower/DestructionPower.h"
using namespace std;
@ -45,6 +47,7 @@ public:
if(!dp.PreProcessing({cols,rows}, nullptr)) return false;
if(!a1.PreProcessing({cols,rows}, &p_myBox)) return false;
if(!a3.PreProcessing({cols,rows}, &p_myBox)) return false;
if(!a4.PreProcessing({cols,rows}, &p_myBox)) return false;
return true;
}
@ -54,6 +57,7 @@ public:
DestructionPower dp;
AbstractionLayer_1 a1;
AbstractionLayer_PoempelPosition a3;
AbstractionLayer_SURFFeatures a4;
void removeConstrains(coor removeCoordinates);
void setConstraints(coor setConstraints, Part *constraintPiece);