diff --git a/.gitignore b/.gitignore index 762aa9b..5f072cf 100644 --- a/.gitignore +++ b/.gitignore @@ -19,16 +19,12 @@ *.ilk *.log *.zip -*.jpg -!20180419045627.jpg *.opensdf *.filters -[Dd]ebug*/ *.lib *.sbr Thumbs.db [Ll]ib/ -[Rr]elease*/ [Tt]est[Rr]esults/ _UpgradeReport_Files/ _ReSharper.*/ @@ -47,3 +43,10 @@ *.ide/ *.ide-wal Tongue extraction_cropresizemethod/packages/ + +*.txt +*.CopyComplete +*.force +*.resources +*.xml +*.config diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/DeepTongue1.6.csproj b/Tongue extraction_cropresizemethod/Tongue extraction/DeepTongue1.6.csproj index acea616..f1b098b 100644 --- a/Tongue extraction_cropresizemethod/Tongue extraction/DeepTongue1.6.csproj +++ b/Tongue extraction_cropresizemethod/Tongue extraction/DeepTongue1.6.csproj @@ -75,50 +75,6 @@ DeepTongue_Icon.ico - - ..\packages\OpenCvSharp3-AnyCPU.3.2.0.20170107\lib\net40\OpenCvSharp.dll - True - - - ..\packages\OpenCvSharp3-AnyCPU.3.2.0.20170107\lib\net40\OpenCvSharp.Blob.dll - True - - - ..\packages\OpenCvSharp3-AnyCPU.3.2.0.20170107\lib\net40\OpenCvSharp.Extensions.dll - True - - - ..\packages\OpenCvSharp3-AnyCPU.3.2.0.20170107\lib\net40\OpenCvSharp.UserInterface.dll - True - - - - - - - ..\packages\System.Management.dll.1.0.0\lib\System.Management.dll - True - - - ..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll - True - - - - - - - - - - - - ..\packages\TensorFlowSharp.1.11.0\lib\net471\TensorFlowSharp.dll - True - - - - Form @@ -143,19 +99,17 @@ SettingsSingleFileGenerator - Settings.Designer.cs - - True - Settings.settings - True - + + Always + + @@ -169,6 +123,45 @@ false + + + ..\..\..\..\..\..\system\sdk\OpenCVsharp\net461\OpenCvSharp.dll + + + ..\..\..\..\..\..\system\sdk\OpenCVsharp\net461\OpenCvSharp.Blob.dll + + + ..\..\..\..\..\..\system\sdk\OpenCVsharp\net461\OpenCvSharp.Extensions.dll + + + ..\..\..\..\..\..\system\sdk\OpenCVsharp\net461\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 + + + + + ..\..\..\packages\TensorFlowSharp.1.11.0\lib\net471\TensorFlowSharp.dll + + diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/Form1.Designer.cs b/Tongue extraction_cropresizemethod/Tongue extraction/Form1.Designer.cs index d637bde..d00ddbb 100644 --- a/Tongue extraction_cropresizemethod/Tongue extraction/Form1.Designer.cs +++ b/Tongue extraction_cropresizemethod/Tongue extraction/Form1.Designer.cs @@ -356,7 +356,7 @@ this.button_pause.TabIndex = 0; this.button_pause.Text = "Pause"; this.button_pause.UseVisualStyleBackColor = true; - this.button_pause.Click += new System.EventHandler(this.button_pause_Click); + this.button_pause.Click += new System.EventHandler(this.Button_pause_Click); // // backgroundWorker1 // diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/Form1.cs b/Tongue extraction_cropresizemethod/Tongue extraction/Form1.cs index 6cfcc86..45342f4 100644 --- a/Tongue extraction_cropresizemethod/Tongue extraction/Form1.cs +++ b/Tongue extraction_cropresizemethod/Tongue extraction/Form1.cs @@ -643,7 +643,7 @@ //} RemoveSmallRegion(basepath + "\\output256" + imageFile, basepath + "\\mask_changed1" + imageFile, 2000, 1, 1); RemoveSmallRegion(basepath + "\\mask_changed1" + imageFile, basepath + "\\mask_changed2" + imageFile, 2000, 0, 0); - mat_maskSRG = new Mat(basepath + "\\mask_changed2" + imageFile, ImreadModes.GrayScale); + mat_maskSRG = new Mat(basepath + "\\mask_changed2" + imageFile, ImreadModes.Grayscale); Cv2.Threshold(mat_maskSRG, mat_maskSRG, 128, 255, ThresholdTypes.Binary); bitmap_bitch = OpenCvSharp.Extensions.BitmapConverter.ToBitmap(mat_maskSRG); pictureBox_maskSRG.Image = bitmap_bitch; @@ -693,7 +693,7 @@ } } - private void button_pause_Click(object sender, EventArgs e) + private void Button_pause_Click(object sender, EventArgs e) { if (button_pause.Text == "Pause") { diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/Properties/Resources.Designer.cs b/Tongue extraction_cropresizemethod/Tongue extraction/Properties/Resources.Designer.cs index ce5fbbb..84d1885 100644 --- a/Tongue extraction_cropresizemethod/Tongue extraction/Properties/Resources.Designer.cs +++ b/Tongue extraction_cropresizemethod/Tongue extraction/Properties/Resources.Designer.cs @@ -1,10 +1,10 @@ //------------------------------------------------------------------------------ // -// このコードはツールによって生成されました。 -// ランタイム バージョン:4.0.30319.42000 +// This code was generated by a tool. +// Runtime Version:4.0.30319.42000 // -// このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 -// コードが再生成されるときに損失したりします。 +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. // //------------------------------------------------------------------------------ @@ -13,13 +13,13 @@ /// - /// ローカライズされた文字列などを検索するための、厳密に型指定されたリソース クラスです。 + /// A strongly-typed resource class, for looking up localized strings, etc. /// - // このクラスは StronglyTypedResourceBuilder クラスが ResGen - // または Visual Studio のようなツールを使用して自動生成されました。 - // メンバーを追加または削除するには、.ResX ファイルを編集して、/str オプションと共に - // ResGen を実行し直すか、または VS プロジェクトをビルドし直します。 - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")] + // This class was auto-generated by the StronglyTypedResourceBuilder + // class via a tool like ResGen or Visual Studio. + // To add or remove a member, edit your .ResX file then rerun ResGen + // with the /str option, or rebuild your VS project. + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -33,7 +33,7 @@ } /// - /// このクラスで使用されているキャッシュされた ResourceManager インスタンスを返します。 + /// Returns the cached ResourceManager instance used by this class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Resources.ResourceManager ResourceManager { @@ -47,8 +47,8 @@ } /// - /// 厳密に型指定されたこのリソース クラスを使用して、すべての検索リソースに対し、 - /// 現在のスレッドの CurrentUICulture プロパティをオーバーライドします。 + /// Overrides the current thread's CurrentUICulture property for all + /// resource lookups using this strongly typed resource class. /// [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] internal static global::System.Globalization.CultureInfo Culture { diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/Properties/Settings.Designer.cs b/Tongue extraction_cropresizemethod/Tongue extraction/Properties/Settings.Designer.cs deleted file mode 100644 index d8f3798..0000000 --- a/Tongue extraction_cropresizemethod/Tongue extraction/Properties/Settings.Designer.cs +++ /dev/null @@ -1,26 +0,0 @@ -//------------------------------------------------------------------------------ -// -// このコードはツールによって生成されました。 -// ランタイム バージョン:4.0.30319.42000 -// -// このファイルへの変更は、以下の状況下で不正な動作の原因になったり、 -// コードが再生成されるときに損失したりします。 -// -//------------------------------------------------------------------------------ - -namespace Tongue_extraction.Properties { - - - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { - - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - - public static Settings Default { - get { - return defaultInstance; - } - } - } -} diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/cropped/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/cropped/20180419045627.jpg new file mode 100644 index 0000000..f43b7ad --- /dev/null +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/cropped/20180419045627.jpg Binary files differ diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/cropresized/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/cropresized/20180419045627.jpg new file mode 100644 index 0000000..aafc381 --- /dev/null +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/cropresized/20180419045627.jpg Binary files differ diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/data/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/data/20180419045627.jpg new file mode 100644 index 0000000..d7d3375 --- /dev/null +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/data/20180419045627.jpg Binary files differ diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/detection/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/detection/20180419045627.jpg new file mode 100644 index 0000000..034c23b --- /dev/null +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/detection/20180419045627.jpg Binary files differ 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 new file mode 100644 index 0000000..53e374e --- /dev/null +++ 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 new file mode 100644 index 0000000..f90ef96 --- /dev/null +++ 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 new file mode 100644 index 0000000..181499c --- /dev/null +++ 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 new file mode 100644 index 0000000..f7d5b0e --- /dev/null +++ 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/Debug/output256/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/output256/20180419045627.jpg new file mode 100644 index 0000000..b29964a --- /dev/null +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/output256/20180419045627.jpg Binary files differ diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/output_changed1/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/output_changed1/20180419045627.jpg new file mode 100644 index 0000000..353282e --- /dev/null +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/output_changed1/20180419045627.jpg Binary files differ diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/output_changed2/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/output_changed2/20180419045627.jpg new file mode 100644 index 0000000..77ad378 --- /dev/null +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/output_changed2/20180419045627.jpg Binary files differ diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/output_resized/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/output_resized/20180419045627.jpg new file mode 100644 index 0000000..d2034d3 --- /dev/null +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Debug/output_resized/20180419045627.jpg Binary files differ diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/cropped/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/cropped/20180419045627.jpg new file mode 100644 index 0000000..f43b7ad --- /dev/null +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/cropped/20180419045627.jpg Binary files differ diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/cropresized/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/cropresized/20180419045627.jpg new file mode 100644 index 0000000..aafc381 --- /dev/null +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/cropresized/20180419045627.jpg Binary files differ diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/data/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/data/20180419045627.jpg new file mode 100644 index 0000000..d7d3375 --- /dev/null +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/data/20180419045627.jpg Binary files differ diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/detection/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/detection/20180419045627.jpg new file mode 100644 index 0000000..034c23b --- /dev/null +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/detection/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 new file mode 100644 index 0000000..53e374e --- /dev/null +++ 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 new file mode 100644 index 0000000..f90ef96 --- /dev/null +++ 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 new file mode 100644 index 0000000..181499c --- /dev/null +++ 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 new file mode 100644 index 0000000..f7d5b0e --- /dev/null +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/mask_changed2/20180419045627.jpg Binary files differ diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/output256/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/output256/20180419045627.jpg new file mode 100644 index 0000000..b29964a --- /dev/null +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/output256/20180419045627.jpg Binary files differ diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/output_changed1/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/output_changed1/20180419045627.jpg new file mode 100644 index 0000000..353282e --- /dev/null +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/output_changed1/20180419045627.jpg Binary files differ diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/output_changed2/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/output_changed2/20180419045627.jpg new file mode 100644 index 0000000..77ad378 --- /dev/null +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/output_changed2/20180419045627.jpg Binary files differ diff --git a/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/output_resized/20180419045627.jpg b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/output_resized/20180419045627.jpg new file mode 100644 index 0000000..d2034d3 --- /dev/null +++ b/Tongue extraction_cropresizemethod/Tongue extraction/bin/x64/Release/output_resized/20180419045627.jpg Binary files differ