+ Fixed parallel edge calculation to better accomodate with edge labels

+ Added mini showcase: parallel edges
panthernet · Jun 28, 2015 · 1a444ca · 1a444ca
1 parent fcfaf9c
commit 1a444ca
Show file tree

Hide file tree

Showing 7 changed files with 71 additions and 14 deletions.
diff --git a/Examples/ShowcaseApp.WPF/Controls/SpecialWindowControl.xaml.cs b/Examples/ShowcaseApp.WPF/Controls/SpecialWindowControl.xaml.cs
@@ -54,7 +54,12 @@ protected virtual object LoadContent(Uri uri)
                 spContent2.XamlText = Properties.Resources.ResourceManager.GetString(OpType.ToString());
             var spContent3 = result as ISpecialWindowContentXamlTemplate;
             if (spContent3 != null)
-                spContent3.XamlText = Properties.Resources.ResourceManager.GetString(OpType+"Template");
+            {
+                var xamlTemplate = Properties.Resources.ResourceManager.GetString(OpType + "Template");
+                if(string.IsNullOrEmpty(xamlTemplate))
+                    xamlTemplate = Properties.Resources.ResourceManager.GetString("CommonMiniTemplate");
+                spContent3.XamlText = xamlTemplate;
+            }
 
             return result;
         }

diff --git a/Examples/ShowcaseApp.WPF/Models/ShowcaseHelper.cs b/Examples/ShowcaseApp.WPF/Models/ShowcaseHelper.cs
@@ -38,7 +38,7 @@ public static void AddEdge(BidirectionalGraph<DataVertex, DataEdge> graph, DataV
                 Text = string.Empty,
                 SourceConnectionPointId = sourcePoint,
                 TargetConnectionPointId = targetPoint,
-                ToolTipText = "Default label "+ source.ID
+                ToolTipText = "Label "+ source.ID
             };
 
             graph.AddEdge(edge);

diff --git a/Examples/ShowcaseApp.WPF/Pages/Mini/EdgesParallel.xaml.cs b/Examples/ShowcaseApp.WPF/Pages/Mini/EdgesParallel.xaml.cs
@@ -58,8 +58,8 @@ private void GenerateGraph()
             var vList = logicCore.Graph.Vertices.ToList();
 
             //add edges
-            ShowcaseHelper.AddEdge(logicCore.Graph, vList[0], vList[1]);
             ShowcaseHelper.AddEdge(logicCore.Graph, vList[1], vList[0]);
+            ShowcaseHelper.AddEdge(logicCore.Graph, vList[0], vList[1]);
             ShowcaseHelper.AddEdge(logicCore.Graph, vList[2], vList[3]);
 
             graphArea.LogicCore = logicCore;
@@ -81,9 +81,9 @@ private void GenerateGraph()
             graphArea.PreloadGraph(posList);
             //behaviors
             var eList = graphArea.EdgesList.Values.ToList();
-            eList[0].LabelVerticalOffset = 22;
-            eList[1].LabelVerticalOffset = 22;
-            eList[2].LabelVerticalOffset = 22;
+            eList[0].LabelVerticalOffset = 12;
+            eList[1].LabelVerticalOffset = 12;
+            eList[2].LabelVerticalOffset = 12;
 
             graphArea.SetVerticesDrag(true, true);
             graphArea.ShowAllEdgesLabels();

diff --git a/Examples/ShowcaseApp.WPF/Properties/Resources.Designer.cs b/Examples/ShowcaseApp.WPF/Properties/Resources.Designer.cs
diff --git a/Examples/ShowcaseApp.WPF/Properties/Resources.resx b/Examples/ShowcaseApp.WPF/Properties/Resources.resx
@@ -118,6 +118,17 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="CommonMiniTemplate" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Templates\Mini\CommonMiniTemplate.xaml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="EdgesParallel" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Pages\Mini\EdgesParallel.xaml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
+  </data>
+  <data name="EdgesParallelText" xml:space="preserve">
+    <value>In this example you can see how parallel edges can be handled and customized by GraphX. Edge labels also has special logic for parallel edges to be easily readable.
+
+Point mouse over the different settings to see tooltips.</value>
+  </data>
   <data name="LayoutVCP" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Pages\Mini\LayoutVCP.xaml;System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>

diff --git a/Examples/ShowcaseApp.WPF/Templates/Mini/CommonMiniTemplate.xaml b/Examples/ShowcaseApp.WPF/Templates/Mini/CommonMiniTemplate.xaml
@@ -55,11 +55,7 @@
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="{x:Type controls:EdgeLabelControl}">
-                    <Grid>
-                        <Border BorderBrush="Black" BorderThickness="1" Background="ForestGreen" CornerRadius="8">
-                            <ContentPresenter Margin="1"/>
-                        </Border>
-                    </Grid>
+                    <TextBlock Text="{TemplateBinding Content}" FontSize="8" FontStyle="Italic" Margin="1" VerticalAlignment="Center"/>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>

diff --git a/GraphX.Controls/Controls/GraphArea.cs b/GraphX.Controls/Controls/GraphArea.cs
@@ -1158,12 +1158,12 @@ public void UpdateParallelEdgesData()
                         //if source to target edge
                         if (!cList[i])
                         {
-                            list[i].SourceOffset = (viceversa ? distance : -distance) * (1 + ((even ? i : i - 1) / 2));
+                            list[i].SourceOffset = (viceversa ? -distance : distance) * (1 + ((even ? i : i - 1) / 2));
                             list[i].TargetOffset = -list[i].SourceOffset;
                         }
                         else //if target to source edge - just switch offsets
                         {
-                            list[i].TargetOffset = (viceversa ? distance : -distance) * (1 + ((even ? i : i - 1) / 2));
+                            list[i].TargetOffset = (viceversa ? -distance : distance) * (1 + ((even ? i : i - 1) / 2));
                             list[i].SourceOffset = -list[i].TargetOffset;
                         }
                         //change trigger to opposite