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-05-10 20:46:33 +08:00
parent 6225abf161
commit bfde0d80ad
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
main.cpp
View File

@@ -30,14 +30,14 @@ int state = ARMOR_STATE;
float curr_yaw = 0, curr_pitch = 0;
float mark_yaw = 0, mark_pitch = 0;
int mark = 0;
bool use_classifier = false;
bool use_classifier = true;
void uartReceive(Uart *uart);
int main(int argc, char *argv[]) {
process_options(argc, argv);
Uart uart;
thread receive(uartReceive, &uart);
// thread receive(uartReceive, &uart);
bool flag = true;
while (flag) {
@@ -53,13 +53,13 @@ int main(int argc, char *argv[]) {
WrapperHead *video_armor;
WrapperHead *video_energy;
if (from_camera) {
video_armor = new CameraWrapper(0, "armor");
video_energy = new CameraWrapper(1, "energy");
video_armor = new CameraWrapper(0/*, "armor"*/);
// video_energy = new CameraWrapper(1, "energy");
} else {
video_armor = new VideoWrapper("/home/xinyang/Desktop/DataSets/video/blue_4.mp4");
video_energy = new VideoWrapper("/home/xinyang/Desktop/DataSets/video/blue_4.mp4");
}
if (video_armor->init() && video_energy->init()) {
if (video_armor->init()/* && video_energy->init()*/) {
cout << "Video source initialization successfully." << endl;
} else {
delete video_armor;
@@ -70,7 +70,7 @@ int main(int argc, char *argv[]) {
Mat energy_src, armor_src;
for(int i=0; i<10; i++){
video_armor->read(armor_src);
video_energy->read(armor_src);
// video_energy->read(armor_src);
}
ArmorFinder armorFinder(ENEMY_BLUE, uart, PROJECT_DIR"/tools/para/", use_classifier);
@@ -79,7 +79,7 @@ int main(int argc, char *argv[]) {
energy.setAllyColor(ally_color);
energy.setRotation(energy_part_rotation);
bool ok = video_armor->read(armor_src) && video_energy->read(armor_src);
bool ok = video_armor->read(armor_src)/* && video_energy->read(armor_src)*/;
while (ok) {
CNT_TIME(WORD_LIGHT_CYAN, "Total", {