Skip to content
Snippets Groups Projects
Commit c8a4d7b7 authored by Nicolas Pope's avatar Nicolas Pope
Browse files

Implemented #1

parent ea86f98c
Branches
Tags
No related merge requests found
Pipeline #10497 passed
...@@ -129,20 +129,36 @@ static bool mergeConfig(const string &path) { ...@@ -129,20 +129,36 @@ static bool mergeConfig(const string &path) {
*/ */
static bool findConfiguration(const string &file, const vector<string> &paths, static bool findConfiguration(const string &file, const vector<string> &paths,
const std::string &app) { const std::string &app) {
bool f = false;
bool found = false; bool found = false;
found |= mergeConfig(FTL_GLOBAL_CONFIG_ROOT "/config.json"); f = mergeConfig(FTL_GLOBAL_CONFIG_ROOT "/config.json");
found |= mergeConfig(FTL_LOCAL_CONFIG_ROOT "/config.json"); found |= f;
found |= mergeConfig("./config.json"); if (f) LOG(INFO) << "Loaded config: " << FTL_GLOBAL_CONFIG_ROOT "/config.json";
f = mergeConfig(FTL_LOCAL_CONFIG_ROOT "/config.json");
found |= f;
if (f) LOG(INFO) << "Loaded config: " << FTL_LOCAL_CONFIG_ROOT "/config.json";
f = mergeConfig("./config.json");
found |= f;
if (f) LOG(INFO) << "Loaded config: " << "./config.json";
for (auto p : paths) { for (auto p : paths) {
if (is_directory(p)) { if (is_directory(p)) {
found |= mergeConfig(p+"/config.json"); f = mergeConfig(p+"/config.json");
found |= f;
if (f) LOG(INFO) << "Loaded config: " << p << "/config.json";
} }
} }
if (file != "") { if (file != "") {
found |= mergeConfig(file); f = mergeConfig(file);
found |= f;
if (!f) {
LOG(ERROR) << "Specific config file (" << file << ") was not found";
} else {
LOG(INFO) << "Loaded config: " << file;
}
} }
if (found) { if (found) {
......
...@@ -144,9 +144,7 @@ static void run(const string &file) { ...@@ -144,9 +144,7 @@ static void run(const string &file) {
//sync->get(ftl::LEFT, l); //sync->get(ftl::LEFT, l);
//sync->get(ftl::RIGHT, r); //sync->get(ftl::RIGHT, r);
LOG(INFO) << "PRE DISPARITY";
disparity->compute(l, r, disp); disparity->compute(l, r, disp);
LOG(INFO) << "POST DISPARITY";
unique_lock<mutex> lk(m); unique_lock<mutex> lk(m);
jobs++; jobs++;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment