From 2b003b17d13212274728cf63228bb32007f51ea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=80=E4=B8=AA=E5=A4=A7=E8=A5=BF=E7=93=9C?= <786744873@qq.com> Date: Tue, 10 Oct 2023 15:20:37 +0800 Subject: [PATCH] =?UTF-8?q?docs:=20=E6=96=87=E6=A1=A3=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9=20feat=EF=BC=9Aimage?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E5=8D=95=E7=8B=AC=E7=A7=BB=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- EasyTool.Core/EasyTool.Core.csproj | 11 ++-- .../EasyTool.EmitMapper.csproj | 2 +- EasyTool.Image/EasyTool.Image.csproj | 49 ++++++++++++++++++ .../ImageCategory/ImgExtension.cs | 0 .../ImageCategory/ImgUtil.cs | 0 .../EasyTool.ImageTests.csproj | 23 ++++++++ .../ImageCategory/ImageUtilTests.cs | 11 ++-- .../ImageCategory/Resources/mask.jpg | Bin .../ImageCategory/Resources/ori.jpg | Bin .../ImageCategory/Resources/result.jpg | Bin EasyTool.sln | 12 +++++ README.md | 4 +- 12 files changed, 97 insertions(+), 15 deletions(-) create mode 100644 EasyTool.Image/EasyTool.Image.csproj rename {EasyTool.Core => EasyTool.Image}/ImageCategory/ImgExtension.cs (100%) rename {EasyTool.Core => EasyTool.Image}/ImageCategory/ImgUtil.cs (100%) create mode 100644 EasyTool.ImageTests/EasyTool.ImageTests.csproj rename {EasyTool.CoreTests => EasyTool.ImageTests}/ImageCategory/ImageUtilTests.cs (72%) rename {EasyTool.CoreTests => EasyTool.ImageTests}/ImageCategory/Resources/mask.jpg (100%) rename {EasyTool.CoreTests => EasyTool.ImageTests}/ImageCategory/Resources/ori.jpg (100%) rename {EasyTool.CoreTests => EasyTool.ImageTests}/ImageCategory/Resources/result.jpg (100%) diff --git a/EasyTool.Core/EasyTool.Core.csproj b/EasyTool.Core/EasyTool.Core.csproj index a22eadf..821383f 100644 --- a/EasyTool.Core/EasyTool.Core.csproj +++ b/EasyTool.Core/EasyTool.Core.csproj @@ -12,7 +12,7 @@ A open source C# tool to make .NET easy Tool Power - https://github.com/786744873/easytool + https://github.com/dotnet-easy/easytool https://easy-dotnet.com README.md LICENSE @@ -35,11 +35,10 @@ - - - - - + + + + diff --git a/EasyTool.EmitMapper/EasyTool.EmitMapper.csproj b/EasyTool.EmitMapper/EasyTool.EmitMapper.csproj index 854b61d..0996f96 100644 --- a/EasyTool.EmitMapper/EasyTool.EmitMapper.csproj +++ b/EasyTool.EmitMapper/EasyTool.EmitMapper.csproj @@ -12,7 +12,7 @@ A open source C# tool to make .NET easy Tool Power - https://github.com/786744873/easytool + https://github.com/dotnet-easy/easytool https://easy-dotnet.com README.md LICENSE diff --git a/EasyTool.Image/EasyTool.Image.csproj b/EasyTool.Image/EasyTool.Image.csproj new file mode 100644 index 0000000..6a444e4 --- /dev/null +++ b/EasyTool.Image/EasyTool.Image.csproj @@ -0,0 +1,49 @@ + + + + netstandard2.1;.net6.0 + 11 + enable + $(MSBuildProjectName.Replace(" ", "_").Replace(".Core", "")) + + 一个大西瓜,TimChen + 2023.0908.1 + + A open source C# tool to make .NET easy + + Tool Power + https://github.com/dotnet-easy/easytool + https://easy-dotnet.com + README.md + LICENSE + logo.png + + + + + True + \ + + + True + \ + + + True + \ + + + + + + + + + + + True + \ + + + + diff --git a/EasyTool.Core/ImageCategory/ImgExtension.cs b/EasyTool.Image/ImageCategory/ImgExtension.cs similarity index 100% rename from EasyTool.Core/ImageCategory/ImgExtension.cs rename to EasyTool.Image/ImageCategory/ImgExtension.cs diff --git a/EasyTool.Core/ImageCategory/ImgUtil.cs b/EasyTool.Image/ImageCategory/ImgUtil.cs similarity index 100% rename from EasyTool.Core/ImageCategory/ImgUtil.cs rename to EasyTool.Image/ImageCategory/ImgUtil.cs diff --git a/EasyTool.ImageTests/EasyTool.ImageTests.csproj b/EasyTool.ImageTests/EasyTool.ImageTests.csproj new file mode 100644 index 0000000..4c22132 --- /dev/null +++ b/EasyTool.ImageTests/EasyTool.ImageTests.csproj @@ -0,0 +1,23 @@ + + + + net6.0 + enable + enable + + false + true + + + + + + + + + + + + + + diff --git a/EasyTool.CoreTests/ImageCategory/ImageUtilTests.cs b/EasyTool.ImageTests/ImageCategory/ImageUtilTests.cs similarity index 72% rename from EasyTool.CoreTests/ImageCategory/ImageUtilTests.cs rename to EasyTool.ImageTests/ImageCategory/ImageUtilTests.cs index bf27115..76b1ec2 100644 --- a/EasyTool.CoreTests/ImageCategory/ImageUtilTests.cs +++ b/EasyTool.ImageTests/ImageCategory/ImageUtilTests.cs @@ -1,6 +1,5 @@ -using System.Drawing; - -using Microsoft.VisualStudio.TestTools.UnitTesting; +using Microsoft.VisualStudio.TestTools.UnitTesting; +using System.Drawing; namespace EasyTool.CoreTests.ImageCategory { @@ -14,8 +13,8 @@ public class ImageUtilTests [TestMethod] public void MaskImageTest() { - Image ori = new Bitmap(@"C:\Desktop\ori.jpg"); - Image mask = new Bitmap(@"C:\Desktop\mask.jpg"); + Image ori = new Bitmap(Path.Combine(Environment.CurrentDirectory.Split("bin")[0], "ImageCategory","Resources","ori.jpg")); + Image mask = new Bitmap(Path.Combine(Environment.CurrentDirectory.Split("bin")[0], "ImageCategory", "Resources", "mask.jpg")); Console.WriteLine($"ori-width:{ori.Width} | ori-height:{ori.Height}"); Console.WriteLine($"mask-width:{mask.Width} | mask-height:{mask.Height}"); @@ -23,7 +22,7 @@ public void MaskImageTest() Image result = ImgUtil.MaskImage(mask, ori); Console.WriteLine($"result-width:{mask.Width} | result-height:{mask.Height}"); - result.Save(@"C:\Desktop\result.jpg"); + result.Save(Path.Combine(Environment.CurrentDirectory.Split("bin")[0], "ImageCategory", "Resources", "result.jpg")); } [TestMethod] diff --git a/EasyTool.CoreTests/ImageCategory/Resources/mask.jpg b/EasyTool.ImageTests/ImageCategory/Resources/mask.jpg similarity index 100% rename from EasyTool.CoreTests/ImageCategory/Resources/mask.jpg rename to EasyTool.ImageTests/ImageCategory/Resources/mask.jpg diff --git a/EasyTool.CoreTests/ImageCategory/Resources/ori.jpg b/EasyTool.ImageTests/ImageCategory/Resources/ori.jpg similarity index 100% rename from EasyTool.CoreTests/ImageCategory/Resources/ori.jpg rename to EasyTool.ImageTests/ImageCategory/Resources/ori.jpg diff --git a/EasyTool.CoreTests/ImageCategory/Resources/result.jpg b/EasyTool.ImageTests/ImageCategory/Resources/result.jpg similarity index 100% rename from EasyTool.CoreTests/ImageCategory/Resources/result.jpg rename to EasyTool.ImageTests/ImageCategory/Resources/result.jpg diff --git a/EasyTool.sln b/EasyTool.sln index 60f869c..d51f761 100644 --- a/EasyTool.sln +++ b/EasyTool.sln @@ -19,6 +19,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyTool.NPOI", "EasyTool.N EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyTool.NPOITests", "EasyTool.NPOITests\EasyTool.NPOITests.csproj", "{7AC7EC2E-003E-49E7-8124-09B88C8F8A49}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyTool.Image", "EasyTool.Image\EasyTool.Image.csproj", "{F7AEE692-A41F-4B64-A659-B3F92EA03429}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EasyTool.ImageTests", "EasyTool.ImageTests\EasyTool.ImageTests.csproj", "{09E30ABC-1F36-4D65-8416-AF7C5C75DA65}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -57,6 +61,14 @@ Global {7AC7EC2E-003E-49E7-8124-09B88C8F8A49}.Debug|Any CPU.Build.0 = Debug|Any CPU {7AC7EC2E-003E-49E7-8124-09B88C8F8A49}.Release|Any CPU.ActiveCfg = Release|Any CPU {7AC7EC2E-003E-49E7-8124-09B88C8F8A49}.Release|Any CPU.Build.0 = Release|Any CPU + {F7AEE692-A41F-4B64-A659-B3F92EA03429}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F7AEE692-A41F-4B64-A659-B3F92EA03429}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F7AEE692-A41F-4B64-A659-B3F92EA03429}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F7AEE692-A41F-4B64-A659-B3F92EA03429}.Release|Any CPU.Build.0 = Release|Any CPU + {09E30ABC-1F36-4D65-8416-AF7C5C75DA65}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {09E30ABC-1F36-4D65-8416-AF7C5C75DA65}.Debug|Any CPU.Build.0 = Debug|Any CPU + {09E30ABC-1F36-4D65-8416-AF7C5C75DA65}.Release|Any CPU.ActiveCfg = Release|Any CPU + {09E30ABC-1F36-4D65-8416-AF7C5C75DA65}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/README.md b/README.md index 4920eba..d9e715d 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ 一个开源的 .NET 工具库, 使得开发变得更加有效率 -[![pull_request](https://github.com/786744873/easytool/actions/workflows/pull_request.yml/badge.svg)](https://github.com/786744873/easytool/actions/workflows/pull_request.yml) +[![pull_request](https://github.com/dotnet-easy/easytool/actions/workflows/pull_request.yml/badge.svg)](https://github.com/dotnet-easy/easytool/actions/workflows/pull_request.yml) [![](https://img.shields.io/nuget/v/EasyTool.Core.svg)](https://www.nuget.org/packages/EasyTool.Core)

中文 | English @@ -53,4 +53,4 @@ Easytool 封装了开发过程中一些常用的方法 **微信：ygdxg8657 （备注进群） QQ群：543829648 903210423（已满）** -![easy-tool](https://raw.githubusercontent.com/786744873/easy-dotnet/main/files/img/easytool.png) +![easy-tool](https://raw.githubusercontent.com/dotnet-easy/easy-dotnet/main/files/img/easytool.png)