提交 87677794 authored 作者: blu's avatar blu

big refacting of communitation architect

上级 e408c2e5
...@@ -151,31 +151,36 @@ private: ...@@ -151,31 +151,36 @@ private:
// detection params // detection params
if(evmlmotion.count("thresh") == 0||evmlmotion["thresh"] < 10 ||evmlmotion["thresh"] >= 255) { if(evmlmotion.count("thresh") == 0||evmlmotion["thresh"] < 10 ||evmlmotion["thresh"] >= 255) {
spdlog::info("evmlmotion {} invalid thresh value. should be in (10,255), default to {}", selfId, detPara.thre); spdlog::info("evmlmotion {} invalid thresh value. should be in (10,255), default to {}", selfId, detPara.thre);
}else{ }
else {
detPara.thre = evmlmotion["thresh"]; detPara.thre = evmlmotion["thresh"];
} }
if(evmlmotion.count("area") == 0||evmlmotion["area"] < 10 ||evmlmotion["area"] >= int(FRAME_SIZE*FRAME_SIZE)*9/10) { if(evmlmotion.count("area") == 0||evmlmotion["area"] < 10 ||evmlmotion["area"] >= int(FRAME_SIZE*FRAME_SIZE)*9/10) {
spdlog::info("evmlmotion {} invalid area value. should be in (10, 500*500*/10), default to {}", selfId, detPara.area); spdlog::info("evmlmotion {} invalid area value. should be in (10, 500*500*/10), default to {}", selfId, detPara.area);
}else{ }
else {
detPara.area = evmlmotion["area"]; detPara.area = evmlmotion["area"];
} }
if(evmlmotion.count("pre") == 0||evmlmotion["pre"] < 1 ||evmlmotion["pre"] >= 120) { if(evmlmotion.count("pre") == 0||evmlmotion["pre"] < 1 ||evmlmotion["pre"] >= 120) {
spdlog::info("evmlmotion {} invalid pre value. should be in (1, 120), default to {}", selfId, detPara.pre); spdlog::info("evmlmotion {} invalid pre value. should be in (1, 120), default to {}", selfId, detPara.pre);
}else{ }
else {
detPara.pre = evmlmotion["pre"]; detPara.pre = evmlmotion["pre"];
} }
if(evmlmotion.count("post") == 0||evmlmotion["post"] < 6 ||evmlmotion["post"] >= 120) { if(evmlmotion.count("post") == 0||evmlmotion["post"] < 6 ||evmlmotion["post"] >= 120) {
spdlog::info("evmlmotion {} invalid post value. should be in (6, 120), default to {}", selfId, detPara.post); spdlog::info("evmlmotion {} invalid post value. should be in (6, 120), default to {}", selfId, detPara.post);
}else{ }
else {
detPara.post = evmlmotion["post"]; detPara.post = evmlmotion["post"];
} }
if(evmlmotion.count("entropy") == 0||evmlmotion["entropy"] < 0 || evmlmotion["entropy"] >= 10) { if(evmlmotion.count("entropy") == 0||evmlmotion["entropy"] < 0 || evmlmotion["entropy"] >= 10) {
spdlog::info("evmlmotion {} invalid entropy value. should be in (0, 10), default to {}", selfId, detPara.entropy); spdlog::info("evmlmotion {} invalid entropy value. should be in (0, 10), default to {}", selfId, detPara.entropy);
}else{ }
else {
detPara.entropy = evmlmotion["entropy"]; detPara.entropy = evmlmotion["entropy"];
} }
...@@ -426,7 +431,7 @@ private: ...@@ -426,7 +431,7 @@ private:
avg = gray.clone(); avg = gray.clone();
if(!detect || fent < detPara.entropy){ if(!detect || fent < detPara.entropy) {
return; return;
} }
...@@ -572,7 +577,8 @@ protected: ...@@ -572,7 +577,8 @@ protected:
if(ret < 0) { if(ret < 0) {
spdlog::error("evmlmotion {} failed to send event {} to {}: {}", this->selfId, evt, this->slicerGid, zmq_strerror(zmq_errno())); spdlog::error("evmlmotion {} failed to send event {} to {}: {}", this->selfId, evt, this->slicerGid, zmq_strerror(zmq_errno()));
}else { }
else {
spdlog::info("evmlmotion {} send event: {}", this->selfId, evt); spdlog::info("evmlmotion {} send event: {}", this->selfId, evt);
} }
} }
...@@ -659,7 +665,8 @@ public: ...@@ -659,7 +665,8 @@ public:
} }
devSn = v[0]; devSn = v[0];
iid = stoi(v[2]); iid = stoi(v[2]);
}else{ }
else {
spdlog::error("evmlmotion failed to start. no SN set"); spdlog::error("evmlmotion failed to start. no SN set");
exit(1); exit(1);
} }
...@@ -674,7 +681,7 @@ public: ...@@ -674,7 +681,7 @@ public:
ret = zmqhelper::recvConfigMsg(pDaemon, config, addr, selfId); ret = zmqhelper::recvConfigMsg(pDaemon, config, addr, selfId);
if(ret != 0) { if(ret != 0) {
spdlog::error("evmlmotion {} failed to receive configration message {}", devSn , addr); spdlog::error("evmlmotion {} failed to receive configration message {}", devSn, addr);
} }
init(); init();
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论