Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate QuickGraph to QuikGraph and GraphSharp to GraphShape. #17

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Migrate QuickGraph to QuikGraph and GraphSharp to GraphShape. #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc3b26d
Migrate QuickGraph to QuikGraph and GraphSharp to GraphShape.
KeRNeLith Jun 4, 2020
1712f50
Update QuikGraph and GraphShape latest versions (strong named versions).
KeRNeLith Jun 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Logic/CommitEdge.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using QuickGraph;
using QuikGraph;

namespace GitViz.Logic
{
Expand Down
2 changes: 1 addition & 1 deletion Logic/CommitGraph.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using QuickGraph;
using QuikGraph;

namespace GitViz.Logic
{
Expand Down
21 changes: 3 additions & 18 deletions Logic/Logic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand Down Expand Up @@ -30,23 +30,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="GraphSharp">
<HintPath>..\packages\GraphSharp.1.1.0.0\lib\net40\GraphSharp.dll</HintPath>
</Reference>
<Reference Include="GraphSharp.Controls">
<HintPath>..\packages\GraphSharp.1.1.0.0\lib\net40\GraphSharp.Controls.dll</HintPath>
</Reference>
<Reference Include="QuickGraph">
<HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.dll</HintPath>
</Reference>
<Reference Include="QuickGraph.Data">
<HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Data.dll</HintPath>
</Reference>
<Reference Include="QuickGraph.Graphviz">
<HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Graphviz.dll</HintPath>
</Reference>
<Reference Include="QuickGraph.Serialization">
<HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Serialization.dll</HintPath>
<Reference Include="QuikGraph">
<HintPath>..\packages\QuikGraph.2.2.0\lib\net45\QuikGraph.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
5 changes: 2 additions & 3 deletions Logic/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="GraphSharp" version="1.1.0.0" targetFramework="net45" />
<package id="QuickGraph" version="3.6.61119.7" targetFramework="net45" />
<package id="QuikGraph" version="2.2.0" targetFramework="net45" />
<package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />
<package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" />
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ This is not a day-to-day visualizing tool for big, active repositories. It's opt

### How it works

Shells out to `git.exe`, and then renders it with the excellent [GraphSharp](http://graphsharp.codeplex.com).
Shells out to `git.exe`, and then renders it with the excellent [GraphShape](https://github.com/KeRNeLith/GraphShape).

### FAQ
#### How can I remove dangling commits?
Expand Down
4 changes: 2 additions & 2 deletions UI/CommitGraphLayout.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using GitViz.Logic;
using GraphSharp.Controls;
using GitViz.Logic;
using GraphShape.Controls;

namespace UI
{
Expand Down
8 changes: 4 additions & 4 deletions UI/MainWindow.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:logic="clr-namespace:GitViz.Logic;assembly=GitViz.Logic"
xmlns:ui="clr-namespace:UI"
xmlns:graphsharp="clr-namespace:GraphSharp.Controls;assembly=GraphSharp.Controls"
xmlns:graphshape="clr-namespace:GraphShape.Controls;assembly=GraphShape.Controls"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
mc:Ignorable="d" d:DesignHeight="600" d:DesignWidth="400"
Expand Down Expand Up @@ -46,10 +46,10 @@
x:Key="VertexTemplateSelector"
CommitTemplate="{StaticResource CommitTemplate}"
ReferenceTemplate="{StaticResource ReferenceTemplate}" />
<Style TargetType="{x:Type graphsharp:VertexControl}">
<Style TargetType="{x:Type graphshape:VertexControl}">
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type graphsharp:VertexControl}">
<ControlTemplate TargetType="{x:Type graphshape:VertexControl}">
<ContentPresenter Content="{TemplateBinding Vertex}" ContentTemplateSelector="{StaticResource VertexTemplateSelector}" />
</ControlTemplate>
</Setter.Value>
Expand All @@ -72,7 +72,7 @@
<ScrollViewer Grid.Row="1" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
<ui:CommitGraphLayout x:Name="graph"
Graph="{Binding Path=Graph}"
LayoutAlgorithmType="EfficientSugiyama"
LayoutAlgorithmType="Sugiyama"
OverlapRemovalAlgorithmType="FSA"
HighlightAlgorithmType="Simple"
Margin="20"
Expand Down
23 changes: 7 additions & 16 deletions UI/UI.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand Down Expand Up @@ -37,23 +37,14 @@
<ApplicationIcon>readify.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="GraphSharp">
<HintPath>..\packages\GraphSharp.1.1.0.0\lib\net40\GraphSharp.dll</HintPath>
<Reference Include="GraphShape">
<HintPath>..\packages\GraphShape.1.1.0\lib\net45\GraphShape.dll</HintPath>
</Reference>
<Reference Include="GraphSharp.Controls">
<HintPath>..\packages\GraphSharp.1.1.0.0\lib\net40\GraphSharp.Controls.dll</HintPath>
<Reference Include="GraphShape.Controls">
<HintPath>..\packages\GraphShape.Controls.1.1.0\lib\net45\GraphShape.Controls.dll</HintPath>
</Reference>
<Reference Include="QuickGraph">
<HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.dll</HintPath>
</Reference>
<Reference Include="QuickGraph.Data">
<HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Data.dll</HintPath>
</Reference>
<Reference Include="QuickGraph.Graphviz">
<HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Graphviz.dll</HintPath>
</Reference>
<Reference Include="QuickGraph.Serialization">
<HintPath>..\packages\QuickGraph.3.6.61119.7\lib\net4\QuickGraph.Serialization.dll</HintPath>
<Reference Include="QuikGraph">
<HintPath>..\packages\QuikGraph.2.2.0\lib\net45\QuikGraph.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
Expand Down
7 changes: 4 additions & 3 deletions UI/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="GraphSharp" version="1.1.0.0" targetFramework="net45" />
<package id="QuickGraph" version="3.6.61119.7" targetFramework="net45" />
<package id="GraphShape" version="1.1.0" targetFramework="net45" />
<package id="GraphShape.Controls" version="1.1.0" targetFramework="net45" />
<package id="QuikGraph" version="2.2.0" targetFramework="net45" />
<package id="WPFExtensions" version="1.0.0" targetFramework="net45" />
</packages>