From 07d0922180807ff10b87f4c326e9b40e99197bbc Mon Sep 17 00:00:00 2001 From: xinyang Date: Sun, 14 Apr 2019 23:17:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86log.h=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/log.h | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/include/log.h b/include/log.h index 313c873..6990cbb 100644 --- a/include/log.h +++ b/include/log.h @@ -6,7 +6,6 @@ #define _LOG_H_ #include -#include #include /************** Define the control code *************/ @@ -57,8 +56,9 @@ /*************** Define the log level value ***************/ #define LOG_NONE 0 #define LOG_ERROR 1 -#define LOG_WARRING 2 +#define LOG_WARNING 2 #define LOG_MSG 3 +#define LOG_NOTHING 4 /************** Ensure the current log level **************/ #ifndef LOG_LEVEL #define LOG_LEVEL LOG_MSG @@ -72,8 +72,8 @@ #ifndef LOG_ERROR_COLOR #define LOG_ERROR_COLOR WORD_RED #endif -#ifndef LOG_WARRING_COLOR - #define LOG_WARRING_COLOR WORD_YELLOW +#ifndef LOG_WARNING_COLOR + #define LOG_WARNING_COLOR WORD_YELLOW #endif #ifndef LOG_MSG_COLOR #define LOG_MSG_COLOR WORD_GRAY @@ -88,7 +88,7 @@ #else #define LOG_1(format, ...) ((void)0) #endif -#if LOG_LEVEL >= LOG_WARRING +#if LOG_LEVEL >= LOG_WARNING #define LOG_2(format, ...) printf(format, ##__VA_ARGS__) #else #define LOG_2(format, ...) ((void)0) @@ -98,6 +98,7 @@ #else #define LOG_3(format, ...) ((void)0) #endif +#define LOG_4(format, ...) ((void)0) #define LOG_(level, format, ...) LOG_##level (format, ##__VA_ARGS__) #define LOG(level, format, ...) LOG_(level, format"\n", ##__VA_ARGS__) #define STR_CTR(ctrs, str) START_CTR ctrs END_CTR str CLEAR_ALL @@ -105,17 +106,17 @@ #define LOGA(format, ...) LOG(LOG_NONE, format, ##__VA_ARGS__) #define LOGA_INFO(format, ...) LOG(LOG_NONE, "<%s:%d>: " format, ##__VA_ARGS__) #define LOGE(format, ...) LOG(LOG_ERROR, STR_CTR(LOG_ERROR_COLOR, ": " format), ## __VA_ARGS__) -#define LOGW(format, ...) LOG(LOG_WARRING, STR_CTR(LOG_WARRING_COLOR,": " format), ## __VA_ARGS__) +#define LOGW(format, ...) LOG(LOG_WARNING, STR_CTR(LOG_WARNING_COLOR,": " format), ## __VA_ARGS__) #define LOGM(format, ...) LOG(LOG_MSG, STR_CTR(LOG_MSG_COLOR, ": " format), ## __VA_ARGS__) #define LOGE_INFO(format, ...) LOG(LOG_ERROR, \ STR_CTR(LOG_ERROR_COLOR, "<") \ STR_CTR(LOG_LINK_COLOR, "%s:%d") \ STR_CTR(LOG_ERROR_COLOR, " ERROR>: " format), \ __FILE__, __LINE__, ##__VA_ARGS__) -#define LOGW_INFO(format, ...) LOG(LOG_WARRING, \ - STR_CTR(LOG_WARRING_COLOR,"<") \ +#define LOGW_INFO(format, ...) LOG(LOG_WARNING, \ + STR_CTR(LOG_WARNING_COLOR,"<") \ STR_CTR(LOG_LINK_COLOR,"%s:%d") \ - STR_CTR(LOG_WARRING_COLOR, " WARRING>: " format), \ + STR_CTR(LOG_WARNING_COLOR, " WARNING>: " format), \ __FILE__, __LINE__, ##__VA_ARGS__) #define LOGM_INFO(format, ...) LOG(LOG_MSG, \ STR_CTR(LOG_MSG_COLOR, "<") \ From bdcd537b0b0ec05057e27be5e29ec0aa77ac9d8d Mon Sep 17 00:00:00 2001 From: xinyang Date: Mon, 15 Apr 2019 12:57:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86tracker=E6=9C=89?= =?UTF-8?q?=E6=97=B6=E4=B8=8D=E7=94=9F=E6=95=88=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- armor/src/armor_finder/armor_finder.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/armor/src/armor_finder/armor_finder.cpp b/armor/src/armor_finder/armor_finder.cpp index 6fd2cd2..839b91e 100644 --- a/armor/src/armor_finder/armor_finder.cpp +++ b/armor/src/armor_finder/armor_finder.cpp @@ -35,6 +35,10 @@ void ArmorFinder::run(cv::Mat &src) { cv::Mat roi = src_use.clone()(armor_box); cv::threshold(roi, roi, 200, 255, cv::THRESH_BINARY); contour_area = cv::countNonZero(roi); + auto para = TrackerToUse::Params(); + para.desc_npca = 1; + para.desc_pca = 0; + tracker = TrackerToUse::create(para); tracker->init(src_use, armor_box); state = TRACKING_STATE; LOGW("into track"); From f891f1da34fd5a65abee49ba1c40057b328ce90c Mon Sep 17 00:00:00 2001 From: xinyang Date: Mon, 15 Apr 2019 13:04:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=86log.h=E9=87=8D?= =?UTF-8?q?=E5=A4=8D=E5=8C=85=E5=90=AB=E6=97=B6=E7=9A=84=E8=AD=A6=E5=91=8A?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/log.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/log.h b/include/log.h index 6990cbb..ed7fd62 100644 --- a/include/log.h +++ b/include/log.h @@ -136,4 +136,6 @@ #else #define CNT_TIME(str_ctrs, tag, codes, ...) codes #endif +#else /* _LOG_H_ */ + #warning "Multiple include of log.h, some settings may not work." #endif /* _LOG_H_ */