diff --git a/CatalogLib/CatalogLib.csproj b/CatalogLib/CatalogLib.csproj index b7c81ff..66bed2d 100644 --- a/CatalogLib/CatalogLib.csproj +++ b/CatalogLib/CatalogLib.csproj @@ -54,10 +54,10 @@ - ..\packages\ImageSharp.1.0.0-alpha6-00049\lib\netstandard1.3\ImageSharp.dll + ..\packages\ImageSharp.1.0.0-alpha9-00140\lib\netstandard1.3\ImageSharp.dll - ..\packages\ImageSharp.Drawing.1.0.0-alpha6-00010\lib\netstandard1.1\ImageSharp.Drawing.dll + ..\packages\ImageSharp.Drawing.1.0.0-alpha9-00135\lib\netstandard1.1\ImageSharp.Drawing.dll ..\packages\Microsoft.Win32.Primitives.4.3.0\lib\net46\Microsoft.Win32.Primitives.dll @@ -67,10 +67,13 @@ True - ..\packages\SixLabors.Fonts.0.1.0-alpha0008\lib\netstandard1.3\SixLabors.Fonts.dll + ..\packages\SixLabors.Fonts.0.1.0-alpha0011\lib\netstandard1.3\SixLabors.Fonts.dll - ..\packages\SixLabors.Shapes.0.1.0-alpha0011\lib\netstandard1.1\SixLabors.Shapes.dll + ..\packages\SixLabors.Shapes.0.1.0-alpha0017\lib\netstandard1.1\SixLabors.Shapes.dll + + + ..\packages\SixLabors.Shapes.Text.0.1.0-alpha0017\lib\netstandard1.1\SixLabors.Shapes.Text.dll @@ -108,6 +111,9 @@ ..\packages\System.IO.FileSystem.Primitives.4.3.0\lib\net46\System.IO.FileSystem.Primitives.dll + + ..\packages\System.Memory.4.4.0-preview1-25305-02\lib\netstandard1.0\System.Memory.dll + ..\packages\System.Net.Http.4.3.0\lib\net46\System.Net.Http.dll @@ -118,8 +124,8 @@ ..\packages\System.Numerics.Vectors.4.3.0\lib\net46\System.Numerics.Vectors.dll - - ..\packages\System.Runtime.CompilerServices.Unsafe.4.3.0\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll + + ..\packages\System.Runtime.CompilerServices.Unsafe.4.4.0-preview1-25305-02\lib\netstandard1.0\System.Runtime.CompilerServices.Unsafe.dll ..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll diff --git a/CatalogLib/ImgSharpCreator.cs b/CatalogLib/ImgSharpCreator.cs index e96b2e7..f74d9f2 100644 --- a/CatalogLib/ImgSharpCreator.cs +++ b/CatalogLib/ImgSharpCreator.cs @@ -8,8 +8,8 @@ using System.Numerics; using System.Text; using System.Threading.Tasks; using ImageSharp; +using ImageSharp.PixelFormats; using SixLabors.Fonts; -using Color = ImageSharp.Color; using Font = SixLabors.Fonts.Font; using FontFamily = SixLabors.Fonts.FontFamily; using FontStyle = SixLabors.Fonts.FontStyle; @@ -27,7 +27,7 @@ namespace CatalogLib - using (Image image = Image.Load(workFile.FullName)/* new Image(workFile.FullName)*/) + using (Image image = Image.Load(workFile.FullName)/* new Image(workFile.FullName)*/) { if (PicSettings.Instance.UsaRotazioneAutomatica) { @@ -102,7 +102,7 @@ namespace CatalogLib } - private void SetExtraText(Image image) + private void SetExtraText(Image image) { if (string.IsNullOrWhiteSpace(PicSettings.Instance.TestoApplicareOrizzontale)) { @@ -116,16 +116,18 @@ namespace CatalogLib //var font = new Font(fff, 8f, FontStyle.Regular); - Color c = Color.FromHex(FlipRgbString(PicSettings.Instance.ColoreTestoRGB)); - + //Color c = Color.FromHex(FlipRgbString(PicSettings.Instance.ColoreTestoRGB)); + Rgba32 g = Rgba32.FromHex(FlipRgbString(PicSettings.Instance.ColoreTestoRGB)); TextMeasurer measurer = new TextMeasurer(); var size = measurer.MeasureText(PicSettings.Instance.TestoApplicareOrizzontale, font, 72); float scalingFactor = Math.Min(image.Width / size.Width, image.Height / size.Height); Font scaledFont = new Font(font, scalingFactor * font.Size); + image.DrawText("aaa", scaledFont, g, new Vector2(0, 0)); + //image.DrawText(PicSettings.Instance.TestoApplicareOrizzontale, font, Color.Black, ) - image.DrawText(PicSettings.Instance.TestoApplicareOrizzontale, scaledFont, c, new Vector2(0, 0)); + //image.DrawText(PicSettings.Instance.TestoApplicareOrizzontale, scaledFont, c, new Vector2(0, 0)); //image.DrawText("sssssssssssssssssssssssssssssssssssssssssssssss", font, Color.Black, new Vector2(200, 200)); //ahjsdfhjklasj diff --git a/CatalogLib/app.config b/CatalogLib/app.config index e427ad3..b5d559f 100644 --- a/CatalogLib/app.config +++ b/CatalogLib/app.config @@ -26,6 +26,10 @@ + + + + \ No newline at end of file diff --git a/CatalogLib/packages.config b/CatalogLib/packages.config index f61b9a4..f0e190c 100644 --- a/CatalogLib/packages.config +++ b/CatalogLib/packages.config @@ -1,13 +1,14 @@  - - + + - - + + + @@ -27,6 +28,7 @@ + @@ -37,7 +39,7 @@ - + diff --git a/WPFCatalog/App.config b/WPFCatalog/App.config index fecd1c7..ff1c544 100644 --- a/WPFCatalog/App.config +++ b/WPFCatalog/App.config @@ -30,6 +30,14 @@ + + + + + + + +