diff --git a/CMakeLists.txt b/CMakeLists.txt index 0567eec7..fd7cc5f1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,20 +1,13 @@ # CMakeList.txt: 顶层 CMake 项目文件,在此处执行全局配置 # 并包含子项目。 # -cmake_minimum_required(VERSION 3.0.0) +message(STATUS "CMake version: ${CMAKE_VERSION}") +cmake_minimum_required(VERSION 3.16.0) project(handdleai VERSION 0.1.0) string(TIMESTAMP RUN_TIME) message( " project start : " ${RUN_TIME}) -if (MSVC_VERSION GREATER_EQUAL "1900") - include(CheckCXXCompilerFlag) - CHECK_CXX_COMPILER_FLAG("/std:c++17" _cpp_latest_flag_supported) - if (_cpp_latest_flag_supported) - add_compile_options("/std:c++17") - endif() -endif() - set(CMAKE_DISABLE_IN_SOURCE_BUILD ON) set(CMAKE_DISABLE_SOURCE_CHANGES ON) @@ -30,11 +23,22 @@ set(NE_DEVELOPER_DEFAULTS "${is_root_project}" CACHE BOOL "Turns on default sett option(BUILD_EXAMPLES "Build Examples" "${NE_DEVELOPER_DEFAULTS}") option(BUILD_MODULES "Build Modules" "${NE_DEVELOPER_DEFAULTS}") option(BUILD_DEBUG_POSTFIX_D "Append d suffix to debug libraries" OFF) - +if (MSVC_VERSION GREATER_EQUAL "1900") + include(CheckCXXCompilerFlag) + CHECK_CXX_COMPILER_FLAG("/std:c++17" _cpp_latest_flag_supported) + if (_cpp_latest_flag_supported) + add_compile_options("/std:c++17") + else() + message(WARNING "Compiler does not support C++17 standard.") + endif() +else() + message(WARNING "MSVC version is not supported.") +endif() # 默认生成参数设置 if(NE_DEVELOPER_DEFAULTS) - set(CMAKE_CXX_STANDARD 11) + set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_EXTENSIONS OFF) + SET(CMAKE_CXX_STANDARD_REQUIRED TRUE) # PROJECT_BINARY_DIR 指build生成所在文件夹 # PROJECT_SOURCE_DIR 指最外层CMakeLists.txt所在文件夹 # CMAKE_CURRENT_SOURCE_DIR 指正在处理的CMakeLists.txt所在文件夹 @@ -129,9 +133,9 @@ if(ON) message(${child}_lib: ${${child}_lib}) if(${child} MATCHES "opencv") if(CMAKE_BUILD_TYPE MATCHES "Debug") - SET( ${child}_target_link "opencv_world410d" ) + SET( ${child}_target_link "opencv_world4100d" ) else() - SET( ${child}_target_link "opencv_world410" ) + SET( ${child}_target_link "opencv_world4100" ) endif() elseif(${child} MATCHES "halcon") SET( ${child}_target_link @@ -141,6 +145,12 @@ if(ON) elseif(${child} MATCHES "keyence3D") SET( ${child}_target_link "LJX8_IF" ) + elseif(${child} MATCHES "python") + #set(PYTHON_EXECUTABLE "${PROJECT_ROOT_PATH}/env/python/Python37") + SET( ${child}_target_link + "_tkinter" + "python3" + "python312") elseif(${child} MATCHES "basler") SET( ${child}_target_link "PylonC.lib" ) @@ -163,9 +173,9 @@ if(ON) "kglib" ) elseif(${child} MATCHES "3DAI") if(CMAKE_BUILD_TYPE MATCHES "Debug") - SET( ${child}_target_link "cosmeticAlg" "Inspection""zxingD" "algo2""algo") + SET( ${child}_target_link "3DAlg") else() - SET( ${child}_target_link "cosmeticAlg" "Inspection""zxing" "algo2""algo") + SET( ${child}_target_link "3DAlg") endif() elseif(${child} MATCHES "handdleAI") if(CMAKE_BUILD_TYPE MATCHES "Debug") @@ -187,12 +197,6 @@ if(ON) find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED) message("QT_Version :" Qt${QT_VERSION_MAJOR}) - - #984 自定义dll - SET( 984Dll_include ${PROJECT_ROOT_PATH}/include ) - SET( 984Dll_lib ${PROJECT_ROOT_PATH}/lib ) - SET( 984Dll_target_link "Hd_AI_927_DET" ) - add_definitions(-DQT_MESSAGELOGCONTEXT)#打开QT日志信息 endif() endif() diff --git a/README.md b/README.md index 22d18dac..0d1e941f 100644 --- a/README.md +++ b/README.md @@ -1,93 +1,3 @@ -# 952-11 - - - -## Getting started - -To make it easy for you to get started with GitLab, here's a list of recommended next steps. - -Already a pro? Just edit this README.md and make it your own. Want to make it easy? [Use the template at the bottom](#editing-this-readme)! - -## Add your files - -- [ ] [Create](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#create-a-file) or [upload](https://docs.gitlab.com/ee/user/project/repository/web_editor.html#upload-a-file) files -- [ ] [Add files using the command line](https://docs.gitlab.com/ee/gitlab-basics/add-file.html#add-a-file-using-the-command-line) or push an existing Git repository with the following command: - -``` -cd existing_repo -git remote add origin http://192.168.111.132:8077/RCi/952-11.git -git branch -M main -git push -uf origin main -``` - -## Integrate with your tools - -- [ ] [Set up project integrations](http://192.168.111.132:8077/RCi/952-11/-/settings/integrations) - -## Collaborate with your team - -- [ ] [Invite team members and collaborators](https://docs.gitlab.com/ee/user/project/members/) -- [ ] [Create a new merge request](https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html) -- [ ] [Automatically close issues from merge requests](https://docs.gitlab.com/ee/user/project/issues/managing_issues.html#closing-issues-automatically) -- [ ] [Enable merge request approvals](https://docs.gitlab.com/ee/user/project/merge_requests/approvals/) -- [ ] [Set auto-merge](https://docs.gitlab.com/ee/user/project/merge_requests/merge_when_pipeline_succeeds.html) - -## Test and Deploy - -Use the built-in continuous integration in GitLab. - -- [ ] [Get started with GitLab CI/CD](https://docs.gitlab.com/ee/ci/quick_start/index.html) -- [ ] [Analyze your code for known vulnerabilities with Static Application Security Testing (SAST)](https://docs.gitlab.com/ee/user/application_security/sast/) -- [ ] [Deploy to Kubernetes, Amazon EC2, or Amazon ECS using Auto Deploy](https://docs.gitlab.com/ee/topics/autodevops/requirements.html) -- [ ] [Use pull-based deployments for improved Kubernetes management](https://docs.gitlab.com/ee/user/clusters/agent/) -- [ ] [Set up protected environments](https://docs.gitlab.com/ee/ci/environments/protected_environments.html) - -*** - -# Editing this README - -When you're ready to make this README your own, just edit this file and use the handy template below (or feel free to structure it however you want - this is just a starting point!). Thanks to [makeareadme.com](https://www.makeareadme.com/) for this template. - -## Suggestions for a good README - -Every project is different, so consider which of these sections apply to yours. The sections used in the template are suggestions for most open source projects. Also keep in mind that while a README can be too long and detailed, too long is better than too short. If you think your README is too long, consider utilizing another form of documentation rather than cutting out information. - -## Name -Choose a self-explaining name for your project. - -## Description -Let people know what your project can do specifically. Provide context and add a link to any reference visitors might be unfamiliar with. A list of Features or a Background subsection can also be added here. If there are alternatives to your project, this is a good place to list differentiating factors. - -## Badges -On some READMEs, you may see small images that convey metadata, such as whether or not all the tests are passing for the project. You can use Shields to add some to your README. Many services also have instructions for adding a badge. - -## Visuals -Depending on what you are making, it can be a good idea to include screenshots or even a video (you'll frequently see GIFs rather than actual videos). Tools like ttygif can help, but check out Asciinema for a more sophisticated method. - -## Installation -Within a particular ecosystem, there may be a common way of installing things, such as using Yarn, NuGet, or Homebrew. However, consider the possibility that whoever is reading your README is a novice and would like more guidance. Listing specific steps helps remove ambiguity and gets people to using your project as quickly as possible. If it only runs in a specific context like a particular programming language version or operating system or has dependencies that have to be installed manually, also add a Requirements subsection. - -## Usage -Use examples liberally, and show the expected output if you can. It's helpful to have inline the smallest example of usage that you can demonstrate, while providing links to more sophisticated examples if they are too long to reasonably include in the README. - -## Support -Tell people where they can go to for help. It can be any combination of an issue tracker, a chat room, an email address, etc. - -## Roadmap -If you have ideas for releases in the future, it is a good idea to list them in the README. - -## Contributing -State if you are open to contributions and what your requirements are for accepting them. - -For people who want to make changes to your project, it's helpful to have some documentation on how to get started. Perhaps there is a script that they should run or some environment variables that they need to set. Make these steps explicit. These instructions could also be useful to your future self. - -You can also document commands to lint the code or run tests. These steps help to ensure high code quality and reduce the likelihood that the changes inadvertently break something. Having instructions for running tests is especially helpful if it requires external setup, such as starting a Selenium server for testing in a browser. - -## Authors and acknowledgment -Show your appreciation to those who have contributed to the project. - -## License -For open source projects, say how it is licensed. - -## Project status -If you have run out of energy or time for your project, put a note at the top of the README saying that development has slowed down or stopped completely. Someone may choose to fork your project or volunteer to step in as a maintainer or owner, allowing your project to keep going. You can also make an explicit request for maintainers. +detProcess.hpp -> ¼ì²âÂ߼­´¥·¢ +algoÎļþ¼Ð -> ¼ì²âÂ߼­ +Êý¾ݿâµÄkey²»ÔÊÐíÒÔÊý×ֿªͷ \ No newline at end of file diff --git a/testSet/2D/20240816-111955.bmp b/testSet/2D/20240816-111955.bmp new file mode 100644 index 00000000..156edc64 Binary files /dev/null and b/testSet/2D/20240816-111955.bmp differ diff --git a/testSet/2D/20240816-112010.bmp b/testSet/2D/20240816-112010.bmp new file mode 100644 index 00000000..7999d6d7 Binary files /dev/null and b/testSet/2D/20240816-112010.bmp differ diff --git a/testSet/3D/2/3D-_time11-27-1045210.tiff b/testSet/3D/2/3D-_time11-27-1045210.tiff new file mode 100644 index 00000000..29997e0d Binary files /dev/null and b/testSet/3D/2/3D-_time11-27-1045210.tiff differ diff --git a/testSet/3D/2/3D-_time11-27-3166681.tiff b/testSet/3D/2/3D-_time11-27-3166681.tiff new file mode 100644 index 00000000..9188c3d4 Binary files /dev/null and b/testSet/3D/2/3D-_time11-27-3166681.tiff differ diff --git a/testSet/3D/2/3D-_time11-27-5387841.tiff b/testSet/3D/2/3D-_time11-27-5387841.tiff new file mode 100644 index 00000000..171d0f5a Binary files /dev/null and b/testSet/3D/2/3D-_time11-27-5387841.tiff differ diff --git a/testSet/3D/2/3D-_time11-28-24118824.tiff b/testSet/3D/2/3D-_time11-28-24118824.tiff new file mode 100644 index 00000000..a66fcdbf Binary files /dev/null and b/testSet/3D/2/3D-_time11-28-24118824.tiff differ diff --git a/testSet/3D/2/3D-_time11-28-38133396.tiff b/testSet/3D/2/3D-_time11-28-38133396.tiff new file mode 100644 index 00000000..33041ac4 Binary files /dev/null and b/testSet/3D/2/3D-_time11-28-38133396.tiff differ diff --git a/testSet/3D/2/3D-_time11-28-54148988.tiff b/testSet/3D/2/3D-_time11-28-54148988.tiff new file mode 100644 index 00000000..c84da164 Binary files /dev/null and b/testSet/3D/2/3D-_time11-28-54148988.tiff differ diff --git a/testSet/3D/2/3D-_time11-29-10165295.tiff b/testSet/3D/2/3D-_time11-29-10165295.tiff new file mode 100644 index 00000000..eb769191 Binary files /dev/null and b/testSet/3D/2/3D-_time11-29-10165295.tiff differ diff --git a/testSet/3D/2/3D-_time11-29-24179054.tiff b/testSet/3D/2/3D-_time11-29-24179054.tiff new file mode 100644 index 00000000..bca6ed16 Binary files /dev/null and b/testSet/3D/2/3D-_time11-29-24179054.tiff differ diff --git a/testSet/3D/2/3D-_time11-29-38192807.tiff b/testSet/3D/2/3D-_time11-29-38192807.tiff new file mode 100644 index 00000000..25e31ffd Binary files /dev/null and b/testSet/3D/2/3D-_time11-29-38192807.tiff differ diff --git a/testSet/3D/2/3D-_time11-29-51206587.tiff b/testSet/3D/2/3D-_time11-29-51206587.tiff new file mode 100644 index 00000000..6dc81b48 Binary files /dev/null and b/testSet/3D/2/3D-_time11-29-51206587.tiff differ diff --git a/testSet/3D/2/3D-_time11-30-07221929.tiff b/testSet/3D/2/3D-_time11-30-07221929.tiff new file mode 100644 index 00000000..608ad6bc Binary files /dev/null and b/testSet/3D/2/3D-_time11-30-07221929.tiff differ diff --git a/testSet/3D/2/3D-_time11-30-22237438.tiff b/testSet/3D/2/3D-_time11-30-22237438.tiff new file mode 100644 index 00000000..68bb1624 Binary files /dev/null and b/testSet/3D/2/3D-_time11-30-22237438.tiff differ diff --git a/testSet/3D/2/3D-_time11-30-39253788.tiff b/testSet/3D/2/3D-_time11-30-39253788.tiff new file mode 100644 index 00000000..be03b471 Binary files /dev/null and b/testSet/3D/2/3D-_time11-30-39253788.tiff differ diff --git a/testSet/3D/2/3D-_time11-30-55270099.tiff b/testSet/3D/2/3D-_time11-30-55270099.tiff new file mode 100644 index 00000000..634e2c69 Binary files /dev/null and b/testSet/3D/2/3D-_time11-30-55270099.tiff differ diff --git a/testSet/3D/2/3D-_time11-31-31306323.tiff b/testSet/3D/2/3D-_time11-31-31306323.tiff new file mode 100644 index 00000000..11d3b264 Binary files /dev/null and b/testSet/3D/2/3D-_time11-31-31306323.tiff differ diff --git a/testSet/3D/2/3D-_time11-31-47321810.tiff b/testSet/3D/2/3D-_time11-31-47321810.tiff new file mode 100644 index 00000000..08ab96f8 Binary files /dev/null and b/testSet/3D/2/3D-_time11-31-47321810.tiff differ diff --git a/testSet/3D/2/3D-_time11-32-00335464.tiff b/testSet/3D/2/3D-_time11-32-00335464.tiff new file mode 100644 index 00000000..c9f3b0d0 Binary files /dev/null and b/testSet/3D/2/3D-_time11-32-00335464.tiff differ diff --git a/testSet/3D/2/3D-_time11-32-15350072.tiff b/testSet/3D/2/3D-_time11-32-15350072.tiff new file mode 100644 index 00000000..7b23e1c3 Binary files /dev/null and b/testSet/3D/2/3D-_time11-32-15350072.tiff differ diff --git a/testSet/3D/2/3D-_time11-32-48382742.tiff b/testSet/3D/2/3D-_time11-32-48382742.tiff new file mode 100644 index 00000000..fe99198d Binary files /dev/null and b/testSet/3D/2/3D-_time11-32-48382742.tiff differ diff --git a/testSet/3D/2/3D-_time11-33-02397364.tiff b/testSet/3D/2/3D-_time11-33-02397364.tiff new file mode 100644 index 00000000..890fb2d2 Binary files /dev/null and b/testSet/3D/2/3D-_time11-33-02397364.tiff differ diff --git a/testSet/3D/2/3D-_time11-33-17412068.tiff b/testSet/3D/2/3D-_time11-33-17412068.tiff new file mode 100644 index 00000000..efbe216d Binary files /dev/null and b/testSet/3D/2/3D-_time11-33-17412068.tiff differ diff --git a/testSet/3D/2/3D-_time11-33-31426605.tiff b/testSet/3D/2/3D-_time11-33-31426605.tiff new file mode 100644 index 00000000..bfb12dea Binary files /dev/null and b/testSet/3D/2/3D-_time11-33-31426605.tiff differ diff --git a/testSet/3D/2/3D-_time11-33-45440402.tiff b/testSet/3D/2/3D-_time11-33-45440402.tiff new file mode 100644 index 00000000..7dca8635 Binary files /dev/null and b/testSet/3D/2/3D-_time11-33-45440402.tiff differ diff --git a/testSet/3D/2/3D-_time11-33-59454085.tiff b/testSet/3D/2/3D-_time11-33-59454085.tiff new file mode 100644 index 00000000..90046e48 Binary files /dev/null and b/testSet/3D/2/3D-_time11-33-59454085.tiff differ diff --git a/testSet/3D/2/3D-_time11-34-28483263.tiff b/testSet/3D/2/3D-_time11-34-28483263.tiff new file mode 100644 index 00000000..e2846562 Binary files /dev/null and b/testSet/3D/2/3D-_time11-34-28483263.tiff differ diff --git a/testSet/3D/2/3D-_time11-34-43498004.tiff b/testSet/3D/2/3D-_time11-34-43498004.tiff new file mode 100644 index 00000000..dc1b01dc Binary files /dev/null and b/testSet/3D/2/3D-_time11-34-43498004.tiff differ diff --git a/testSet/3D/2/3D-_time11-34-58513436.tiff b/testSet/3D/2/3D-_time11-34-58513436.tiff new file mode 100644 index 00000000..19fb69ae Binary files /dev/null and b/testSet/3D/2/3D-_time11-34-58513436.tiff differ diff --git a/testSet/3D/OK品重复性/原图/3D-_time12-57-1042144.tiff b/testSet/3D/OK品重复性/原图/3D-_time12-57-1042144.tiff new file mode 100644 index 00000000..ab8490d7 Binary files /dev/null and b/testSet/3D/OK品重复性/原图/3D-_time12-57-1042144.tiff differ diff --git a/testSet/3D/OK品重复性/原图/3D-_time12-57-2557711.tiff b/testSet/3D/OK品重复性/原图/3D-_time12-57-2557711.tiff new file mode 100644 index 00000000..49ca6a27 Binary files /dev/null and b/testSet/3D/OK品重复性/原图/3D-_time12-57-2557711.tiff differ diff --git a/testSet/3D/OK品重复性/原图/3D-_time12-57-4476499.tiff b/testSet/3D/OK品重复性/原图/3D-_time12-57-4476499.tiff new file mode 100644 index 00000000..d4b06337 Binary files /dev/null and b/testSet/3D/OK品重复性/原图/3D-_time12-57-4476499.tiff differ diff --git a/testSet/3D/OK品重复性/原图/3D-_time12-58-0193751.tiff b/testSet/3D/OK品重复性/原图/3D-_time12-58-0193751.tiff new file mode 100644 index 00000000..b088251c Binary files /dev/null and b/testSet/3D/OK品重复性/原图/3D-_time12-58-0193751.tiff differ diff --git a/testSet/3D/OK品重复性/原图/3D-_time12-58-17109262.tiff b/testSet/3D/OK品重复性/原图/3D-_time12-58-17109262.tiff new file mode 100644 index 00000000..49db7896 Binary files /dev/null and b/testSet/3D/OK品重复性/原图/3D-_time12-58-17109262.tiff differ diff --git a/testSet/3D/OK品重复性/原图/3D-_time12-58-31123838.tiff b/testSet/3D/OK品重复性/原图/3D-_time12-58-31123838.tiff new file mode 100644 index 00000000..69297d0e Binary files /dev/null and b/testSet/3D/OK品重复性/原图/3D-_time12-58-31123838.tiff differ diff --git a/testSet/3D/OK品重复性/原图/3D-_time12-58-45137561.tiff b/testSet/3D/OK品重复性/原图/3D-_time12-58-45137561.tiff new file mode 100644 index 00000000..6af7b2d3 Binary files /dev/null and b/testSet/3D/OK品重复性/原图/3D-_time12-58-45137561.tiff differ diff --git a/testSet/3D/OK品重复性/原图/3D-_time12-59-26178245.tiff b/testSet/3D/OK品重复性/原图/3D-_time12-59-26178245.tiff new file mode 100644 index 00000000..38938ea7 Binary files /dev/null and b/testSet/3D/OK品重复性/原图/3D-_time12-59-26178245.tiff differ diff --git a/testSet/3D/OK品重复性/原图/3D-_time12-59-41193640.tiff b/testSet/3D/OK品重复性/原图/3D-_time12-59-41193640.tiff new file mode 100644 index 00000000..dfa18243 Binary files /dev/null and b/testSet/3D/OK品重复性/原图/3D-_time12-59-41193640.tiff differ diff --git a/testSet/3D/OK品重复性/原图/3D-_time12-59-56208226.tiff b/testSet/3D/OK品重复性/原图/3D-_time12-59-56208226.tiff new file mode 100644 index 00000000..f2a6cfea Binary files /dev/null and b/testSet/3D/OK品重复性/原图/3D-_time12-59-56208226.tiff differ diff --git a/testSet/3D/OK品重复性/原图/3D-_time13-00-11222882.tiff b/testSet/3D/OK品重复性/原图/3D-_time13-00-11222882.tiff new file mode 100644 index 00000000..01adcba3 Binary files /dev/null and b/testSet/3D/OK品重复性/原图/3D-_time13-00-11222882.tiff differ diff --git a/testSet/3D/OK品重复性/原图/3D-_time13-00-25237480.tiff b/testSet/3D/OK品重复性/原图/3D-_time13-00-25237480.tiff new file mode 100644 index 00000000..b464ef76 Binary files /dev/null and b/testSet/3D/OK品重复性/原图/3D-_time13-00-25237480.tiff differ diff --git a/testSet/3D/OK品重复性/原图/3D-_time13-00-40252126.tiff b/testSet/3D/OK品重复性/原图/3D-_time13-00-40252126.tiff new file mode 100644 index 00000000..00f88456 Binary files /dev/null and b/testSet/3D/OK品重复性/原图/3D-_time13-00-40252126.tiff differ diff --git a/testSet/3D/OK品重复性/原图/3D-_time13-01-14286556.tiff b/testSet/3D/OK品重复性/原图/3D-_time13-01-14286556.tiff new file mode 100644 index 00000000..7a44cee2 Binary files /dev/null and b/testSet/3D/OK品重复性/原图/3D-_time13-01-14286556.tiff differ diff --git a/testSet/3D/OK品重复性/原图/3D-_time13-01-29301162.tiff b/testSet/3D/OK品重复性/原图/3D-_time13-01-29301162.tiff new file mode 100644 index 00000000..5d1f0e64 Binary files /dev/null and b/testSet/3D/OK品重复性/原图/3D-_time13-01-29301162.tiff differ diff --git a/testSet/3D/OK品重复性/原图/3D-_time13-01-59331297.tiff b/testSet/3D/OK品重复性/原图/3D-_time13-01-59331297.tiff new file mode 100644 index 00000000..450122ac Binary files /dev/null and b/testSet/3D/OK品重复性/原图/3D-_time13-01-59331297.tiff differ diff --git a/testSet/3D/img/3D-_time11-27-1045210.tiff b/testSet/3D/img/3D-_time11-27-1045210.tiff new file mode 100644 index 00000000..29997e0d Binary files /dev/null and b/testSet/3D/img/3D-_time11-27-1045210.tiff differ diff --git a/testSet/3D/img/3D-_time11-27-3166681.tiff b/testSet/3D/img/3D-_time11-27-3166681.tiff new file mode 100644 index 00000000..9188c3d4 Binary files /dev/null and b/testSet/3D/img/3D-_time11-27-3166681.tiff differ diff --git a/testSet/3D/img/3D-_time11-27-5387841.tiff b/testSet/3D/img/3D-_time11-27-5387841.tiff new file mode 100644 index 00000000..171d0f5a Binary files /dev/null and b/testSet/3D/img/3D-_time11-27-5387841.tiff differ diff --git a/testSet/3D/img/3D-_time11-28-24118824.tiff b/testSet/3D/img/3D-_time11-28-24118824.tiff new file mode 100644 index 00000000..a66fcdbf Binary files /dev/null and b/testSet/3D/img/3D-_time11-28-24118824.tiff differ diff --git a/testSet/3D/img/3D-_time11-28-38133396.tiff b/testSet/3D/img/3D-_time11-28-38133396.tiff new file mode 100644 index 00000000..33041ac4 Binary files /dev/null and b/testSet/3D/img/3D-_time11-28-38133396.tiff differ diff --git a/testSet/3D/img/3D-_time11-28-54148988.tiff b/testSet/3D/img/3D-_time11-28-54148988.tiff new file mode 100644 index 00000000..c84da164 Binary files /dev/null and b/testSet/3D/img/3D-_time11-28-54148988.tiff differ diff --git a/testSet/3D/img/3D-_time11-29-10165295.tiff b/testSet/3D/img/3D-_time11-29-10165295.tiff new file mode 100644 index 00000000..eb769191 Binary files /dev/null and b/testSet/3D/img/3D-_time11-29-10165295.tiff differ diff --git a/testSet/3D/img/3D-_time11-29-24179054.tiff b/testSet/3D/img/3D-_time11-29-24179054.tiff new file mode 100644 index 00000000..bca6ed16 Binary files /dev/null and b/testSet/3D/img/3D-_time11-29-24179054.tiff differ diff --git a/testSet/3D/img/3D-_time11-29-38192807.tiff b/testSet/3D/img/3D-_time11-29-38192807.tiff new file mode 100644 index 00000000..25e31ffd Binary files /dev/null and b/testSet/3D/img/3D-_time11-29-38192807.tiff differ diff --git a/testSet/3D/img/3D-_time11-29-51206587.tiff b/testSet/3D/img/3D-_time11-29-51206587.tiff new file mode 100644 index 00000000..6dc81b48 Binary files /dev/null and b/testSet/3D/img/3D-_time11-29-51206587.tiff differ diff --git a/testSet/3D/img/3D-_time11-30-07221929.tiff b/testSet/3D/img/3D-_time11-30-07221929.tiff new file mode 100644 index 00000000..608ad6bc Binary files /dev/null and b/testSet/3D/img/3D-_time11-30-07221929.tiff differ diff --git a/testSet/3D/img/3D-_time11-30-22237438.tiff b/testSet/3D/img/3D-_time11-30-22237438.tiff new file mode 100644 index 00000000..68bb1624 Binary files /dev/null and b/testSet/3D/img/3D-_time11-30-22237438.tiff differ diff --git a/testSet/3D/img/3D-_time11-30-39253788.tiff b/testSet/3D/img/3D-_time11-30-39253788.tiff new file mode 100644 index 00000000..be03b471 Binary files /dev/null and b/testSet/3D/img/3D-_time11-30-39253788.tiff differ diff --git a/testSet/3D/img/3D-_time11-30-55270099.tiff b/testSet/3D/img/3D-_time11-30-55270099.tiff new file mode 100644 index 00000000..634e2c69 Binary files /dev/null and b/testSet/3D/img/3D-_time11-30-55270099.tiff differ diff --git a/testSet/3D/img/3D-_time11-31-31306323.tiff b/testSet/3D/img/3D-_time11-31-31306323.tiff new file mode 100644 index 00000000..11d3b264 Binary files /dev/null and b/testSet/3D/img/3D-_time11-31-31306323.tiff differ diff --git a/testSet/3D/img/3D-_time11-31-47321810.tiff b/testSet/3D/img/3D-_time11-31-47321810.tiff new file mode 100644 index 00000000..08ab96f8 Binary files /dev/null and b/testSet/3D/img/3D-_time11-31-47321810.tiff differ diff --git a/testSet/3D/img/3D-_time11-32-00335464.tiff b/testSet/3D/img/3D-_time11-32-00335464.tiff new file mode 100644 index 00000000..c9f3b0d0 Binary files /dev/null and b/testSet/3D/img/3D-_time11-32-00335464.tiff differ diff --git a/testSet/3D/img/3D-_time11-32-15350072.tiff b/testSet/3D/img/3D-_time11-32-15350072.tiff new file mode 100644 index 00000000..7b23e1c3 Binary files /dev/null and b/testSet/3D/img/3D-_time11-32-15350072.tiff differ diff --git a/testSet/3D/img/3D-_time11-32-48382742.tiff b/testSet/3D/img/3D-_time11-32-48382742.tiff new file mode 100644 index 00000000..fe99198d Binary files /dev/null and b/testSet/3D/img/3D-_time11-32-48382742.tiff differ diff --git a/testSet/3D/img/3D-_time11-33-02397364.tiff b/testSet/3D/img/3D-_time11-33-02397364.tiff new file mode 100644 index 00000000..890fb2d2 Binary files /dev/null and b/testSet/3D/img/3D-_time11-33-02397364.tiff differ diff --git a/testSet/3D/img/3D-_time11-33-17412068.tiff b/testSet/3D/img/3D-_time11-33-17412068.tiff new file mode 100644 index 00000000..efbe216d Binary files /dev/null and b/testSet/3D/img/3D-_time11-33-17412068.tiff differ diff --git a/testSet/3D/img/3D-_time11-33-31426605.tiff b/testSet/3D/img/3D-_time11-33-31426605.tiff new file mode 100644 index 00000000..bfb12dea Binary files /dev/null and b/testSet/3D/img/3D-_time11-33-31426605.tiff differ diff --git a/testSet/3D/img/3D-_time11-33-45440402.tiff b/testSet/3D/img/3D-_time11-33-45440402.tiff new file mode 100644 index 00000000..7dca8635 Binary files /dev/null and b/testSet/3D/img/3D-_time11-33-45440402.tiff differ diff --git a/testSet/3D/img/3D-_time11-33-59454085.tiff b/testSet/3D/img/3D-_time11-33-59454085.tiff new file mode 100644 index 00000000..90046e48 Binary files /dev/null and b/testSet/3D/img/3D-_time11-33-59454085.tiff differ diff --git a/testSet/3D/img/3D-_time11-34-28483263.tiff b/testSet/3D/img/3D-_time11-34-28483263.tiff new file mode 100644 index 00000000..e2846562 Binary files /dev/null and b/testSet/3D/img/3D-_time11-34-28483263.tiff differ diff --git a/testSet/3D/img/3D-_time11-34-43498004.tiff b/testSet/3D/img/3D-_time11-34-43498004.tiff new file mode 100644 index 00000000..dc1b01dc Binary files /dev/null and b/testSet/3D/img/3D-_time11-34-43498004.tiff differ diff --git a/testSet/3D/img/3D-_time11-34-58513436.tiff b/testSet/3D/img/3D-_time11-34-58513436.tiff new file mode 100644 index 00000000..19fb69ae Binary files /dev/null and b/testSet/3D/img/3D-_time11-34-58513436.tiff differ diff --git a/testSet/3D/结果图_ng/01.jpg b/testSet/3D/结果图_ng/01.jpg new file mode 100644 index 00000000..aae40331 Binary files /dev/null and b/testSet/3D/结果图_ng/01.jpg differ diff --git a/testSet/3D/结果图_ng/101.jpg b/testSet/3D/结果图_ng/101.jpg new file mode 100644 index 00000000..eb9d4e86 Binary files /dev/null and b/testSet/3D/结果图_ng/101.jpg differ diff --git a/testSet/3D/结果图_ng/11.jpg b/testSet/3D/结果图_ng/11.jpg new file mode 100644 index 00000000..a34f438f Binary files /dev/null and b/testSet/3D/结果图_ng/11.jpg differ diff --git a/testSet/3D/结果图_ng/111.jpg b/testSet/3D/结果图_ng/111.jpg new file mode 100644 index 00000000..afa9d815 Binary files /dev/null and b/testSet/3D/结果图_ng/111.jpg differ diff --git a/testSet/3D/结果图_ng/121.jpg b/testSet/3D/结果图_ng/121.jpg new file mode 100644 index 00000000..eaada823 Binary files /dev/null and b/testSet/3D/结果图_ng/121.jpg differ diff --git a/testSet/3D/结果图_ng/131.jpg b/testSet/3D/结果图_ng/131.jpg new file mode 100644 index 00000000..a5226ae7 Binary files /dev/null and b/testSet/3D/结果图_ng/131.jpg differ diff --git a/testSet/3D/结果图_ng/141.jpg b/testSet/3D/结果图_ng/141.jpg new file mode 100644 index 00000000..d61f12a3 Binary files /dev/null and b/testSet/3D/结果图_ng/141.jpg differ diff --git a/testSet/3D/结果图_ng/151.jpg b/testSet/3D/结果图_ng/151.jpg new file mode 100644 index 00000000..dbb9cb05 Binary files /dev/null and b/testSet/3D/结果图_ng/151.jpg differ diff --git a/testSet/3D/结果图_ng/161.jpg b/testSet/3D/结果图_ng/161.jpg new file mode 100644 index 00000000..e80fea19 Binary files /dev/null and b/testSet/3D/结果图_ng/161.jpg differ diff --git a/testSet/3D/结果图_ng/171.jpg b/testSet/3D/结果图_ng/171.jpg new file mode 100644 index 00000000..d4308d6a Binary files /dev/null and b/testSet/3D/结果图_ng/171.jpg differ diff --git a/testSet/3D/结果图_ng/181.jpg b/testSet/3D/结果图_ng/181.jpg new file mode 100644 index 00000000..7183bce0 Binary files /dev/null and b/testSet/3D/结果图_ng/181.jpg differ diff --git a/testSet/3D/结果图_ng/191.jpg b/testSet/3D/结果图_ng/191.jpg new file mode 100644 index 00000000..d926e72b Binary files /dev/null and b/testSet/3D/结果图_ng/191.jpg differ diff --git a/testSet/3D/结果图_ng/201.jpg b/testSet/3D/结果图_ng/201.jpg new file mode 100644 index 00000000..8b611d01 Binary files /dev/null and b/testSet/3D/结果图_ng/201.jpg differ diff --git a/testSet/3D/结果图_ng/21.jpg b/testSet/3D/结果图_ng/21.jpg new file mode 100644 index 00000000..8bf24076 Binary files /dev/null and b/testSet/3D/结果图_ng/21.jpg differ diff --git a/testSet/3D/结果图_ng/211.jpg b/testSet/3D/结果图_ng/211.jpg new file mode 100644 index 00000000..3a8b9f2b Binary files /dev/null and b/testSet/3D/结果图_ng/211.jpg differ diff --git a/testSet/3D/结果图_ng/221.jpg b/testSet/3D/结果图_ng/221.jpg new file mode 100644 index 00000000..8b65b72f Binary files /dev/null and b/testSet/3D/结果图_ng/221.jpg differ diff --git a/testSet/3D/结果图_ng/231.jpg b/testSet/3D/结果图_ng/231.jpg new file mode 100644 index 00000000..22870781 Binary files /dev/null and b/testSet/3D/结果图_ng/231.jpg differ diff --git a/testSet/3D/结果图_ng/241.jpg b/testSet/3D/结果图_ng/241.jpg new file mode 100644 index 00000000..485651a7 Binary files /dev/null and b/testSet/3D/结果图_ng/241.jpg differ diff --git a/testSet/3D/结果图_ng/251.jpg b/testSet/3D/结果图_ng/251.jpg new file mode 100644 index 00000000..ceb2e3f5 Binary files /dev/null and b/testSet/3D/结果图_ng/251.jpg differ diff --git a/testSet/3D/结果图_ng/261.jpg b/testSet/3D/结果图_ng/261.jpg new file mode 100644 index 00000000..c192542a Binary files /dev/null and b/testSet/3D/结果图_ng/261.jpg differ diff --git a/testSet/3D/结果图_ng/31.jpg b/testSet/3D/结果图_ng/31.jpg new file mode 100644 index 00000000..52a1456b Binary files /dev/null and b/testSet/3D/结果图_ng/31.jpg differ diff --git a/testSet/3D/结果图_ng/41.jpg b/testSet/3D/结果图_ng/41.jpg new file mode 100644 index 00000000..14e0670c Binary files /dev/null and b/testSet/3D/结果图_ng/41.jpg differ diff --git a/testSet/3D/结果图_ng/51.jpg b/testSet/3D/结果图_ng/51.jpg new file mode 100644 index 00000000..f06536a3 Binary files /dev/null and b/testSet/3D/结果图_ng/51.jpg differ diff --git a/testSet/3D/结果图_ng/61.jpg b/testSet/3D/结果图_ng/61.jpg new file mode 100644 index 00000000..e662b9db Binary files /dev/null and b/testSet/3D/结果图_ng/61.jpg differ diff --git a/testSet/3D/结果图_ng/71.jpg b/testSet/3D/结果图_ng/71.jpg new file mode 100644 index 00000000..c0b2d854 Binary files /dev/null and b/testSet/3D/结果图_ng/71.jpg differ diff --git a/testSet/3D/结果图_ng/81.jpg b/testSet/3D/结果图_ng/81.jpg new file mode 100644 index 00000000..79402663 Binary files /dev/null and b/testSet/3D/结果图_ng/81.jpg differ diff --git a/testSet/3D/结果图_ng/91.jpg b/testSet/3D/结果图_ng/91.jpg new file mode 100644 index 00000000..7c9cf765 Binary files /dev/null and b/testSet/3D/结果图_ng/91.jpg differ diff --git a/testSet/3D/结果图_ok/0.jpg b/testSet/3D/结果图_ok/0.jpg new file mode 100644 index 00000000..484f8630 Binary files /dev/null and b/testSet/3D/结果图_ok/0.jpg differ diff --git a/testSet/3D/结果图_ok/1.jpg b/testSet/3D/结果图_ok/1.jpg new file mode 100644 index 00000000..96e626bb Binary files /dev/null and b/testSet/3D/结果图_ok/1.jpg differ diff --git a/testSet/3D/结果图_ok/10.jpg b/testSet/3D/结果图_ok/10.jpg new file mode 100644 index 00000000..8355fe97 Binary files /dev/null and b/testSet/3D/结果图_ok/10.jpg differ diff --git a/testSet/3D/结果图_ok/11.jpg b/testSet/3D/结果图_ok/11.jpg new file mode 100644 index 00000000..8014ed6e Binary files /dev/null and b/testSet/3D/结果图_ok/11.jpg differ diff --git a/testSet/3D/结果图_ok/12.jpg b/testSet/3D/结果图_ok/12.jpg new file mode 100644 index 00000000..e42658fe Binary files /dev/null and b/testSet/3D/结果图_ok/12.jpg differ diff --git a/testSet/3D/结果图_ok/13.jpg b/testSet/3D/结果图_ok/13.jpg new file mode 100644 index 00000000..2a746b42 Binary files /dev/null and b/testSet/3D/结果图_ok/13.jpg differ diff --git a/testSet/3D/结果图_ok/14.jpg b/testSet/3D/结果图_ok/14.jpg new file mode 100644 index 00000000..6f121650 Binary files /dev/null and b/testSet/3D/结果图_ok/14.jpg differ diff --git a/testSet/3D/结果图_ok/15.jpg b/testSet/3D/结果图_ok/15.jpg new file mode 100644 index 00000000..b4402ae4 Binary files /dev/null and b/testSet/3D/结果图_ok/15.jpg differ diff --git a/testSet/3D/结果图_ok/2.jpg b/testSet/3D/结果图_ok/2.jpg new file mode 100644 index 00000000..833b47cd Binary files /dev/null and b/testSet/3D/结果图_ok/2.jpg differ diff --git a/testSet/3D/结果图_ok/3.jpg b/testSet/3D/结果图_ok/3.jpg new file mode 100644 index 00000000..2e2b644c Binary files /dev/null and b/testSet/3D/结果图_ok/3.jpg differ diff --git a/testSet/3D/结果图_ok/4.jpg b/testSet/3D/结果图_ok/4.jpg new file mode 100644 index 00000000..23ca0b12 Binary files /dev/null and b/testSet/3D/结果图_ok/4.jpg differ diff --git a/testSet/3D/结果图_ok/5.jpg b/testSet/3D/结果图_ok/5.jpg new file mode 100644 index 00000000..ce90601e Binary files /dev/null and b/testSet/3D/结果图_ok/5.jpg differ diff --git a/testSet/3D/结果图_ok/6.jpg b/testSet/3D/结果图_ok/6.jpg new file mode 100644 index 00000000..bb1df65f Binary files /dev/null and b/testSet/3D/结果图_ok/6.jpg differ diff --git a/testSet/3D/结果图_ok/7.jpg b/testSet/3D/结果图_ok/7.jpg new file mode 100644 index 00000000..70f32d97 Binary files /dev/null and b/testSet/3D/结果图_ok/7.jpg differ diff --git a/testSet/3D/结果图_ok/8.jpg b/testSet/3D/结果图_ok/8.jpg new file mode 100644 index 00000000..e99bf0bc Binary files /dev/null and b/testSet/3D/结果图_ok/8.jpg differ diff --git a/testSet/3D/结果图_ok/9.jpg b/testSet/3D/结果图_ok/9.jpg new file mode 100644 index 00000000..fd94499b Binary files /dev/null and b/testSet/3D/结果图_ok/9.jpg differ