- Exposed internal PrintHelper class with new CalculateEstimatedDPI(…

…) method which can calculate DPI required for image export based on specified criterias - Fixed arrows display issue when printing
panthernet · Jan 18, 2016 · 2ee9802 · 2ee9802
1 parent fd13c12
commit 2ee9802
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 14 deletions.
diff --git a/Documents/CHANGELOG.txt b/Documents/CHANGELOG.txt
@@ -1,4 +1,9 @@
-RELEASE 2.3.2
+RELEASE 2.3.3
+DETAILED CHANGELOG:
+ - Exposed internal PrintHelper class with new CalculateEstimatedDPI() method which can calculate DPI required for image export based on specified criterias
+ - Fixed arrows display issue when printing 
+
+RELEASE 2.3.2
 DETAILED CHANGELOG:
  - Added GraphArea::ExportAsImageDialog() method which act as old ExportAsImage and the ExportAsImage() method now accepts filename to work without the dialog
 

diff --git a/GraphX.Controls/Controls/GraphArea.cs b/GraphX.Controls/Controls/GraphArea.cs
@@ -2020,6 +2020,7 @@ public override void SetPrintMode(bool value, bool offsetControls = true, int ma
             }
             InvalidateMeasure();
             UpdateLayout();
+            EdgesList.Values.ForEach(a=> a.UpdateEdge());
 #endif
         }
 

diff --git a/GraphX.Controls/GraphX.WPF.Controls.csproj b/GraphX.Controls/GraphX.WPF.Controls.csproj
@@ -41,14 +41,14 @@
     <OutputPath>bin\x86\Debug\</OutputPath>
     <DefineConstants>TRACE;DEBUG;WPF</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;WPF</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x86</PlatformTarget>
@@ -206,7 +206,6 @@
       <Name>GraphX.PCL.Logic</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <PropertyGroup>

diff --git a/GraphX.Controls/PrintHelper.cs b/GraphX.Controls/PrintHelper.cs
@@ -8,10 +8,11 @@
 using GraphX.PCL.Common.Enums;
 using GraphX.PCL.Common.Exceptions;
 using Brushes = System.Windows.Media.Brushes;
+using Size = System.Windows.Size;
 
 namespace GraphX.Controls
 {
-    internal static class PrintHelper
+    public static class PrintHelper
     {
         /// <summary>
         /// Default image resolution
@@ -21,6 +22,34 @@ internal static class PrintHelper
         //Set pixelformat of image.
         private static readonly PixelFormat PixelFormat = PixelFormats.Pbgra32;
 
+        /// <summary>
+        /// Helper method which calculates estimated image DPI based on the input criterias
+        /// </summary>
+        /// <param name="vis">GraphArea object</param>
+        /// <param name="imgdpi">Desired DPI</param>
+        /// <param name="dpiStep">DPI decrease step while estimating</param>
+        /// <param name="estPixelCount">Pixel quantity threshold</param>
+        public static double CalculateEstimatedDPI(GraphAreaBase vis, double imgdpi, double dpiStep, int estPixelCount)
+        {
+            bool result = false;
+            double currentDPI = imgdpi;
+            while (!result)
+            {
+                if (CalulateSize(vis.ContentSize.Size, currentDPI) <= estPixelCount)
+                    result = true;
+                else currentDPI -= dpiStep;
+                if (currentDPI < 0) return 0;
+            }
+            return currentDPI;
+        }
+
+
+        private static int CalulateSize(Size desiredSize, double dpi)
+        {
+            return (int) (desiredSize.Width*(dpi/DEFAULT_DPI) + 100) *
+                   (int) (desiredSize.Height*(dpi/DEFAULT_DPI) + 100);
+        }
+
         /// <summary>
         /// Method exports the GraphArea to an png image.
         /// </summary>
@@ -32,7 +61,7 @@ internal static class PrintHelper
         /// <param name="itype"></param>
         public static void ExportToImage(GraphAreaBase surface, Uri path, ImageType itype, bool useZoomControlSurface = false, double imgdpi = DEFAULT_DPI, int imgQuality = 100)
         {
-            if(!useZoomControlSurface)
+            if (!useZoomControlSurface)
                 surface.SetPrintMode(true, true, 100);
             //Create a render bitmap and push the surface to it
             UIElement vis = surface;
@@ -44,10 +73,13 @@ public static void ExportToImage(GraphAreaBase surface, Uri path, ImageType ityp
                 else
                 {
                     var frameworkElement = surface.Parent as FrameworkElement;
-                    if(frameworkElement != null && frameworkElement.Parent is IZoomControl)
+                    if (frameworkElement != null && frameworkElement.Parent is IZoomControl)
                         vis = ((IZoomControl) frameworkElement.Parent).PresenterVisual;
                 }
             }
+
+
+
             var renderBitmap =
                     new RenderTargetBitmap(
                     (int)(vis.DesiredSize.Width * (imgdpi / DEFAULT_DPI) + 100),
@@ -85,6 +117,8 @@ public static void ExportToImage(GraphAreaBase surface, Uri path, ImageType ityp
                 //Save the data to the stream
                 encoder.Save(outStream);
             }
+            renderBitmap.Clear();
+            renderBitmap = null;
             //due to mem leak in wpf :(
             GC.Collect();
             GC.WaitForPendingFinalizers();
@@ -95,6 +129,7 @@ public static void ExportToImage(GraphAreaBase surface, Uri path, ImageType ityp
         }
 
 
+
         public static void ShowPrintPreview(Visual surface, string description = "")
         {
             try

diff --git a/GraphX.PCL.Logic/GraphX.PCL.Logic.csproj b/GraphX.PCL.Logic/GraphX.PCL.Logic.csproj
@@ -46,13 +46,6 @@
   <PropertyGroup>
     <AssemblyOriginatorKeyFile>signature.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .NET Framework is automatically included -->
-    <ProjectReference Include="..\GraphX.PCL.Common\GraphX.PCL.Common.csproj">
-      <Project>{3644d44b-dec0-4b65-bba0-c68e34821aae}</Project>
-      <Name>GraphX.PCL.Common</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\Documents\AIV.cs">
       <Link>Properties\AIV.cs</Link>
@@ -184,6 +177,12 @@
       <Private>True</Private>
     </Reference>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\GraphX.PCL.Common\GraphX.PCL.Common.csproj">
+      <Project>{3644d44b-dec0-4b65-bba0-c68e34821aae}</Project>
+      <Name>GraphX.PCL.Common</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\Portable\$(TargetFrameworkVersion)\Microsoft.Portable.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
   <PropertyGroup>
-Original file line number
+Diff line change
@@ Expand Up @@
                 }
                 InvalidateMeasure();
                 UpdateLayout();
+                EdgesList.Values.ForEach(a=> a.UpdateEdge());
     #endif
             }
@@ Expand Down @@