From b55b90fd91fb682e07d6f360569aa9e53652ba5b Mon Sep 17 00:00:00 2001
From: Alexander Smirnov <panthernet@mail.ru>
Date: Tue, 14 Apr 2015 01:36:54 +0300
Subject: [PATCH] + Added async mode for METRO + Bug fixes for async mode
 resource management in WPF

---
 Documents/CHANGELOG.txt                                | 10 +++++++---
 Examples/METRO.SimpleGraph/Common/templates.xaml       |  2 +-
 .../ShowcaseApp.WPF/Templates/GeneralTemplate.xaml     |  4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Documents/CHANGELOG.txt b/Documents/CHANGELOG.txt
index 06db0083..9a5ea528 100644
--- a/Documents/CHANGELOG.txt
+++ b/Documents/CHANGELOG.txt
@@ -10,8 +10,9 @@
 + Added VertexControl::GetCenterPosition() method to get vertex center position instead the default top-left [WPF, METRO]
 + Added new showcase example: Templates/Graph editor [WPF]
 + Added new option GraphArea::LogicCoreChangeAction which defines what action will be taken on LogicCore property change. You can rebuild graph now. [WPF, METRO]
-+ Fixed edge labels display for self looped edges [WPF, METRO]
++ Added new sync calculation cancellation feature [WPF, METRO] thanks to jorgensigvardsson
 + Added new property EdgeLabelControl::DisplayForSelfLoopedEdges which is self explaining [WPF, METRO]
++ Fixed edge labels display for self looped edges [WPF, METRO]
 + Fixed annoying data binding error in ZoomControl slider binding [METRO, WPF]
 + Fixed ZoomControl unresponsivness after startup (prev needed to change zoom/translation first to work fine) [WPF,METRO]
 + Fixed ZoomControl::Zoom property bug on empty content window resize [WPF, METRO]
@@ -19,8 +20,8 @@
 + Fixed some issues in ShowcaseApp.WPF
 + Fixed GraphArea::DeserializeFromFile() logic and filestorage logic to properly restore internal data for loaded graphs [WPF, METRO]
 + Fixed calculation of label control position and angle [WPF, METRO] thanks to jorgensigvardsson
-+ Made EdgeControl::LabelVerticalOffset property dependecy [WPF, METRO]
-+ Updated default control templstes to include some new properties setup by default [WPF, METRO]
++ Implemented EdgeControl::LabelVerticalOffset property as dependecy [WPF, METRO]
++ Updated default control templates to include some new properties setup by default [WPF, METRO]
 + Optimized showcase app media files
 + Improved extensibility by making some methods virtual for EdgeLabelControl, VertexLabelControl, EdgeControl
 
@@ -29,6 +30,9 @@
 + Expanded EdgeControl event args with mouse and keyboard modifiers [WPF]
 + Moved all WPF interfaces to GraphX.Controls.Models.Interfaces namespace and all METRO interfaces to GraphX.METRO.Controls.Models.Interfaces [WPF, METRO]
 + Edge rotation now needs additional modification for all custom EdgeLabelControl templates. Please add: <Setter Property="RenderTransformOrigin" Value="0.5,0.5" />[WPF, METRO]
++ Due to new calc cancelation feature the following has been changed:
+	- IExternalEdgeRouting, IExternalLayout, IExternalOverlapRemoval interfaces and different algorithm base classes now implement Compute(CancellationToken cancellationToken) method with an additional param
+	- METRO now works only in async mode. Added GraphArea graph generation methods postfix Async.
 
 RELEASE 2.1.7
 + Added new ShowcaseApp.WPF with mostly the same functionality as before but in a new nutshell and with refactored code. Expect new showcases soon.
diff --git a/Examples/METRO.SimpleGraph/Common/templates.xaml b/Examples/METRO.SimpleGraph/Common/templates.xaml
index c496eec7..9d6e367e 100644
--- a/Examples/METRO.SimpleGraph/Common/templates.xaml
+++ b/Examples/METRO.SimpleGraph/Common/templates.xaml
@@ -1,7 +1,6 @@
 <ResourceDictionary
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" 
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:local="using:METRO.SimpleGraph"
     xmlns:controls="using:GraphX.Controls">
 
     <Style TargetType="controls:VertexControl">
@@ -99,6 +98,7 @@
     </Style>
 
     <Style TargetType="controls:EdgeControl">
+        <Setter Property="LabelVerticalOffset" Value="10" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="controls:EdgeControl">
diff --git a/Examples/ShowcaseApp.WPF/Templates/GeneralTemplate.xaml b/Examples/ShowcaseApp.WPF/Templates/GeneralTemplate.xaml
index 67ef048c..d921058f 100644
--- a/Examples/ShowcaseApp.WPF/Templates/GeneralTemplate.xaml
+++ b/Examples/ShowcaseApp.WPF/Templates/GeneralTemplate.xaml
@@ -66,8 +66,8 @@
                               >
                         </Path>
 
-                        <!--"<gxl:EdgePointerImage NeedRotation="true" x:Name="PART_EdgePointerForSource" Source="/Assets/tr_red.png" Width="15" Height="15" />
-                        <gxl:EdgePointerImage NeedRotation="true" x:Name="PART_EdgePointerForTarget" Source="/Assets/tr_grren.png" Width="15" Height="15" />-->
+                        <gxl:EdgePointerImage NeedRotation="true" x:Name="PART_EdgePointerForSource" Source="/Assets/tr_red.png" Width="15" Height="15" />
+                        <gxl:EdgePointerImage NeedRotation="true" x:Name="PART_EdgePointerForTarget" Source="/Assets/tr_grren.png" Width="15" Height="15" />
                     </Grid>
                 </ControlTemplate>
             </Setter.Value>