Opencv 3.1 project on GR-PEACH board
Fork of gr-peach-opencv-project by
Diff: main.cpp
- Revision:
- 168:3efe7c3d1dd7
- Parent:
- 166:3a9487d57a5c
- Child:
- 169:bdaa9537e072
diff -r 1657b442184c -r 3efe7c3d1dd7 main.cpp --- a/main.cpp Thu Jun 29 11:01:39 2017 +0000 +++ b/main.cpp Fri Jun 30 11:14:05 2017 +0000 @@ -1131,7 +1131,7 @@ break; } mMutexClicked.lock(); - clickedCode = CLICKED_REGIS_FACE; + clickedCode = CLICKED_UNKNOWN; mMutexClicked.unlock(); int _x = faces[i].x*IMG_DOWN_SAMPLE; @@ -1300,7 +1300,8 @@ gObjectDetects.push_back(tmp); } } - else{ + else + { for(int i = 0;i < faces.size();i++) { obj_detect_result tmp; @@ -1312,7 +1313,7 @@ gIsDrawing = true; p_DrawObjects->signal_set(1); - } + }//clickedCode != CLICKED_REGIS_FACE } //faces.size() > 0 else { @@ -1760,40 +1761,7 @@ p_DrawObjects->start(img_draw_objects); initDrawAction32(); - - //graphicFrameworkCanvas myCanvas(user_buf_draw_action_888, 0x01E0, -// 0x0110, 0x04, -// (uint8_t)DRAW_POINT,0x06); -// uint8_t mycolor[4] = {0x00,0xFF,0x00,0xFF}; -// int x = 20, y = 20; -// while(1) -// { -// memset(user_buf_draw_action_888,0,sizeof(user_buf_draw_action_888)); -// /* Clean cache */ -// dcache_clean(user_buf_draw_action_888, -// sizeof(user_buf_draw_action_888)); -// wait(0.5); -// -// memset(user_buf_draw_action_888,0,sizeof(user_buf_draw_action_888)); -// myCanvas.drawImage(my_test_img_rgb888,x,y); -// -// x += 20; -// y += 20; -// if( x > 60) -// { -// x = 20; -// y = 20; -// } -// /* Clean cache */ -// dcache_clean(user_buf_draw_action_888, -// sizeof(user_buf_draw_action_888)); -// togle_led(LED_BLUE); -// while(1) -// { -// wait(0.5); -// } -// } - + while(1) { switch(appMode)