diff --git a/Catalog.sln b/Catalog.sln index 0cc7def..a8edfe8 100644 --- a/Catalog.sln +++ b/Catalog.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26730.15 +VisualStudioVersion = 15.0.26730.16 MinimumVisualStudioVersion = 10.0.40219.1 Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "ImageCatalog 2", "imagecatalog\ImageCatalog 2.vbproj", "{8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}" EndProject @@ -32,6 +32,7 @@ Global {8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}.Debug|Any CPU.Build.0 = Debug|Any CPU {8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}.Debug|x64.ActiveCfg = Debug|x64 + {8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}.Debug|x64.Build.0 = Debug|x64 {8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}.Debug|x86.ActiveCfg = Debug|x86 {8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}.Debug|x86.Build.0 = Debug|x86 {8D3AA2B0-8F06-4A61-9CAD-B920EB1A8E9C}.Release|Any CPU.ActiveCfg = Release|Any CPU diff --git a/CatalogLib/CatalogLib.csproj b/CatalogLib/CatalogLib.csproj index a5aecf8..f90a343 100644 --- a/CatalogLib/CatalogLib.csproj +++ b/CatalogLib/CatalogLib.csproj @@ -158,6 +158,7 @@ + diff --git a/CatalogLib/Enums.cs b/CatalogLib/Enums.cs new file mode 100644 index 0000000..c719a2b --- /dev/null +++ b/CatalogLib/Enums.cs @@ -0,0 +1,15 @@ +namespace CatalogLib +{ + public enum Positions + { + Alto, + Basso + } + + public enum Alignments + { + Sinistra, + Centro, + Destra + } +} \ No newline at end of file diff --git a/CatalogLib/ImgSharpCreator.cs b/CatalogLib/ImgSharpCreator.cs index 8d96f52..6a88194 100644 --- a/CatalogLib/ImgSharpCreator.cs +++ b/CatalogLib/ImgSharpCreator.cs @@ -124,7 +124,7 @@ namespace CatalogLib if (PicSettings.Instance.EnableText) { - + //SetTextTest(image); SetExtraText(image, isRotated); @@ -150,6 +150,16 @@ namespace CatalogLib MaddoLogger.Log("Time Taken for {0}: {1}", workFile.FullName, s.Elapsed); } + private void SetTextTest(Image image) + { + string text = "test test test test test testtest test test test test test test"; + Font font = new Font(SystemFonts.Find("verdana"), 300, FontStyle.Regular); + image.Mutate(x => x.DrawText(text, font, Rgba32.Yellow, new PointF(2760, 3295.54932f), new TextGraphicsOptions() + { + HorizontalAlignment = HorizontalAlignment.Center + })); + } + private void SetExtraText(Image image, bool isRotated) { if (string.IsNullOrWhiteSpace(PicSettings.Instance.TestoApplicareOrizzontale)) @@ -258,10 +268,10 @@ namespace CatalogLib switch (PicSettings.Instance.TextPosition) { - case PicSettings.Positions.Alto: + case Positions.Alto: yPosFromBottom = PicSettings.Instance.Margine; break; - case PicSettings.Positions.Basso: + case Positions.Basso: yPosFromBottom = image.Height - size.Height - (image.Height * PicSettings.Instance.Margine / 100); break; } @@ -272,17 +282,17 @@ namespace CatalogLib switch (PicSettings.Instance.TextAlignment) { - case PicSettings.Alignments.Sinistra: + case Alignments.Sinistra: xCenterofImg = PicSettings.Instance.Margine + (larghezzaStandard / 2); if ((larghezzaStandard / 2) > (image.Width / 2) - PicSettings.Instance.Margine) { xCenterofImg = image.Width / 2; } break; - case PicSettings.Alignments.Centro: + case Alignments.Centro: xCenterofImg = image.Width / 2; break; - case PicSettings.Alignments.Destra: + case Alignments.Destra: xCenterofImg = image.Width - PicSettings.Instance.Margine - larghezzaStandard / 2; if (larghezzaStandard / 2 > image.Width / 2 - PicSettings.Instance.Margine) diff --git a/CatalogLib/PicSettings.cs b/CatalogLib/PicSettings.cs index e2f89d8..8afa9a7 100644 --- a/CatalogLib/PicSettings.cs +++ b/CatalogLib/PicSettings.cs @@ -492,18 +492,7 @@ namespace CatalogLib #region Enums - public enum Positions - { - Alto, - Basso - } - - public enum Alignments - { - Sinistra, - Centro, - Destra - } + #endregion } diff --git a/WPFCatalog/Controls/GeneralSettingsControl.xaml b/WPFCatalog/Controls/GeneralSettingsControl.xaml index c353627..f485829 100644 --- a/WPFCatalog/Controls/GeneralSettingsControl.xaml +++ b/WPFCatalog/Controls/GeneralSettingsControl.xaml @@ -7,10 +7,15 @@ xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro" xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks" + xmlns:System="clr-namespace:System;assembly=mscorlib" + xmlns:catalogLib="clr-namespace:CatalogLib;assembly=CatalogLib" mc:Ignorable="d" d:DesignHeight="900" d:DesignWidth="500" d:DataContext="{d:DesignInstance wpfCatalog:MainWindowViewModel}" > + + + diff --git a/WPFCatalog/Controls/TextSettingsControl.xaml b/WPFCatalog/Controls/TextSettingsControl.xaml index e9b2157..f7c6e6f 100644 --- a/WPFCatalog/Controls/TextSettingsControl.xaml +++ b/WPFCatalog/Controls/TextSettingsControl.xaml @@ -6,12 +6,19 @@ xmlns:wpfCatalog="clr-namespace:WPFCatalog" xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit" xmlns:Controls="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro" - mc:Ignorable="d" + xmlns:System="clr-namespace:System;assembly=mscorlib" + xmlns:catalogLib="clr-namespace:CatalogLib;assembly=CatalogLib" + mc:Ignorable="d" d:DesignHeight="900" d:DesignWidth="500" d:DataContext="{d:DesignInstance wpfCatalog:MainWindowViewModel}" > + + + + + @@ -43,7 +50,7 @@ > - + @@ -135,13 +142,15 @@ - +