diff --git a/WasteSorting.pro.user b/WasteSorting.pro.user index 8a3fb8e..52829ca 100644 --- a/WasteSorting.pro.user +++ b/WasteSorting.pro.user @@ -1,10 +1,10 @@ - + EnvironmentId - {d7c6f6ed-3661-4448-b394-a20f7ac693ed} + {1d871142-4540-43ee-bc49-e59c0efe1a69} ProjectExplorer.Project.ActiveTarget @@ -55,26 +55,26 @@ ProjectExplorer.Project.PluginSettings - - -fno-delayed-template-parsing - + true ProjectExplorer.Project.Target.0 - Desktop Qt 5.14.2 MSVC2017 64bit - Desktop Qt 5.14.2 MSVC2017 64bit - qt.qt5.5142.win64_msvc2017_64_kit + 桌面 + 桌面 + {ff17dd35-b21c-4987-9b8a-2fd992b8e5f7} 1 0 0 - C:/Users/14121/Desktop/WasteSorting/build-WasteSorting-Desktop_Qt_5_14_2_MSVC2017_64bit-Debug + /home/pi/build-WasteSorting-unknown-Debug true + qmake + QtProjectManager.QMakeBuildStep true @@ -84,6 +84,8 @@ true + Make + Qt4ProjectManager.MakeStep false @@ -93,12 +95,14 @@ 2 Build - Build + ProjectExplorer.BuildSteps.Build true + Make + Qt4ProjectManager.MakeStep true @@ -108,225 +112,36 @@ 1 Clean - Clean + ProjectExplorer.BuildSteps.Clean 2 false + Debug Debug Qt4ProjectManager.Qt4BuildConfiguration 2 + true - C:/Users/14121/Desktop/build-WasteSorting-Desktop_Qt_5_14_2_MSVC2017_64bit-Release + /home/pi/build-WasteSorting-unknown-Release true + qmake + QtProjectManager.QMakeBuildStep false false false - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - - C:/Users/14121/Desktop/WasteSorting/build-WasteSorting-Desktop_Qt_5_14_2_MSVC2017_64bit-Profile - - - true - QtProjectManager.QMakeBuildStep - true - - false - true - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Profile - Qt4ProjectManager.Qt4BuildConfiguration - 0 - - 3 - - - 0 - Deploy - Deploy - ProjectExplorer.BuildSteps.Deploy - - 1 - ProjectExplorer.DefaultDeployConfiguration - - 1 - - - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 - false - false - 1000 - - true - - false - false - false - false - true - 0.01 - 10 - true - kcachegrind - 1 - 25 - - 1 - true - false - true - valgrind - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - 2 - - Qt4ProjectManager.Qt4RunConfiguration:D:/WasteSorting/WasteSorting.pro - D:/WasteSorting/WasteSorting.pro - - false - - false - true - true - false - false - true - - C:/Users/14121/Desktop/build-WasteSorting-Desktop_Qt_5_14_2_MSVC2017_64bit-Release - - 1 - - - - ProjectExplorer.Project.Target.1 - - Desktop Qt 5.14.2 MSVC2017 32bit - Desktop Qt 5.14.2 MSVC2017 32bit - qt.qt5.5142.win32_msvc2017_kit - 0 - 0 - 0 - - C:/Users/14121/Desktop/WasteSorting/build-WasteSorting-Desktop_Qt_5_14_2_MSVC2017_32bit-Debug - - - true - QtProjectManager.QMakeBuildStep - true - - false - false false true + Make + Qt4ProjectManager.MakeStep false @@ -336,12 +151,14 @@ 2 Build - Build + ProjectExplorer.BuildSteps.Build true + Make + Qt4ProjectManager.MakeStep true @@ -351,78 +168,36 @@ 1 Clean - Clean - ProjectExplorer.BuildSteps.Clean - - 2 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - - - C:/Users/14121/Desktop/WasteSorting/build-WasteSorting-Desktop_Qt_5_14_2_MSVC2017_32bit-Release - - - true - QtProjectManager.QMakeBuildStep - false - - false - false - true - - - true - Qt4ProjectManager.MakeStep - - false - - - false - - 2 - Build - Build - ProjectExplorer.BuildSteps.Build - - - - true - Qt4ProjectManager.MakeStep - - true - clean - - false - - 1 - Clean - Clean + ProjectExplorer.BuildSteps.Clean 2 false + Release Release Qt4ProjectManager.Qt4BuildConfiguration 0 + true - C:/Users/14121/Desktop/WasteSorting/build-WasteSorting-Desktop_Qt_5_14_2_MSVC2017_32bit-Profile + /home/pi/build-WasteSorting-unknown-Profile true + qmake + QtProjectManager.QMakeBuildStep true false true - true + false true + Make + Qt4ProjectManager.MakeStep false @@ -432,12 +207,14 @@ 2 Build - Build + ProjectExplorer.BuildSteps.Build true + Make + Qt4ProjectManager.MakeStep true @@ -447,47 +224,34 @@ 1 Clean - Clean + ProjectExplorer.BuildSteps.Clean 2 false + Profile Profile Qt4ProjectManager.Qt4BuildConfiguration 0 + true 3 0 - Deploy - Deploy + 部署 + ProjectExplorer.BuildSteps.Deploy 1 + Deploy Configuration + ProjectExplorer.DefaultDeployConfiguration 1 - dwarf - - cpu-cycles - - - 250 - - -e - cpu-cycles - --call-graph - dwarf,4096 - -F - 250 - - -F - true - 4096 false false 1000 @@ -502,7 +266,6 @@ 0.01 10 true - kcachegrind 1 25 @@ -530,33 +293,34 @@ 2 - - ProjectExplorer.CustomExecutableRunConfiguration - + WasteSorting + + Qt4ProjectManager.Qt4RunConfiguration:/home/pi/WasteSorting/WasteSorting.pro + WasteSorting.pro - false - + 3768 false true + true false false true - + /home/pi/build-WasteSorting-unknown-Release 1 ProjectExplorer.Project.TargetCount - 2 + 1 ProjectExplorer.Project.Updater.FileVersion - 22 + 20 Version - 22 + 20 diff --git a/tensorflow/model.tflite b/tensorflow/model.tflite index a87bf41..d52a631 100644 Binary files a/tensorflow/model.tflite and b/tensorflow/model.tflite differ diff --git a/tensorflow/project.tm b/tensorflow/project.tm index a4e0bbc..0dfc771 100644 Binary files a/tensorflow/project.tm and b/tensorflow/project.tm differ