diff --git a/energy/src/energy/clear/energy_init.cpp b/energy/src/energy/clear/energy_init.cpp index 93af8cf..728014b 100644 --- a/energy/src/energy/clear/energy_init.cpp +++ b/energy/src/energy/clear/energy_init.cpp @@ -69,8 +69,8 @@ void Energy::initEnergy() { // 此函数对能量机关参数进行初始化 // --------------------------------------------------------------------------------------------------------------------- void Energy::initEnergyPartParam() { -// gimbal_energy_part_param_.GRAY_THRESH = 120;//home - gimbal_energy_part_param_.GRAY_THRESH = 200;//official + gimbal_energy_part_param_.GRAY_THRESH = 120;//home +// gimbal_energy_part_param_.GRAY_THRESH = 200;//official // gimbal_energy_part_param_.GRAY_THRESH = 225; gimbal_energy_part_param_.SPLIT_GRAY_THRESH = 230; gimbal_energy_part_param_.FAN_GRAY_THRESH = 75; @@ -141,9 +141,9 @@ void Energy::initEnergyPartParam() { gimbal_energy_part_param_.TARGET_INTERSETION_CONTOUR_AREA_MIN = 40; - -// chassis_energy_part_param_.GRAY_THRESH = 120;//home - chassis_energy_part_param_.GRAY_THRESH = 200;//official + chassis_energy_part_param_.GRAY_THRESH = 120;//home_small + chassis_energy_part_param_.GRAY_THRESH = 230;//home_big +// chassis_energy_part_param_.GRAY_THRESH = 200;//official // chassis_energy_part_param_.GRAY_THRESH = 225; chassis_energy_part_param_.SPLIT_GRAY_THRESH = 230; chassis_energy_part_param_.FAN_GRAY_THRESH = 75; @@ -204,7 +204,7 @@ void Energy::initEnergyPartParam() { chassis_energy_part_param_.FLOW_STRIP_CONTOUR_LENGTH_MIN = 55; chassis_energy_part_param_.FLOW_STRIP_CONTOUR_LENGTH_MAX = 95; chassis_energy_part_param_.FLOW_STRIP_CONTOUR_WIDTH_MIN = 8; - chassis_energy_part_param_.FLOW_STRIP_CONTOUR_WIDTH_MAX = 20; + chassis_energy_part_param_.FLOW_STRIP_CONTOUR_WIDTH_MAX = 25; chassis_energy_part_param_.FLOW_STRIP_CONTOUR_HW_RATIO_MAX = 12; // chassis_energy_part_param_.FLOW_STRIP_CONTOUR_HW_RATIO_MIN = 4; chassis_energy_part_param_.FLOW_STRIP_CONTOUR_HW_RATIO_MIN = 2.7; diff --git a/energy/src/energy/find/energy_finder.cpp b/energy/src/energy/find/energy_finder.cpp index 207cd64..faa542d 100644 --- a/energy/src/energy/find/energy_finder.cpp +++ b/energy/src/energy/find/energy_finder.cpp @@ -234,6 +234,7 @@ bool Energy::findFlowStrip(const cv::Mat src) { // } return true; } +// waitKey(); cout << "flow strip false!" << endl; return false; diff --git a/energy/src/energy/run.cpp b/energy/src/energy/run.cpp index 17d2a87..70ee6b4 100644 --- a/energy/src/energy/run.cpp +++ b/energy/src/energy/run.cpp @@ -17,7 +17,7 @@ void Energy::run(cv::Mat &gimbal_src, cv::Mat &chassis_src) { run(gimbal_src);//仅拥有云台摄像头则调用单摄像头的run函数 else if (is_gimbal) { // energy_part_param_ = chassis_energy_part_param_; - energy_part_param_ = chassis_energy_part_param_; + energy_part_param_ = gimbal_energy_part_param_; clearAll(); initImage(gimbal_src); findFans(gimbal_src); diff --git a/main.cpp b/main.cpp index 07853a4..a83077c 100644 --- a/main.cpp +++ b/main.cpp @@ -66,8 +66,8 @@ int main(int argc, char *argv[]) { } else { // video_gimbal = new VideoWrapper("/home/sjturm/Desktop/videos/147.avi"); // video_chassis = new VideoWrapper("/home/sjturm/Desktop/videos/147.avi"); - video_gimbal = new VideoWrapper("/home/sjturm/Desktop/RM2019 能量机关视频/大能量机关(蓝+开灯).mov"); - video_chassis = new VideoWrapper("/home/sjturm/Desktop/RM2019 能量机关视频/大能量机关(蓝+开灯).mov"); + video_gimbal = new VideoWrapper("/home/sjturm/Desktop/dafu/gimble3.avi"); + video_chassis = new VideoWrapper("/home/sjturm/Desktop/dafu/chassis3.avi"); } if (video_gimbal->init()) { LOGM("video_gimbal source initialization successfully.");