From 3239a3edddbcbd39d537e46225d66683f1c1dd54 Mon Sep 17 00:00:00 2001 From: Git Merciol Date: Mon, 19 Feb 2018 17:28:52 +0100 Subject: [PATCH] =?UTF-8?q?=09modifi=C3=A9=C2=A0:=20=20=20=20=20=20=20=20?= =?UTF-8?q?=20include/Attributes/AverageAttributes.hpp=20=09modifi=C3=A9?= =?UTF-8?q?=C2=A0:=20=20=20=20=20=20=20=20=20include/Attributes/SDAttribut?= =?UTF-8?q?es.hpp=20=09modifi=C3=A9=C2=A0:=20=20=20=20=20=20=20=20=20inclu?= =?UTF-8?q?de/Attributes/XYAttributes.hpp=20=09modifi=C3=A9=C2=A0:=20=20?= =?UTF-8?q?=20=20=20=20=20=20=20src/testMain.cpp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/Attributes/AverageAttributes.hpp | 2 ++ include/Attributes/SDAttributes.hpp | 1 + include/Attributes/XYAttributes.hpp | 1 + src/testMain.cpp | 4 +++- 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/include/Attributes/AverageAttributes.hpp b/include/Attributes/AverageAttributes.hpp index 1049bf4..07d2b9f 100644 --- a/include/Attributes/AverageAttributes.hpp +++ b/include/Attributes/AverageAttributes.hpp @@ -3,6 +3,8 @@ #include "triskeleBase.hpp" #include "CompAttribute.hpp" +#include "Attributes/AreaAttributes.hpp" +#include "Attributes/XYAttributes.hpp" namespace otb { namespace triskele { diff --git a/include/Attributes/SDAttributes.hpp b/include/Attributes/SDAttributes.hpp index c2857d1..a145643 100644 --- a/include/Attributes/SDAttributes.hpp +++ b/include/Attributes/SDAttributes.hpp @@ -3,6 +3,7 @@ #include "triskeleBase.hpp" #include "CompAttribute.hpp" +#include "Attributes/AreaAttributes.hpp" namespace otb { namespace triskele { diff --git a/include/Attributes/XYAttributes.hpp b/include/Attributes/XYAttributes.hpp index 7c39b7e..98457e5 100644 --- a/include/Attributes/XYAttributes.hpp +++ b/include/Attributes/XYAttributes.hpp @@ -3,6 +3,7 @@ #include "triskeleBase.hpp" #include "CompAttribute.hpp" +#include "Attributes/AreaAttributes.hpp" namespace otb { namespace triskele { diff --git a/src/testMain.cpp b/src/testMain.cpp index b3ea0bc..952d4b4 100644 --- a/src/testMain.cpp +++ b/src/testMain.cpp @@ -24,6 +24,7 @@ #include "Attributes/AverageAttributes.hpp" #include "Attributes/SDAttributes.hpp" #include "Attributes/XYAttributes.hpp" +#include "Attributes/MoIAttributes.hpp" //using namespace triskele; using namespace otb::triskele; @@ -55,7 +56,8 @@ void prog (const Option &option) { sdAttributes.printValues ("sd"); XYAttributes xyAttributes (tree, areaAttributes, option.treeCoreCount); //xyAttributes.printValues ("XY"); // pb print de complexe - // MoIAttributes moiAttributes (tree, xyAttributes); // XXX + MoIAttributes moiAttributes (tree, areaAttributes, xyAttributes, option.treeCoreCount); + moiAttributes.printValues ("moi"); // XXX cut // attribute.cut (out, attributProfiles, threshold)