diff --git a/Catalog.sln b/Catalog.sln
index 8bf525d..05e37b1 100644
--- a/Catalog.sln
+++ b/Catalog.sln
@@ -28,7 +28,6 @@ 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
@@ -40,7 +39,6 @@ Global
{D11ED7B0-93E8-4F38-A142-EED72D7EE8B5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D11ED7B0-93E8-4F38-A142-EED72D7EE8B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D11ED7B0-93E8-4F38-A142-EED72D7EE8B5}.Debug|x64.ActiveCfg = Debug|x64
- {D11ED7B0-93E8-4F38-A142-EED72D7EE8B5}.Debug|x64.Build.0 = Debug|x64
{D11ED7B0-93E8-4F38-A142-EED72D7EE8B5}.Debug|x86.ActiveCfg = Debug|Any CPU
{D11ED7B0-93E8-4F38-A142-EED72D7EE8B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D11ED7B0-93E8-4F38-A142-EED72D7EE8B5}.Release|Any CPU.Build.0 = Release|Any CPU
@@ -70,7 +68,6 @@ Global
{44465926-240D-473F-90B8-786BA4384406}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{44465926-240D-473F-90B8-786BA4384406}.Debug|Any CPU.Build.0 = Debug|Any CPU
{44465926-240D-473F-90B8-786BA4384406}.Debug|x64.ActiveCfg = Debug|x64
- {44465926-240D-473F-90B8-786BA4384406}.Debug|x64.Build.0 = Debug|x64
{44465926-240D-473F-90B8-786BA4384406}.Debug|x86.ActiveCfg = Debug|Any CPU
{44465926-240D-473F-90B8-786BA4384406}.Release|Any CPU.ActiveCfg = Release|Any CPU
{44465926-240D-473F-90B8-786BA4384406}.Release|Any CPU.Build.0 = Release|Any CPU
diff --git a/CatalogLib/ImgSharpCreator.cs b/CatalogLib/ImgSharpCreator.cs
index 1786b51..e96b2e7 100644
--- a/CatalogLib/ImgSharpCreator.cs
+++ b/CatalogLib/ImgSharpCreator.cs
@@ -90,7 +90,8 @@ namespace CatalogLib
//JpegDecoder j = new JpegDecoder();
var va = Vector.IsHardwareAccelerated;
- image.Resize(PicSettings.Instance.FotoLarghezza, PicSettings.Instance.FotoAltezza);
+ //image.Resize(PicSettings.Instance.FotoLarghezza, PicSettings.Instance.FotoAltezza);
+
//image.Resize(2240, 2240);
//var fff = FontCollection.SystemFonts.Find(PicSettings.Instance.NomeFont);
//var font = new Font(fff, (float)PicSettings.Instance.DimensioneFont, FontStyle.Regular);
@@ -115,9 +116,16 @@ namespace CatalogLib
//var font = new Font(fff, 8f, FontStyle.Regular);
- Color c = Color.FromHex(PicSettings.Instance.ColoreTestoRGB);
+ Color c = Color.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(PicSettings.Instance.TestoApplicareOrizzontale, font, Color.Black, )
- image.DrawText(PicSettings.Instance.TestoApplicareOrizzontale, font, Color.Black, new Vector2(200, 200));
+ image.DrawText(PicSettings.Instance.TestoApplicareOrizzontale, scaledFont, c, new Vector2(0, 0));
//image.DrawText("sssssssssssssssssssssssssssssssssssssssssssssss", font, Color.Black, new Vector2(200, 200));
//ahjsdfhjklasj
@@ -129,5 +137,11 @@ namespace CatalogLib
//image.MetaData.HorizontalResolution = hr;
//image.MetaData.VerticalResolution = hr;
}
+
+ private string FlipRgbString(string originalString)
+ {
+ string s = string.Concat("#", originalString.Substring(3, 6), originalString.Substring(1, 2));
+ return s;
+ }
}
}
diff --git a/WPFCatalog/WPFCatalog.csproj b/WPFCatalog/WPFCatalog.csproj
index ee2e538..b3a3c60 100644
--- a/WPFCatalog/WPFCatalog.csproj
+++ b/WPFCatalog/WPFCatalog.csproj
@@ -74,17 +74,11 @@
False
..\lib\MaddoLibrary.WPF.NET46.dll
-
- ..\packages\MahApps.Metro.1.4.3\lib\net45\MahApps.Metro.dll
+
+ ..\packages\MahApps.Metro.1.5.0\lib\net45\MahApps.Metro.dll
-
- ..\packages\MahApps.Metro.IconPacks.1.7.1\lib\net46\MahApps.Metro.IconPacks.dll
-
-
- ..\packages\MahApps.Metro.1.4.3\lib\net45\MahApps.Metro.dll
-
-
- ..\packages\MahApps.Metro.IconPacks.1.7.1\lib\net46\MahApps.Metro.IconPacks.dll
+
+ ..\packages\MahApps.Metro.IconPacks.1.9.0\lib\net46\MahApps.Metro.IconPacks.dll
..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll
@@ -94,12 +88,6 @@
-
- ..\packages\SixLabors.Fonts.0.1.0-alpha0002\lib\netstandard1.3\SixLabors.Fonts.dll
-
-
- ..\packages\SixLabors.Shapes.0.1.0-alpha0009\lib\netstandard1.1\SixLabors.Shapes.dll
-
..\packages\System.AppContext.4.3.0\lib\net46\System.AppContext.dll
@@ -170,7 +158,7 @@
- ..\packages\MahApps.Metro.1.4.3\lib\net45\System.Windows.Interactivity.dll
+ ..\packages\MahApps.Metro.1.5.0\lib\net45\System.Windows.Interactivity.dll
diff --git a/WPFCatalog/packages.config b/WPFCatalog/packages.config
index 2ea2b0e..87aa9a9 100644
--- a/WPFCatalog/packages.config
+++ b/WPFCatalog/packages.config
@@ -2,15 +2,13 @@
-
-
+
+
-
-