diff --git a/MeoAssistance/MeoAssistance.vcxproj b/MeoAssistance/MeoAssistance.vcxproj index e8d206be48..34147eb54a 100644 --- a/MeoAssistance/MeoAssistance.vcxproj +++ b/MeoAssistance/MeoAssistance.vcxproj @@ -189,7 +189,7 @@ xcopy /e /y /i $(SolutionDir)3rdPart\resource $(TargetDir)resource true false true - __DEBUG;_CONSOLE;%(PreprocessorDefinitions) + LOG_TRACE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true stdcpp17 stdc11 diff --git a/MeoAssistance/include/Logger.hpp b/MeoAssistance/include/Logger.hpp index 5cfabf5187..a7f02ed8e9 100644 --- a/MeoAssistance/include/Logger.hpp +++ b/MeoAssistance/include/Logger.hpp @@ -59,9 +59,9 @@ namespace asst { level.c_str(), _getpid(), ::GetCurrentThreadId()); if (level == "ERR" || level == "INF" -//#ifdef _DEBUG +#ifdef LOG_TRACE || level == "TRC" -//#endif +#endif ) { stream_args(std::cout, buff, std::forward(args)...); } diff --git a/MeoAssistance/src/WinMacro.cpp b/MeoAssistance/src/WinMacro.cpp index e3e327104a..8e91892754 100644 --- a/MeoAssistance/src/WinMacro.cpp +++ b/MeoAssistance/src/WinMacro.cpp @@ -363,7 +363,7 @@ cv::Mat WinMacro::getImage(const Rect& rect) ReleaseDC(m_handle, pDC); /* - #ifdef _DEBUG + #ifdef LOG_TRACE std::string filename = GetCurrentDir() + "\\print.bmp"; cv::imwrite(filename, dst_mat); #endif diff --git a/Tools/Sanity/Sanity.vcxproj b/Tools/Sanity/Sanity.vcxproj index 56c5405c99..09e6cee38c 100644 --- a/Tools/Sanity/Sanity.vcxproj +++ b/Tools/Sanity/Sanity.vcxproj @@ -1,235 +1,235 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - RelWithDebInfo - Win32 - - - RelWithDebInfo - x64 - - - - - - - 16.0 - Win32Proj - {36bc08f3-71cf-429a-ae69-291be8962cb2} - Tools - 10.0 - Sanity - - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - false - v142 - true - Unicode - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - false - - - false - - - true - $(SolutionDir)meojson\include;$(SolutionDir)MeoAssistance\include;$(IncludePath) - $(TargetDir);$(LibraryPath) - - - false - $(SolutionDir)meojson\include;$(SolutionDir)MeoAssistance\include;$(IncludePath) - $(TargetDir);$(LibraryPath) - - - true - $(SolutionDir)meojson\include;$(SolutionDir)MeoAssistance\include;$(IncludePath) - $(TargetDir);$(LibraryPath) - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - stdc11 - - - Console - true - MeoAssistance.lib;%(AdditionalDependencies) - $(TargetDir);%(AdditionalLibraryDirectories) - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - stdc11 - MultiThreaded - - - Console - true - true - true - MeoAssistance.lib;%(AdditionalDependencies) - $(TargetDir);%(AdditionalLibraryDirectories) - - - - - Level3 - true - false - true - __DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - stdc11 - MultiThreaded - Disabled - - - Console - true - true - true - MeoAssistance.lib;%(AdditionalDependencies) - $(TargetDir);%(AdditionalLibraryDirectories) - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + RelWithDebInfo + Win32 + + + RelWithDebInfo + x64 + + + + + + + 16.0 + Win32Proj + {36bc08f3-71cf-429a-ae69-291be8962cb2} + Tools + 10.0 + Sanity + + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + Application + false + v142 + true + Unicode + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + Application + false + v142 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + false + + + true + $(SolutionDir)meojson\include;$(SolutionDir)MeoAssistance\include;$(IncludePath) + $(TargetDir);$(LibraryPath) + + + false + $(SolutionDir)meojson\include;$(SolutionDir)MeoAssistance\include;$(IncludePath) + $(TargetDir);$(LibraryPath) + + + true + $(SolutionDir)meojson\include;$(SolutionDir)MeoAssistance\include;$(IncludePath) + $(TargetDir);$(LibraryPath) + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpp17 + stdc11 + + + Console + true + MeoAssistance.lib;%(AdditionalDependencies) + $(TargetDir);%(AdditionalLibraryDirectories) + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpp17 + stdc11 + MultiThreaded + + + Console + true + true + true + MeoAssistance.lib;%(AdditionalDependencies) + $(TargetDir);%(AdditionalLibraryDirectories) + + + + + Level3 + true + false + true + LOG_TRACE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpp17 + stdc11 + MultiThreaded + Disabled + + + Console + true + true + true + MeoAssistance.lib;%(AdditionalDependencies) + $(TargetDir);%(AdditionalLibraryDirectories) + + + + + \ No newline at end of file diff --git a/Tools/Screenshot/Screenshot.vcxproj b/Tools/Screenshot/Screenshot.vcxproj index 19f3176c24..ff9075df2c 100644 --- a/Tools/Screenshot/Screenshot.vcxproj +++ b/Tools/Screenshot/Screenshot.vcxproj @@ -1,235 +1,235 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - RelWithDebInfo - Win32 - - - RelWithDebInfo - x64 - - - - - - - 16.0 - Win32Proj - {4AC1CFFF-D7B8-4FDA-BCFD-E4754275979B} - Tools - 10.0 - Screenshot - - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - false - v142 - true - Unicode - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - false - - - false - - - true - $(SolutionDir)meojson\include;$(SolutionDir)MeoAssistance\include;$(IncludePath) - $(TargetDir);$(LibraryPath) - - - false - $(SolutionDir)meojson\include;$(SolutionDir)MeoAssistance\include;$(IncludePath) - $(TargetDir);$(LibraryPath) - - - true - $(SolutionDir)meojson\include;$(SolutionDir)MeoAssistance\include;$(IncludePath) - $(TargetDir);$(LibraryPath) - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - stdc11 - - - Console - true - MeoAssistance.lib;%(AdditionalDependencies) - $(TargetDir);%(AdditionalLibraryDirectories) - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - stdc11 - MultiThreaded - - - Console - true - true - true - MeoAssistance.lib;%(AdditionalDependencies) - $(TargetDir);%(AdditionalLibraryDirectories) - - - - - Level3 - true - false - true - __DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - stdc11 - MultiThreaded - Disabled - - - Console - true - true - true - MeoAssistance.lib;%(AdditionalDependencies) - $(TargetDir);%(AdditionalLibraryDirectories) - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + RelWithDebInfo + Win32 + + + RelWithDebInfo + x64 + + + + + + + 16.0 + Win32Proj + {4AC1CFFF-D7B8-4FDA-BCFD-E4754275979B} + Tools + 10.0 + Screenshot + + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + Application + false + v142 + true + Unicode + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + Application + false + v142 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + false + + + true + $(SolutionDir)meojson\include;$(SolutionDir)MeoAssistance\include;$(IncludePath) + $(TargetDir);$(LibraryPath) + + + false + $(SolutionDir)meojson\include;$(SolutionDir)MeoAssistance\include;$(IncludePath) + $(TargetDir);$(LibraryPath) + + + true + $(SolutionDir)meojson\include;$(SolutionDir)MeoAssistance\include;$(IncludePath) + $(TargetDir);$(LibraryPath) + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpp17 + stdc11 + + + Console + true + MeoAssistance.lib;%(AdditionalDependencies) + $(TargetDir);%(AdditionalLibraryDirectories) + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpp17 + stdc11 + MultiThreaded + + + Console + true + true + true + MeoAssistance.lib;%(AdditionalDependencies) + $(TargetDir);%(AdditionalLibraryDirectories) + + + + + Level3 + true + false + true + LOG_TRACE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpp17 + stdc11 + MultiThreaded + Disabled + + + Console + true + true + true + MeoAssistance.lib;%(AdditionalDependencies) + $(TargetDir);%(AdditionalLibraryDirectories) + + + + + \ No newline at end of file diff --git a/Tools/TestOCR/TestOCR.vcxproj b/Tools/TestOCR/TestOCR.vcxproj index 7414706cf0..f73ce7e246 100644 --- a/Tools/TestOCR/TestOCR.vcxproj +++ b/Tools/TestOCR/TestOCR.vcxproj @@ -1,235 +1,235 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - RelWithDebInfo - Win32 - - - RelWithDebInfo - x64 - - - - - - - 16.0 - Win32Proj - {4FD37A7B-BBE0-4703-8CBC-7029F4CF98ED} - Tools - 10.0 - TestOCR - - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - false - v142 - true - Unicode - - - Application - true - v142 - Unicode - - - Application - false - v142 - true - Unicode - - - Application - false - v142 - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - false - - - false - - - true - $(SolutionDir)MeoAssistance\include;$(SolutionDir)3rdPart\include;$(SolutionDir)3rdPart\include\meojson;$(SolutionDir)\3rdPart\include\opencv;$(SolutionDir)\3rdPart\include\opencv2;$(SolutionDir)3drPart\include\OcrLiteNcnn;$(IncludePath) - $(TargetDir);$(LibraryPath) - - - false - $(SolutionDir)MeoAssistance\include;$(SolutionDir)3rdPart\include;$(SolutionDir)3rdPart\include\meojson;$(SolutionDir)\3rdPart\include\opencv;$(SolutionDir)\3rdPart\include\opencv2;$(SolutionDir)3drPart\include\OcrLiteNcnn;$(IncludePath) - $(TargetDir);$(LibraryPath) - - - true - $(SolutionDir)MeoAssistance\include;$(SolutionDir)3rdPart\include;$(SolutionDir)3rdPart\include\meojson;$(SolutionDir)\3rdPart\include\opencv;$(SolutionDir)\3rdPart\include\opencv2;$(SolutionDir)3drPart\include\OcrLiteNcnn;$(IncludePath) - $(TargetDir);$(LibraryPath) - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - stdc11 - - - Console - true - MeoAssistance.lib;OcrLiteNcnn.lib;opencv_world3415d.lib;%(AdditionalDependencies) - $(TargetDir);$(SolutionDir)\3rdPart\lib\;%(AdditionalLibraryDirectories) - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - stdc11 - MultiThreaded - - - Console - true - true - true - MeoAssistance.lib;OcrLiteNcnn.lib;opencv_world3415.lib;%(AdditionalDependencies) - $(TargetDir);$(SolutionDir)\3rdPart\lib\;%(AdditionalLibraryDirectories) - - - - - Level3 - true - false - true - __DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - stdcpp17 - stdc11 - MultiThreaded - Disabled - - - Console - true - true - true - MeoAssistance.lib;OcrLiteNcnn.lib;opencv_world3415.lib;%(AdditionalDependencies) - $(TargetDir);$(SolutionDir)\3rdPart\lib\;%(AdditionalLibraryDirectories) - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + RelWithDebInfo + Win32 + + + RelWithDebInfo + x64 + + + + + + + 16.0 + Win32Proj + {4FD37A7B-BBE0-4703-8CBC-7029F4CF98ED} + Tools + 10.0 + TestOCR + + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + Application + false + v142 + true + Unicode + + + Application + true + v142 + Unicode + + + Application + false + v142 + true + Unicode + + + Application + false + v142 + true + Unicode + + + + + + + + + + + + + + + + + + + + + + + + + + + true + + + false + + + false + + + true + $(SolutionDir)MeoAssistance\include;$(SolutionDir)3rdPart\include;$(SolutionDir)3rdPart\include\meojson;$(SolutionDir)\3rdPart\include\opencv;$(SolutionDir)\3rdPart\include\opencv2;$(SolutionDir)3drPart\include\OcrLiteNcnn;$(IncludePath) + $(TargetDir);$(LibraryPath) + + + false + $(SolutionDir)MeoAssistance\include;$(SolutionDir)3rdPart\include;$(SolutionDir)3rdPart\include\meojson;$(SolutionDir)\3rdPart\include\opencv;$(SolutionDir)\3rdPart\include\opencv2;$(SolutionDir)3drPart\include\OcrLiteNcnn;$(IncludePath) + $(TargetDir);$(LibraryPath) + + + true + $(SolutionDir)MeoAssistance\include;$(SolutionDir)3rdPart\include;$(SolutionDir)3rdPart\include\meojson;$(SolutionDir)\3rdPart\include\opencv;$(SolutionDir)\3rdPart\include\opencv2;$(SolutionDir)3drPart\include\OcrLiteNcnn;$(IncludePath) + $(TargetDir);$(LibraryPath) + + + + Level3 + true + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + true + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + + + Console + true + true + true + + + + + Level3 + true + _DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpp17 + stdc11 + + + Console + true + MeoAssistance.lib;OcrLiteNcnn.lib;opencv_world3415d.lib;%(AdditionalDependencies) + $(TargetDir);$(SolutionDir)\3rdPart\lib\;%(AdditionalLibraryDirectories) + + + + + Level3 + true + true + true + NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpp17 + stdc11 + MultiThreaded + + + Console + true + true + true + MeoAssistance.lib;OcrLiteNcnn.lib;opencv_world3415.lib;%(AdditionalDependencies) + $(TargetDir);$(SolutionDir)\3rdPart\lib\;%(AdditionalLibraryDirectories) + + + + + Level3 + true + false + true + LOG_TRACE;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + stdcpp17 + stdc11 + MultiThreaded + Disabled + + + Console + true + true + true + MeoAssistance.lib;OcrLiteNcnn.lib;opencv_world3415.lib;%(AdditionalDependencies) + $(TargetDir);$(SolutionDir)\3rdPart\lib\;%(AdditionalLibraryDirectories) + + + + + \ No newline at end of file