使用命令行参数

This commit is contained in:
xinyang
2019-04-14 17:47:04 +08:00
parent d4d4e0157e
commit 42f6120271
2 changed files with 9 additions and 6 deletions

View File

@@ -9,7 +9,6 @@
#include <opencv2/core.hpp> #include <opencv2/core.hpp>
#include <thread> #include <thread>
std::thread* create_data_recv_thread(Uart *uart);
void save_video_file(cv::Mat &src); void save_video_file(cv::Mat &src);
void save_labelled_image(cv::Mat &src, cv::Rect2d box); void save_labelled_image(cv::Mat &src, cv::Rect2d box);

View File

@@ -15,8 +15,9 @@
#include "camera/video_wrapper.h" #include "camera/video_wrapper.h"
#include "camera/wrapper_head.h" #include "camera/wrapper_head.h"
#include "armor_finder/armor_finder.h" #include "armor_finder/armor_finder.h"
#include <options/options.h>
#include <log.h> #include <log.h>
#include <time.h> #include <time.h>
#include <thread> #include <thread>
@@ -31,8 +32,9 @@ float yaw, pitch;
void uartReceive(Uart* uart); void uartReceive(Uart* uart);
int main() int main(int argc, char *argv[])
{ {
process_options(argc, argv);
Uart uart; Uart uart;
bool flag = true; bool flag = true;
short done = 0;//用于检测是否已经读完初始激光中心时的角度 short done = 0;//用于检测是否已经读完初始激光中心时的角度
@@ -43,8 +45,10 @@ int main()
int energy_part_rotation = CLOCKWISE; int energy_part_rotation = CLOCKWISE;
int from_camera = 1; int from_camera = 1;
if(!run_with_camera) {
cout << "Input 1 for camera, 0 for video files" << endl; cout << "Input 1 for camera, 0 for video files" << endl;
cin >> from_camera; cin >> from_camera;
}
WrapperHead *video; WrapperHead *video;
if(from_camera) if(from_camera)
@@ -86,7 +90,7 @@ int main()
armorFinder.run(src_none); armorFinder.run(src_none);
} }
if (waitKey(10) == 'q') { if (waitKey(1) == 'q') {
flag = false; flag = false;
break; break;
} }