Merge remote-tracking branch 'origin/anti-top' into anti-top

This commit is contained in:
sun
2019-07-17 23:58:24 +08:00
2 changed files with 2 additions and 2 deletions

View File

@@ -72,6 +72,6 @@ bool ArmorFinder::stateTrackingTarget(cv::Mat &src) {
// //
// } // }
sendBoxPosition(); // sendBoxPosition();
return true; return true;
} }

View File

@@ -94,7 +94,7 @@ void showArmorBox(std::string windows_name, const cv::Mat &src, const ArmorBox &
// static FILE *fp = fopen(PROJECT_DIR"/ratio.txt", "w"); // static FILE *fp = fopen(PROJECT_DIR"/ratio.txt", "w");
// if(box.light_blobs.size() == 2) // if(box.light_blobs.size() == 2)
// fprintf(fp, "%lf %lf %lf\n", box.light_blobs[0].length, box.light_blobs[1].length, box.blobsDistance()) // fprintf(fp, "%lf %lf %lf\n", box.light_blobs[0].length, box.light_blobs[1].length, box.blobsDistance())
cout << box.rect.width/box.rect.height << endl; // cout << box.rect.width/box.rect.height << endl;
if(box.rect.width/box.rect.height > 1.6){ if(box.rect.width/box.rect.height > 1.6){
rectangle(image2show, box.rect, Scalar(0, 255, 0), 3); rectangle(image2show, box.rect, Scalar(0, 255, 0), 3);
}else{ }else{