diff --git a/Tongue extraction_cropresizemethod/Tongue extraction.sln b/Tongue extraction_cropresizemethod/Tongue extraction.sln index 569a900..e79838b 100644 --- a/Tongue extraction_cropresizemethod/Tongue extraction.sln +++ b/Tongue extraction_cropresizemethod/Tongue extraction.sln @@ -3,11 +3,7 @@ # Visual Studio Version 16 VisualStudioVersion = 16.0.30011.22 MinimumVisualStudioVersion = 10.0.40219.1 -<<<<<<< Updated upstream -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeepTongue1.6", "Tongue extraction\DeepTongue1.6.csproj", "{AFD610B1-8D23-423A-AA0F-B09BA769BDD7}" -======= -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeepTongue1.7", "Tongue extraction\DeepTongue1.7.csproj", "{D382F9E7-A41D-4D82-A59B-CF4095134D6B}" ->>>>>>> Stashed changes +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DeepTongue1.7", "Tongue extraction\DeepTongue1.7.csproj", "{AFD610B1-8D23-423A-AA0F-B09BA769BDD7}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -30,10 +26,6 @@ HideSolutionNode = FALSE EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution -<<<<<<< Updated upstream - SolutionGuid = {C60F769D-7539-436D-9117-B35E6195FC86} -======= SolutionGuid = {33F6C697-859B-4D55-9D28-998267FD09AE} ->>>>>>> Stashed changes EndGlobalSection EndGlobal diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/DeepTongue1.6.csproj b/Tongue extraction_cropresizemethod/Tongue extraction/DeepTongue1.6.csproj deleted file mode 100644 index d0f0360..0000000 --- a/Tongue extraction_cropresizemethod/Tongue extraction/DeepTongue1.6.csproj +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - Debug - AnyCPU - {AFD610B1-8D23-423A-AA0F-B09BA769BDD7} - WinExe - Properties - Tongue_extraction - DeepTongue1.6 - v4.7.1 - 512 - true - - - - publish\ - true - Disk - false - Foreground - 7 - Days - false - false - true - 0 - 1.0.0.%2a - false - false - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - true - bin\x64\Debug\ - DEBUG;TRACE - full - x64 - prompt - MinimumRecommendedRules.ruleset - true - - - bin\x64\Release\ - TRACE - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - true - - - DeepTongue_Icon.ico - - - - Form - - - Form1.cs - - - - - - Form1.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - - SettingsSingleFileGenerator - - - - - - - - - - - - - - - False - Microsoft .NET Framework 4.7.1 %28x86 および x64%29 - true - - - False - .NET Framework 3.5 SP1 - false - - - - - False - ..\..\..\packages\OpenCvSharp3-AnyCPU.3.2.0.20170107\lib\net40\OpenCvSharp.dll - - - False - ..\..\..\packages\OpenCvSharp3-AnyCPU.3.2.0.20170107\lib\net40\OpenCvSharp.Blob.dll - - - False - ..\..\..\packages\OpenCvSharp3-AnyCPU.3.2.0.20170107\lib\net40\OpenCvSharp.Extensions.dll - - - ..\..\..\packages\OpenCvSharp3-AnyCPU.3.2.0.20170107\lib\net40\OpenCvSharp.UserInterface.dll - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.1\System.dll - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.1\System.ComponentModel.Composition.dll - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.1\System.ComponentModel.Composition.Registration.dll - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.1\System.ComponentModel.DataAnnotations.dll - - - - - - - - - - C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.1\System.Reflection.Context.dll - - - ..\..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll - - - - - False - ..\..\..\packages\TensorFlowSharp.1.11.0\lib\net471\TensorFlowSharp.dll - - - - - - このプロジェクトは、このコンピューター上にない NuGet パッケージを参照しています。それらのパッケージをダウンロードするには、[NuGet パッケージの復元] を使用します。詳細については、http://go.microsoft.com/fwlink/?LinkID=322105 を参照してください。見つからないファイルは {0} です。 - - - - - - - \ No newline at end of file diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/DeepTongue1.7.csproj b/Tongue extraction_cropresizemethod/Tongue extraction/DeepTongue1.7.csproj new file mode 100644 index 0000000..d0f0360 --- /dev/null +++ b/Tongue extraction_cropresizemethod/Tongue extraction/DeepTongue1.7.csproj @@ -0,0 +1,191 @@ + + + + + + Debug + AnyCPU + {AFD610B1-8D23-423A-AA0F-B09BA769BDD7} + WinExe + Properties + Tongue_extraction + DeepTongue1.6 + v4.7.1 + 512 + true + + + + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + bin\x64\Debug\ + DEBUG;TRACE + full + x64 + prompt + MinimumRecommendedRules.ruleset + true + + + bin\x64\Release\ + TRACE + true + pdbonly + x64 + prompt + MinimumRecommendedRules.ruleset + true + + + DeepTongue_Icon.ico + + + + Form + + + Form1.cs + + + + + + Form1.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + True + + + + SettingsSingleFileGenerator + + + + + + + + + + + + + + + False + Microsoft .NET Framework 4.7.1 %28x86 および x64%29 + true + + + False + .NET Framework 3.5 SP1 + false + + + + + False + ..\..\..\packages\OpenCvSharp3-AnyCPU.3.2.0.20170107\lib\net40\OpenCvSharp.dll + + + False + ..\..\..\packages\OpenCvSharp3-AnyCPU.3.2.0.20170107\lib\net40\OpenCvSharp.Blob.dll + + + False + ..\..\..\packages\OpenCvSharp3-AnyCPU.3.2.0.20170107\lib\net40\OpenCvSharp.Extensions.dll + + + ..\..\..\packages\OpenCvSharp3-AnyCPU.3.2.0.20170107\lib\net40\OpenCvSharp.UserInterface.dll + + + C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.1\System.dll + + + C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.1\System.ComponentModel.Composition.dll + + + C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.1\System.ComponentModel.Composition.Registration.dll + + + C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.1\System.ComponentModel.DataAnnotations.dll + + + + + + + + + + C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\.NETFramework\v4.7.1\System.Reflection.Context.dll + + + ..\..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll + + + + + False + ..\..\..\packages\TensorFlowSharp.1.11.0\lib\net471\TensorFlowSharp.dll + + + + + + このプロジェクトは、このコンピューター上にない NuGet パッケージを参照しています。それらのパッケージをダウンロードするには、[NuGet パッケージの復元] を使用します。詳細については、http://go.microsoft.com/fwlink/?LinkID=322105 を参照してください。見つからないファイルは {0} です。 + + + + + + + \ No newline at end of file diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/extraction/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/extraction/20180419045627.jpg index 53e374e..459eb3f 100644 --- a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/extraction/20180419045627.jpg +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/extraction/20180419045627.jpg Binary files differ diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask/20180419045627.jpg index f5430f5..e9b4341 100644 --- a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask/20180419045627.jpg +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask/20180419045627.jpg Binary files differ diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask_changed1/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask_changed1/20180419045627.jpg index a87c0ef..96e7356 100644 --- a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask_changed1/20180419045627.jpg +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask_changed1/20180419045627.jpg Binary files differ diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask_changed2/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask_changed2/20180419045627.jpg index 552f515..52fa307 100644 --- a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask_changed2/20180419045627.jpg +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/mask_changed2/20180419045627.jpg Binary files differ diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/extraction/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/extraction/20180419045627.jpg index 459eb3f..faea801 100644 --- a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/extraction/20180419045627.jpg +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/extraction/20180419045627.jpg Binary files differ diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/mask/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/mask/20180419045627.jpg index 7187af5..87f2fe0 100644 --- a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/mask/20180419045627.jpg +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/mask/20180419045627.jpg Binary files differ diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/mask_changed1/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/mask_changed1/20180419045627.jpg index dc5a070..251969f 100644 --- a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/mask_changed1/20180419045627.jpg +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/mask_changed1/20180419045627.jpg Binary files differ diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/mask_changed2/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/mask_changed2/20180419045627.jpg index 4f5fb59..7efd455 100644 --- a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/mask_changed2/20180419045627.jpg +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/mask_changed2/20180419045627.jpg Binary files differ