diff --git a/CMakeLists.txt b/CMakeLists.txt index 98a157c..c364979 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,8 +61,8 @@ ENABLE_TESTING() # opencv + TensorRT IF(WIN32) - set(OpenCV_DIR "D:/opencv/build/x64/vc15/lib") - #set(TRT_DIR "D:/TensorRT/TensorRT7") + set(OpenCV_DIR "D:/Opencv_v/4.8.1/build/install/x64/vc17/lib") + set(TRT_DIR "D:/TensorRT/TensorRT7") ELSE(WIN32) set(OpenCV_DIR "/home/wcw/opencv-3.4.16/install/share/OpenCV") ENDIF(WIN32) @@ -145,7 +145,7 @@ add_subdirectory(${ArithDIR}) IF(BUILD_ARITH_STUDIO) # ########################## Qt环境 ############################## IF(WIN32) - set(CMAKE_PREFIX_PATH "D:/project/Qt/Qt/5.15.2/msvc2015_64") + set(CMAKE_PREFIX_PATH "D:/Qt/5.15.2/msvc2019_64") ELSE(WIN32) set(CMAKE_PREFIX_PATH "/home/wang/Qt/5.15.2/gcc_64") ENDIF(WIN32) @@ -192,7 +192,7 @@ IF(BUILD_ARITH_STUDIO) set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/Bin) # 关闭控制台 - set_target_properties(QGuideArith PROPERTIES WIN32_EXECUTABLE FALSE) + set_target_properties(QGuideArith PROPERTIES WIN32_EXECUTABLE TRUE) # 链接模块 target_link_libraries(QGuideArith PRIVATE diff --git a/NeoTracker/src/Log/Logger.cpp b/NeoTracker/src/Log/Logger.cpp index 2cbf134..3213839 100644 --- a/NeoTracker/src/Log/Logger.cpp +++ b/NeoTracker/src/Log/Logger.cpp @@ -112,20 +112,22 @@ void XLogger::setLevel(LogType type, int lev) void XLogger::setLevel(int lev) { auto level = static_cast(lev); - - m_logger->set_level(level); - m_logger->flush_on(level); + if (level != getLevel()) + { + m_logger->set_level(level); + m_logger->flush_on(level); - m_logger_in->set_level(level); - m_logger_in->flush_on(level); - - m_logger_out->set_level(level); - m_logger_out->flush_on(level); + m_logger_in->set_level(level); + m_logger_in->flush_on(level); - m_logger_Timer->set_level(level); - m_logger_Timer->flush_on(level); + m_logger_out->set_level(level); + m_logger_out->flush_on(level); - printf("set logger level:%d\n",lev); + m_logger_Timer->set_level(level); + m_logger_Timer->flush_on(level); + + printf("set logger level:%d\n", lev); + } } diff --git a/NeoTracker/src/PIPE/Arith_PIPE_utils.cpp b/NeoTracker/src/PIPE/Arith_PIPE_utils.cpp index c80718d..21ed1a2 100644 --- a/NeoTracker/src/PIPE/Arith_PIPE_utils.cpp +++ b/NeoTracker/src/PIPE/Arith_PIPE_utils.cpp @@ -75,7 +75,10 @@ BBOOL PIPE_SearchFrameObjList(ANGLE32F* pCurrentAngle, SINT32 nPipeRadius, { fObjSizeLimit = TRUE; } - + else + { + fObjSizeLimit = FALSE; + } //转为像素距离 FLOAT32 nDistance = dDistance / AglReso; @@ -237,7 +240,10 @@ BBOOL PIPE_SearchFrameObjList_IOU(ANGLE32F* pCurrentAngle, SINT32 nPipeRadius, { fObjSizeLimit = TRUE; } - + else + { + fObjSizeLimit = FALSE; + } //转为像素距离