同步基线Bug修复

main
11566hyc 5 months ago
parent a943686f67
commit 43af060034

@ -61,8 +61,8 @@ ENABLE_TESTING()
# opencv + TensorRT # opencv + TensorRT
IF(WIN32) IF(WIN32)
set(OpenCV_DIR "D:/opencv/build/x64/vc15/lib") set(OpenCV_DIR "D:/Opencv_v/4.8.1/build/install/x64/vc17/lib")
#set(TRT_DIR "D:/TensorRT/TensorRT7") set(TRT_DIR "D:/TensorRT/TensorRT7")
ELSE(WIN32) ELSE(WIN32)
set(OpenCV_DIR "/home/wcw/opencv-3.4.16/install/share/OpenCV") set(OpenCV_DIR "/home/wcw/opencv-3.4.16/install/share/OpenCV")
ENDIF(WIN32) ENDIF(WIN32)
@ -145,7 +145,7 @@ add_subdirectory(${ArithDIR})
IF(BUILD_ARITH_STUDIO) IF(BUILD_ARITH_STUDIO)
# ########################## Qt ############################## # ########################## Qt ##############################
IF(WIN32) 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) ELSE(WIN32)
set(CMAKE_PREFIX_PATH "/home/wang/Qt/5.15.2/gcc_64") set(CMAKE_PREFIX_PATH "/home/wang/Qt/5.15.2/gcc_64")
ENDIF(WIN32) ENDIF(WIN32)
@ -192,7 +192,7 @@ IF(BUILD_ARITH_STUDIO)
set(EXECUTABLE_OUTPUT_PATH ${CMAKE_SOURCE_DIR}/Bin) 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 target_link_libraries(QGuideArith PRIVATE

@ -112,7 +112,8 @@ void XLogger::setLevel(LogType type, int lev)
void XLogger::setLevel(int lev) void XLogger::setLevel(int lev)
{ {
auto level = static_cast<spdlog::level::level_enum>(lev); auto level = static_cast<spdlog::level::level_enum>(lev);
if (level != getLevel())
{
m_logger->set_level(level); m_logger->set_level(level);
m_logger->flush_on(level); m_logger->flush_on(level);
@ -126,6 +127,7 @@ void XLogger::setLevel(int lev)
m_logger_Timer->flush_on(level); m_logger_Timer->flush_on(level);
printf("set logger level:%d\n", lev); printf("set logger level:%d\n", lev);
}
} }

@ -75,7 +75,10 @@ BBOOL PIPE_SearchFrameObjList(ANGLE32F* pCurrentAngle, SINT32 nPipeRadius,
{ {
fObjSizeLimit = TRUE; fObjSizeLimit = TRUE;
} }
else
{
fObjSizeLimit = FALSE;
}
//转为像素距离 //转为像素距离
FLOAT32 nDistance = dDistance / AglReso; FLOAT32 nDistance = dDistance / AglReso;
@ -237,7 +240,10 @@ BBOOL PIPE_SearchFrameObjList_IOU(ANGLE32F* pCurrentAngle, SINT32 nPipeRadius,
{ {
fObjSizeLimit = TRUE; fObjSizeLimit = TRUE;
} }
else
{
fObjSizeLimit = FALSE;
}
//转为像素距离 //转为像素距离

Loading…
Cancel
Save