From c8de799215eb8c4d0061fb90a856dbd930c19e20 Mon Sep 17 00:00:00 2001 From: Jamie Allen Date: Sun, 26 Feb 2012 17:33:59 +0100 Subject: [PATCH] added config file to the repo - this needs to go in /data/ folder --- config.refindx | 33 ++++++++++++++++++++++++++++++++ src/CamNoiseAnalysis.cpp | 2 +- src/ColorMultiAnalysis.cpp | 2 +- src/ColorSingleAnalysis.cpp | 2 +- src/DiffNoiseAnalysis.cpp | 2 +- src/IResponseAnalysis.cpp | 2 +- src/ShadowScapesAnalysis.cpp | 2 +- src/ShapeFromShadingAnalysis.cpp | 2 +- src/StrobeAnalysis.cpp | 2 +- 9 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 config.refindx diff --git a/config.refindx b/config.refindx new file mode 100644 index 0000000..e72b2af --- /dev/null +++ b/config.refindx @@ -0,0 +1,33 @@ + + + 1 + 640 + 480 + + + 30 + + + SWANSEA + + + + + + + + + + + + 25 + 22 + 23 + 24 + 25 + 20 + 25 + 35 + 20 + + \ No newline at end of file diff --git a/src/CamNoiseAnalysis.cpp b/src/CamNoiseAnalysis.cpp index 5dcdd6e..7bc2707 100755 --- a/src/CamNoiseAnalysis.cpp +++ b/src/CamNoiseAnalysis.cpp @@ -15,7 +15,7 @@ using Poco::Thread; void CamNoiseAnalysis::setup(int camWidth, int camHeight) { - NUM_RUN = RefractiveIndex::XML.getValue("config:analysis:NUM_RUN", NUMBER_RUNS); + NUM_RUN = RefractiveIndex::XML.getValue("config:analysis:NUM_RUN_CamNoiseAnalysis", NUMBER_RUNS); cout << "NUM_RUN CamNoiseAnalysis " << NUM_RUN << endl; //NUM_RUN = 5; diff --git a/src/ColorMultiAnalysis.cpp b/src/ColorMultiAnalysis.cpp index 04989c2..45bf943 100755 --- a/src/ColorMultiAnalysis.cpp +++ b/src/ColorMultiAnalysis.cpp @@ -14,7 +14,7 @@ using Poco::Thread; void ColorMultiAnalysis::setup(int camWidth, int camHeight) { - NUM_RUN = RefractiveIndex::XML.getValue("config:analysis:NUM_RUN", NUMBER_RUNS); + NUM_RUN = RefractiveIndex::XML.getValue("config:analysis:NUM_RUN_ColorMultiAnalysis", NUMBER_RUNS); cout << "NUM_RUN ColorMultiAnalysis " << NUM_RUN << endl; //NUM_RUN = 5; diff --git a/src/ColorSingleAnalysis.cpp b/src/ColorSingleAnalysis.cpp index d074f89..bc1696f 100755 --- a/src/ColorSingleAnalysis.cpp +++ b/src/ColorSingleAnalysis.cpp @@ -15,7 +15,7 @@ using Poco::Thread; void ColorSingleAnalysis::setup(int camWidth, int camHeight) { - NUM_RUN = RefractiveIndex::XML.getValue("config:analysis:NUM_RUN", NUMBER_RUNS); + NUM_RUN = RefractiveIndex::XML.getValue("config:analysis:NUM_RUN_ColorSingleAnalysis", NUMBER_RUNS); cout << "NUM_RUN ColorSingleAnalysis " << NUM_RUN << endl; //NUM_RUN = 5; diff --git a/src/DiffNoiseAnalysis.cpp b/src/DiffNoiseAnalysis.cpp index 5580246..b1cba7a 100755 --- a/src/DiffNoiseAnalysis.cpp +++ b/src/DiffNoiseAnalysis.cpp @@ -15,7 +15,7 @@ using Poco::Thread; void DiffNoiseAnalysis::setup(int camWidth, int camHeight) { - NUM_RUN = RefractiveIndex::XML.getValue("config:analysis:NUM_RUN", NUMBER_RUNS); + NUM_RUN = RefractiveIndex::XML.getValue("config:analysis:NUM_RUN_DiffNoiseAnalysis", NUMBER_RUNS); cout << "NUM_RUN DiffNoiseAnalysis " << NUM_RUN << endl; //NUM_RUN = 5; diff --git a/src/IResponseAnalysis.cpp b/src/IResponseAnalysis.cpp index af4ae5e..ab64c1a 100755 --- a/src/IResponseAnalysis.cpp +++ b/src/IResponseAnalysis.cpp @@ -15,7 +15,7 @@ using Poco::Thread; void IResponseAnalysis::setup(int camWidth, int camHeight) { - NUM_RUN = RefractiveIndex::XML.getValue("config:analysis:NUM_RUN", NUMBER_RUNS); + NUM_RUN = RefractiveIndex::XML.getValue("config:analysis:NUM_RUN_IResponseAnalysis", NUMBER_RUNS); cout << "NUM_RUN IResponseAnalysis " << NUM_RUN << endl; //NUM_RUN = 5; diff --git a/src/ShadowScapesAnalysis.cpp b/src/ShadowScapesAnalysis.cpp index 8f1bdf5..ff33893 100755 --- a/src/ShadowScapesAnalysis.cpp +++ b/src/ShadowScapesAnalysis.cpp @@ -19,7 +19,7 @@ using Poco::Thread; void ShadowScapesAnalysis::setup(int camWidth, int camHeight) { - NUM_RUN = RefractiveIndex::XML.getValue("config:analysis:NUM_RUN", NUMBER_RUNS); + NUM_RUN = RefractiveIndex::XML.getValue("config:analysis:NUM_RUN_ShadowScapesAnalysis", NUMBER_RUNS); cout << "NUM_RUN ShadowScapesAnalysis " << NUM_RUN << endl; //NUM_RUN = 5; diff --git a/src/ShapeFromShadingAnalysis.cpp b/src/ShapeFromShadingAnalysis.cpp index 0f14ea9..8db0bf4 100755 --- a/src/ShapeFromShadingAnalysis.cpp +++ b/src/ShapeFromShadingAnalysis.cpp @@ -16,7 +16,7 @@ using Poco::Thread; void ShapeFromShadingAnalysis::setup(int camWidth, int camHeight) { - NUM_RUN = RefractiveIndex::XML.getValue("config:analysis:NUM_RUN", NUMBER_RUNS); + NUM_RUN = RefractiveIndex::XML.getValue("config:analysis:NUM_RUN_ShapeFromShadingAnalysis", NUMBER_RUNS); cout << "NUM_RUN ShapeFromShadingAnalysis " << NUM_RUN << endl; // NUM_RUN = 5; diff --git a/src/StrobeAnalysis.cpp b/src/StrobeAnalysis.cpp index 7f7f2ea..cb0b004 100755 --- a/src/StrobeAnalysis.cpp +++ b/src/StrobeAnalysis.cpp @@ -15,7 +15,7 @@ using Poco::Thread; void StrobeAnalysis::setup(int camWidth, int camHeight) { - NUM_RUN = RefractiveIndex::XML.getValue("config:analysis:NUM_RUN", NUMBER_RUNS); + NUM_RUN = RefractiveIndex::XML.getValue("config:analysis:NUM_RUN_StrobeAnalysis", NUMBER_RUNS); cout << "NUM_RUN StrobeAnalysis " << NUM_RUN << endl; //NUM_RUN = 5;