VSAG/vision_sjtu_19
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix bug

Browse Source
This commit is contained in:
xinyang
2019-08-07 05:33:59 +08:00
parent 29121ae4dc
commit 0347182439
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
energy/src/energy/run.cpp
View File

@@ -79,11 +79,20 @@ void Energy::runBig(cv::Mat &gimbal_src) {
if (findArmors(gimbal_src) < 1)return; if (findArmors(gimbal_src) < 1)return;
if (show_energy)showArmors("armor", gimbal_src); if (show_energy)showArmors("armor", gimbal_src);
if (!findFlowStripFan(gimbal_src)) { if (!findFlowStripFan(gimbal_src)) {
if (!findFlowStripWeak(gimbal_src))return; if (!findFlowStripWeak(gimbal_src)){
is_find_target = false;
return;
}
} else { } else {
if (show_energy)showFlowStripFan("strip fan", gimbal_src); if (show_energy)showFlowStripFan("strip fan", gimbal_src);
if (!findTargetInFlowStripFan()) return; if (!findTargetInFlowStripFan()) {
if (!findFlowStrip(gimbal_src))return; is_find_target = false;
return;
}
if (!findFlowStrip(gimbal_src)){
is_find_target = false;
return;
}
} }
is_find_target = true; is_find_target = true;
if (!findCenterROI(gimbal_src))return; if (!findCenterROI(gimbal_src))return;

4
main.cpp
View File

@@ -123,8 +123,8 @@ int main(int argc, char *argv[]) {
if (!from_camera) extract(gimbal_src, chassis_src); if (!from_camera) extract(gimbal_src, chassis_src);
if (save_video) saveVideos(gimbal_src, chassis_src);//保存视频 if (save_video) saveVideos(gimbal_src, chassis_src);//保存视频
if (show_origin) showOrigin(gimbal_src, chassis_src);//显示原始图像 if (show_origin) showOrigin(gimbal_src, chassis_src);//显示原始图像
// energy.runBig(gimbal_src, chassis_src); energy.runBig(gimbal_src, chassis_src);
energy.runBig(gimbal_src); // energy.runBig(gimbal_src);
} else if (curr_state == SMALL_ENERGY_STATE) { } else if (curr_state == SMALL_ENERGY_STATE) {
if (last_state != SMALL_ENERGY_STATE) { if (last_state != SMALL_ENERGY_STATE) {
LOGM(STR_CTR(WORD_GREEN, "Start Small Energy!")); LOGM(STR_CTR(WORD_GREEN, "Start Small Energy!"));