diff --git a/MeoAssistance.sln b/MeoAssistance.sln index 7917225ad0..39aa418ac2 100644 --- a/MeoAssistance.sln +++ b/MeoAssistance.sln @@ -15,18 +15,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MeoAsstGui", "MeoAsstGui\Me {362D1E30-F5AE-4279-9985-65C27B3BA300} = {362D1E30-F5AE-4279-9985-65C27B3BA300} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Screenshot", "Tools\Screenshot\Screenshot.vcxproj", "{4AC1CFFF-D7B8-4FDA-BCFD-E4754275979B}" - ProjectSection(ProjectDependencies) = postProject - {362D1E30-F5AE-4279-9985-65C27B3BA300} = {362D1E30-F5AE-4279-9985-65C27B3BA300} - EndProjectSection -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{6C4B8D52-51D1-45F8-AAEC-808035443FD6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestOCR", "Tools\TestOCR\TestOCR.vcxproj", "{4FD37A7B-BBE0-4703-8CBC-7029F4CF98ED}" - ProjectSection(ProjectDependencies) = postProject - {362D1E30-F5AE-4279-9985-65C27B3BA300} = {362D1E30-F5AE-4279-9985-65C27B3BA300} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestCaller", "Tools\TestCaller\TestCaller.vcxproj", "{63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}" ProjectSection(ProjectDependencies) = postProject {362D1E30-F5AE-4279-9985-65C27B3BA300} = {362D1E30-F5AE-4279-9985-65C27B3BA300} @@ -64,22 +54,6 @@ Global {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|Any CPU {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Any CPU {FFDC8F49-8EAF-45BE-B0A8-7EF0DB9875A2}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Any CPU - {4AC1CFFF-D7B8-4FDA-BCFD-E4754275979B}.Release|x64.ActiveCfg = Release|x64 - {4AC1CFFF-D7B8-4FDA-BCFD-E4754275979B}.Release|x64.Build.0 = Release|x64 - {4AC1CFFF-D7B8-4FDA-BCFD-E4754275979B}.Release|x86.ActiveCfg = Release|Win32 - {4AC1CFFF-D7B8-4FDA-BCFD-E4754275979B}.Release|x86.Build.0 = Release|Win32 - {4AC1CFFF-D7B8-4FDA-BCFD-E4754275979B}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 - {4AC1CFFF-D7B8-4FDA-BCFD-E4754275979B}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 - {4AC1CFFF-D7B8-4FDA-BCFD-E4754275979B}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Win32 - {4AC1CFFF-D7B8-4FDA-BCFD-E4754275979B}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Win32 - {4FD37A7B-BBE0-4703-8CBC-7029F4CF98ED}.Release|x64.ActiveCfg = Release|x64 - {4FD37A7B-BBE0-4703-8CBC-7029F4CF98ED}.Release|x64.Build.0 = Release|x64 - {4FD37A7B-BBE0-4703-8CBC-7029F4CF98ED}.Release|x86.ActiveCfg = Release|Win32 - {4FD37A7B-BBE0-4703-8CBC-7029F4CF98ED}.Release|x86.Build.0 = Release|Win32 - {4FD37A7B-BBE0-4703-8CBC-7029F4CF98ED}.RelWithDebInfo|x64.ActiveCfg = RelWithDebInfo|x64 - {4FD37A7B-BBE0-4703-8CBC-7029F4CF98ED}.RelWithDebInfo|x64.Build.0 = RelWithDebInfo|x64 - {4FD37A7B-BBE0-4703-8CBC-7029F4CF98ED}.RelWithDebInfo|x86.ActiveCfg = RelWithDebInfo|Win32 - {4FD37A7B-BBE0-4703-8CBC-7029F4CF98ED}.RelWithDebInfo|x86.Build.0 = RelWithDebInfo|Win32 {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|x64.ActiveCfg = Release|x64 {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|x64.Build.0 = Release|x64 {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64}.Release|x86.ActiveCfg = Release|Win32 @@ -94,8 +68,6 @@ Global EndGlobalSection GlobalSection(NestedProjects) = preSolution {36BC08F3-71CF-429A-AE69-291BE8962CB2} = {6C4B8D52-51D1-45F8-AAEC-808035443FD6} - {4AC1CFFF-D7B8-4FDA-BCFD-E4754275979B} = {6C4B8D52-51D1-45F8-AAEC-808035443FD6} - {4FD37A7B-BBE0-4703-8CBC-7029F4CF98ED} = {6C4B8D52-51D1-45F8-AAEC-808035443FD6} {63B4F1A2-291C-4C85-91E1-A1F6DAE30D64} = {6C4B8D52-51D1-45F8-AAEC-808035443FD6} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution diff --git a/Tools/Screenshot/Screenshot.vcxproj b/Tools/Screenshot/Screenshot.vcxproj deleted file mode 100644 index ff9075df2c..0000000000 --- a/Tools/Screenshot/Screenshot.vcxproj +++ /dev/null @@ -1,235 +0,0 @@ - - - - - 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/Screenshot/Screenshot.vcxproj.filters b/Tools/Screenshot/Screenshot.vcxproj.filters deleted file mode 100644 index 65fa6d5ae5..0000000000 --- a/Tools/Screenshot/Screenshot.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - 源文件 - - - \ No newline at end of file diff --git a/Tools/Screenshot/main.cpp b/Tools/Screenshot/main.cpp deleted file mode 100644 index b75166e97e..0000000000 --- a/Tools/Screenshot/main.cpp +++ /dev/null @@ -1,30 +0,0 @@ -#include "Assistance.h" -#include "AsstAux.h" -#include "Logger.hpp" - -int main(int argc, char** argv) -{ - using namespace asst; - - Assistance asst; - - auto ret = asst.catch_emulator(); - if (!ret) { - DebugTraceError("Can't Find Emulator or Permission denied."); - getchar(); - return -1; - } - else { - DebugTraceInfo("Find Emulator:", ret.value()); - } - - char ch = 0; - while (ch != EOF) { - ch = getchar(); - auto time_str = StringReplaceAll(StringReplaceAll(GetFormatTimeString(), " ", "_"), ":", "-"); - std::string filename = GetCurrentDir() + "screenshot\\" + time_str + ".png"; - asst.print_window(filename); - } - - return 0; -} \ No newline at end of file diff --git a/Tools/TestOCR/TestOCR.filters b/Tools/TestOCR/TestOCR.filters deleted file mode 100644 index 65fa6d5ae5..0000000000 --- a/Tools/TestOCR/TestOCR.filters +++ /dev/null @@ -1,22 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - 源文件 - - - \ No newline at end of file diff --git a/Tools/TestOCR/TestOCR.vcxproj b/Tools/TestOCR/TestOCR.vcxproj deleted file mode 100644 index f73ce7e246..0000000000 --- a/Tools/TestOCR/TestOCR.vcxproj +++ /dev/null @@ -1,235 +0,0 @@ - - - - - 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 diff --git a/Tools/TestOCR/TestOCR.vcxproj.filters b/Tools/TestOCR/TestOCR.vcxproj.filters deleted file mode 100644 index 86c54a1964..0000000000 --- a/Tools/TestOCR/TestOCR.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {510b2363-fc44-405a-90b9-5126b6853026} - - - - - 源文件 - - - \ No newline at end of file diff --git a/Tools/TestOCR/main.cpp b/Tools/TestOCR/main.cpp deleted file mode 100644 index 6e0a306fb9..0000000000 --- a/Tools/TestOCR/main.cpp +++ /dev/null @@ -1,78 +0,0 @@ -#include - -#include -#include -#include - -#include "Assistance.h" -#include "AsstAux.h" -#include "Logger.hpp" - -void raw_ocr_test(); -void asst_ocr_test(); - -int main(int argc, char** argv) -{ - //raw_ocr_test();; - - asst_ocr_test(); - - - return 0; -} - -void asst_ocr_test() -{ - using namespace asst; - Assistance asst; - - auto ret = asst.catch_emulator(); - if (!ret) { - DebugTraceError("Can't Find Emulator or Permission denied."); - getchar(); - return; - } - else { - DebugTraceInfo("Find Emulator:", ret.value()); - } - char c = 0; - while (c != 'q') { - asst.start_open_recruit({ 3, 4, 5 }); - c = getchar(); - } -} - -void raw_ocr_test() -{ - using namespace ocr; - using namespace asst; - - const std::string filename = "test.png"; - - OcrLite ocr_lite; - ocr_lite.setNumThread(4); - - //ocr_lite.initLogger( - // true,//isOutputConsole - // false,//isOutputPartImg - // false);//isOutputResultImg - - ocr_lite.enableResultTxt(GetCurrentDir().c_str(), filename.c_str()); - ocr_lite.setGpuIndex(-1); - - const std::string models_dir = GetResourceDir() + "OcrLiteNcnn\\models\\"; - - bool init_ret = ocr_lite.initModels(models_dir + "dbnet_op", models_dir + "angle_op", models_dir + "crnn_lite_op", models_dir + "keys.txt"); - if (!init_ret) { - std::cerr << "initModels failed" << std::endl; - } - - auto start = std::chrono::system_clock::now(); - OcrResult result = ocr_lite.detect(GetCurrentDir().c_str(), filename.c_str(), - 50, 1024, - 0.6f, 0.3f, - 2.0f, true, true); - - auto end = std::chrono::system_clock::now(); - std::cout << "Time: " << std::chrono::duration_cast(end - start).count() << std::endl; -} \ No newline at end of file