0.1

+ Граф по матрице инцидентности

GraphDrawer/Edge.cs

@@ -10,6 +10,7 @@ namespace GraphDrawer
         public ArrowLine arrowLine { get; set; }
         public Vertex startVertex { get; set; }
         public Vertex finishVertex { get; set; }
+        public int? Weight { get; set; }
         
         public Edge(Line line, Vertex v1, Vertex v2)
         {
@@ -25,6 +26,14 @@ namespace GraphDrawer
             finishVertex = v2;
         }
 
+        public Edge(Line line, Vertex v1, Vertex v2, int weight)
+        {
+            this.line = line;
+            startVertex = v1;
+            finishVertex = v2;
+            Weight = weight;
+        }
+
         public static double GetCenterByX(Edge edge)
         {
             int x;

GraphDrawer/EdgeCreateWindow.xaml

@@ -0,0 +1,27 @@
+<Window x:Class="GraphDrawer.EdgeCreateWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        mc:Ignorable="d"
+        xmlns:wpfTool="clr-namespace:Xceed.Wpf.Toolkit;assembly=Xceed.Wpf.Toolkit"
+        Title="Create New Edge" Height="200" Width="400">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="50"/>
+            <RowDefinition Height="50"/>
+            <RowDefinition Height="50"/>
+        </Grid.RowDefinitions>
+        <StackPanel Orientation="Horizontal">
+            <TextBlock Text="Вес ребра" FontSize="18" Margin="5" VerticalAlignment="Center" HorizontalAlignment="Left"/>
+            <Slider x:Name="weightSlider" VerticalAlignment="Center" TickPlacement="BottomRight"  Width="200" Minimum="0" Maximum="30" SmallChange="1" ValueChanged="weightSlider_ValueChanged"/>
+            <TextBox Width="30" VerticalAlignment="Center" FontSize="18" BorderThickness="1" BorderBrush="Black" x:Name="currentWeightBox" Text="{Binding ElementName=weightSlider, Path=Value}" TextAlignment="Center" IsReadOnly="True"/>
+        </StackPanel>
+        <TextBlock Grid.Row="1" FontSize="18" Margin="10" VerticalAlignment="Top" HorizontalAlignment="Left" Text="Цвет:"/>
+        <wpfTool:ColorCanvas x:Name="colorCanvas" Width="230" Background="White" BorderThickness="0" HorizontalAlignment="Left" Margin="60,0,0,0" Grid.Row="1"/>
+        <UniformGrid Columns="2" Grid.Row="2">
+            <Button x:Name="focusedBtn" Margin="20,10" Background="#FF4FCFFF" Content="Направленную"/>
+            <Button x:Name="unfocusedBtn" Margin="20,10" Background="#FF4FCFFF" Content="Ненаправленную"/>
+        </UniformGrid>
+    </Grid>
+</Window>

GraphDrawer/EdgeCreateWindow.xaml.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace GraphDrawer
+{
+    /// <summary>
+    /// Interaction logic for EdgeCreateWindow.xaml
+    /// </summary>
+    public partial class EdgeCreateWindow : Window
+    {
+        bool focused = false;
+        public EdgeCreateWindow()
+        {
+            InitializeComponent();
+        }
+
+        public int Weight
+        {
+            get { return (int)weightSlider.Value; }
+        }
+
+        public Color Color
+        {
+            get { return (Color)colorCanvas.SelectedColor; }
+        }
+
+        public bool State
+        {
+            get { return focused; }
+        }
+
+        private void focusedBtn_Click(object sender, RoutedEventArgs e)
+        {
+            this.DialogResult = true;
+            focused = true;
+        }
+
+        private void unfocusedBtn_Click(object sender, RoutedEventArgs e)
+        {
+            this.DialogResult = true;
+            focused = false;
+        }
+    }
+}

GraphDrawer/GraphByClick.xaml

@@ -8,19 +8,19 @@
         Title="Graph Drawer" Height="500" Width="800" MinHeight="500" MinWidth="600">
     <Grid  Background="LightBlue">
         <Grid.RowDefinitions>
-            <RowDefinition Height="0.8*"/>
+            <RowDefinition Height="60"/>
             <RowDefinition Height="5*"/>
             <RowDefinition Height="0.8*"/>
         </Grid.RowDefinitions>
         <Menu Height="25" VerticalAlignment="Top" Margin="0,0,0,1">
             <MenuItem Header="Вид графа" VerticalAlignment="Center" Height="25">
                 <MenuItem Header="Направление">
-                    <MenuItem Header="Направленный" Name="focusedGraphBtn" Click="focusedGraphBtn_Click"/>
-                    <MenuItem Header="Без направления" Name="unfocusedGraphBtn" Click="unfocusedGraphBtn_Click"/>
+                    <MenuItem Header="Направленный" Name="focusedGraphBtn" Click="FocusedGraphBtn_Click"/>
+                    <MenuItem Header="Без направления" Name="unfocusedGraphBtn" Click="UnfocusedGraphBtn_Click"/>
                 </MenuItem>
                 <MenuItem Header="Пометки">
-                    <MenuItem Header="Помеченный" Name="namedGraphBtn" Click="namedGraphBtn_Click"/>
-                    <MenuItem Header="Непомеченный" Name="unnamedGraphBtn" Click="unnamedGraphBtn_Click"/>
+                    <MenuItem Header="Помеченный" Name="namedGraphBtn" Click="NamedGraphBtn_Click"/>
+                    <MenuItem Header="Непомеченный" Name="unnamedGraphBtn" Click="UnnamedGraphBtn_Click"/>
                 </MenuItem>
             </MenuItem>
             <MenuItem Header="Функции">
@@ -43,23 +43,23 @@
             <RadioButton x:Name="edgeRb" Content="Ребро" FontSize="20" Grid.Column="1" Margin="10,0"/>
         </Grid>
         <StackPanel Grid.Row="2" Orientation="Horizontal">
-            <Button x:Name="clearBtn" Margin="10" Height="30" Padding="10,0" Content="Очистить" Background="Blue" Foreground="White" BorderThickness="0" Click="clearBtn_Click"/>
-            <Button x:Name="exportPngBtn" Margin="10" Height="30" Content="Скачать PNG" Background="Blue" Foreground="White" BorderThickness="0" Click="exportPngBtn_Click" Width="118"/>
-            <Button x:Name="backBtn" Padding="10,0" Margin="10" Height="30" Content="Главный экран" Background="Blue" Foreground="White" BorderThickness="0" Click="backBtn_Click"/>
+            <Button x:Name="clearBtn" Margin="10" Height="30" Padding="10,0" Content="Очистить" Background="Blue" Foreground="White" BorderThickness="0" Click="ClearBtn_Click"/>
+            <Button x:Name="exportPngBtn" Margin="10" Height="30" Content="Скачать PNG" Background="Blue" Foreground="White" BorderThickness="0" Click="ExportPngBtn_Click" Width="118"/>
+            <Button x:Name="backBtn" Padding="10,0" Margin="10" Height="30" Content="Главный экран" Background="Blue" Foreground="White" BorderThickness="0" Click="BackBtn_Click"/>
 
         </StackPanel>
-        <Canvas Grid.Row="1" Background="White" x:Name="canvas" MouseLeftButtonUp="canvas_MouseUp">
+        <Canvas Grid.Row="1" Background="White" x:Name="canvas" MouseLeftButtonUp="Canvas_MouseUp">
             <Canvas.ContextMenu>
                 <ContextMenu>
-                    <MenuItem Name="saveBtn" Click="exportPngBtn_Click" Header="Сохранить" Icon="💾"/>
-                    <MenuItem x:Name="printBtn" Click="printBtn_Click" Header="Печать" Icon="🖨️"/>
+                    <MenuItem Name="saveBtn" Click="ExportPngBtn_Click" Header="Сохранить" Icon="💾"/>
+                    <MenuItem x:Name="printBtn" Click="PrintBtn_Click" Header="Печать" Icon="🖨️"/>
                     <MenuItem Header="Удалить">
                         <MenuItem.Icon>
                             <TextBlock Text="🗑"/>
                         </MenuItem.Icon>
-                        <MenuItem Name="delEdgeBtn" Header="Все ребра" Click="delEdgeBtn_Click"/>
+                        <MenuItem Name="delEdgeBtn" Header="Все ребра" Click="DelEdgeBtn_Click"/>
                         <MenuItem Name="delArcBtn" Header="Все дуги"/>
-                        <MenuItem Name="delAllBtn" Header="Все элементы" Click="clearBtn_Click"/>
+                        <MenuItem Name="delAllBtn" Header="Все элементы" Click="ClearBtn_Click"/>
                     </MenuItem>
                 </ContextMenu>
             </Canvas.ContextMenu>

GraphDrawer/GraphByClick.xaml.cs

@@ -1,13 +1,7 @@
 using Microsoft.Win32;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Data;
-using System.Windows.Documents;
 using System.Windows.Input;
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
@@ -32,31 +26,78 @@ namespace GraphDrawer
             InitializeComponent();
             VertexArray.vertexCount = 0;
 
-
+            ClearCanvas();
             if (state)
             {
+                MessageBox.Show("asd");
                 int length = (int)Math.Sqrt(matrix.Length);
                 for(int i = 0; i < length; i++)
                     VertexArray.AddVertex(canvas, rand.Next(1, 600), rand.Next(1, 300));
 
                 for(int i = 0; i < length; i++)
                 {
+                    var vertex1 = VertexArray.vertex[i];
                     for(int j = 0; j < length; j++)
                     {
+                        var vertex2 = VertexArray.vertex[j];
+                        if (matrix[i, j] == 1)
+                        {
+                            EdgeArray.edgeCount++;
+                            Array.Resize(ref EdgeArray.edge, EdgeArray.edgeCount);
+                            Array.Resize(ref EdgeArray.line, EdgeArray.edgeCount);
+                            EdgeArray.line[EdgeArray.edgeCount - 1] = new Line()
+                            {
+                                Stroke = new SolidColorBrush(Color.FromRgb(0, 0, 0)),
+                                StrokeThickness = 2,
+                                X1 = vertex1.X + 5,
+                                Y1 = vertex1.Y + 5,
+                                X2 = vertex2.X + 5,
+                                Y2 = vertex2.Y + 5
+                            };
+
+                            canvas.Children.Add(EdgeArray.line[EdgeArray.edgeCount - 1]);
+                            EdgeArray.edge[EdgeArray.edgeCount - 1] = new Edge(EdgeArray.line[EdgeArray.edgeCount-1], vertex1, vertex2);
+                        }
+                    }
+                }
+            }
+            else
+            {
+                int rows = matrix.GetLength(0);
+                int cols = matrix.GetLength(1);
+                Vertex buffer = null;
+
+                for(int i = 0; i < rows; i++)
+                {
+                    VertexArray.AddVertex(canvas, rand.Next(1, 600), rand.Next(1, 300));
+                }
+
+                for(int j = 0; j < cols; j++)
+                {
+                    for(int i = 0; i < rows; i++)
+                    {
                         if (matrix[i, j] == 1)
-                            EdgeArray.AddEdge(canvas, VertexArray.vertex[i], VertexArray.vertex[j]);
+                        {
+                            if (buffer == null)
+                                buffer = VertexArray.vertex[i];
+                            else
+                            {
+                                EdgeArray.AddEdge(canvas, buffer, VertexArray.vertex[i]);
+                                buffer = null;
+                            }
+                        }
                     }
                 }
             }
         }
 
-        private void backBtn_Click(object sender, RoutedEventArgs e) // Выбор режима рисования
+        private void BackBtn_Click(object sender, RoutedEventArgs e) // Выбор режима рисования
         {
             ChoiceMode regime = new ChoiceMode();
             regime.Show();
             Close();
         }
-        private void canvas_MouseUp(object sender, MouseButtonEventArgs e)
+        private void Canvas_MouseUp(object sender, MouseButtonEventArgs e)
         {
             
             var point = e.GetPosition(canvas); // Получение позиции курсора
@@ -82,11 +123,11 @@ namespace GraphDrawer
                     int Y = Convert.ToInt32(point1.Y);
                     for (int i = 0; i <= VertexArray.vertexCount - 1; i++)// Проверка на принадлежность точки к какой-либо вершине
                     {
-                        if (((X - VertexArray.vertex[i].X <= 8) && (X - VertexArray.vertex[i].X >= 0)) ||
-                            ((VertexArray.vertex[i].X - X <= 8) && (VertexArray.vertex[i].X - X >= 0)))
+                        if (((X - VertexArray.vertex[i].X <= 15) && (X - VertexArray.vertex[i].X >= 0)) ||
+                            ((VertexArray.vertex[i].X - X <= 15) && (VertexArray.vertex[i].X - X >= 0)))
                         {
-                            if (((Y - VertexArray.vertex[i].Y <= 8) && (Y - VertexArray.vertex[i].Y >= 0)) ||
-                            ((VertexArray.vertex[i].Y - Y <= 8) && (VertexArray.vertex[i].Y - Y >= 0)))
+                            if (((Y - VertexArray.vertex[i].Y <= 15) && (Y - VertexArray.vertex[i].Y >= 0)) ||
+                            ((VertexArray.vertex[i].Y - Y <= 15) && (VertexArray.vertex[i].Y - Y >= 0)))
                             {
                                 if (VertexArray.buffer[0] == null)
                                 {
@@ -110,11 +151,11 @@ namespace GraphDrawer
                     int Y = Convert.ToInt32(point1.Y);
                     for (int i = 0; i <= VertexArray.vertexCount - 1; i++)// Проверка на принадлежность точки к какой-либо вершине
                     {
-                        if (((X - VertexArray.vertex[i].X <= 8) && (X - VertexArray.vertex[i].X >= 0)) ||
-                            ((VertexArray.vertex[i].X - X <= 8) && (VertexArray.vertex[i].X - X >= 0)))
+                        if (((X - VertexArray.vertex[i].X <= 15) && (X - VertexArray.vertex[i].X >= 0)) ||
+                            ((VertexArray.vertex[i].X - X <= 15) && (VertexArray.vertex[i].X - X >= 0)))
                         {
-                            if (((Y - VertexArray.vertex[i].Y <= 8) && (Y - VertexArray.vertex[i].Y >= 0)) ||
-                            ((VertexArray.vertex[i].Y - Y <= 8) && (VertexArray.vertex[i].Y - Y >= 0)))
+                            if (((Y - VertexArray.vertex[i].Y <= 15) && (Y - VertexArray.vertex[i].Y >= 0)) ||
+                            ((VertexArray.vertex[i].Y - Y <= 15) && (VertexArray.vertex[i].Y - Y >= 0)))
                             {
                                 if (VertexArray.buffer[0] == null)
                                 {
@@ -136,7 +177,7 @@ namespace GraphDrawer
 
 
         // Получение рандомной кисти из заданных цветов
-        Random rand = new Random((DateTime.Now.Millisecond * DateTime.Now.Second) % DateTime.Now.Hour);
+        readonly Random rand = new Random((DateTime.Now.Millisecond * DateTime.Now.Second) % DateTime.Now.Hour);
         public SolidColorBrush GetBrush()
         {
             SolidColorBrush[] brush = new SolidColorBrush[10];
@@ -154,7 +195,12 @@ namespace GraphDrawer
 
 
         // Очистка канваса
-        private void clearBtn_Click(object sender, RoutedEventArgs e)
+        private void ClearBtn_Click(object sender, RoutedEventArgs e)
+        {
+            ClearCanvas();
+        }
+
+        public void ClearCanvas()
         {
             canvas.Children.Clear();
             VertexArray.vertexCount = 0;
@@ -167,17 +213,17 @@ namespace GraphDrawer
 
 
         // Кнопки меню
-        private void unfocusedGraphBtn_Click(object sender, RoutedEventArgs e)
+        private void UnfocusedGraphBtn_Click(object sender, RoutedEventArgs e)
         {
             GraphState.focused = false;
         }
 
-        private void focusedGraphBtn_Click(object sender, RoutedEventArgs e)
+        private void FocusedGraphBtn_Click(object sender, RoutedEventArgs e)
         {
             GraphState.focused = true;
         }
 
-        private void exportPngBtn_Click(object sender, RoutedEventArgs e)
+        private void ExportPngBtn_Click(object sender, RoutedEventArgs e)
         {
             SaveFileDialog sfg = new SaveFileDialog
             {
@@ -211,7 +257,7 @@ namespace GraphDrawer
             }
         }
 
-        private void delEdgeBtn_Click(object sender, RoutedEventArgs e)
+        private void DelEdgeBtn_Click(object sender, RoutedEventArgs e)
         {
             for(int i = 0; i < EdgeArray.edgeCount; i++)
             {
@@ -221,18 +267,18 @@ namespace GraphDrawer
             Array.Clear(EdgeArray.edge, 0, EdgeArray.edge.Length);
         }
 
-        private void printBtn_Click(object sender, RoutedEventArgs e)
+        private void PrintBtn_Click(object sender, RoutedEventArgs e)
         {
             PrintDialog printDialog = new PrintDialog();
             printDialog.PrintVisual(canvas, "Your graph");
         }
 
-        private void namedGraphBtn_Click(object sender, RoutedEventArgs e)
+        private void NamedGraphBtn_Click(object sender, RoutedEventArgs e)
         {
             GraphState.named = true;
         }
 
-        private void unnamedGraphBtn_Click(object sender, RoutedEventArgs e)
+        private void UnnamedGraphBtn_Click(object sender, RoutedEventArgs e)
         {
             GraphState.named = false;
         }
@@ -322,8 +368,8 @@ namespace GraphDrawer
             vertex[vertexCount-1] = new Vertex(x, y);
             ellipse[vertexCount - 1] = new Ellipse
             {
-                Height = 10,
-                Width = 10,
+                Height = 20,
+                Width = 20,
                 StrokeThickness = 2,
                 Stroke = new SolidColorBrush(Color.FromRgb(0, 0, 0))
             };
@@ -341,9 +387,11 @@ namespace GraphDrawer
             Array.Resize(ref ellipse, vertexCount);
             Array.Resize(ref label, vertexCount);
             vertex[vertexCount - 1] = new Vertex(x, y);
-            label[vertexCount - 1] = new Label();
-            label[vertexCount - 1].Foreground = new SolidColorBrush(Color.FromRgb(0,0,0));
-            label[vertexCount - 1].FontSize = 18;
+            label[vertexCount - 1] = new Label
+            {
+                Foreground = new SolidColorBrush(Color.FromRgb(0, 0, 0)),
+                FontSize = 18
+            };
             ellipse[vertexCount - 1] = new Ellipse
             {
                 Height = 10,
@@ -380,10 +428,10 @@ namespace GraphDrawer
             edge[edgeCount-1] = new Edge(line[edgeCount-1], v1, v2);
             line[edgeCount - 1].Stroke = new SolidColorBrush(Color.FromRgb(0, 0, 0));
             line[edgeCount - 1].StrokeThickness = 2;
-            line[edgeCount - 1].X1 = v1.X+5;
-            line[edgeCount - 1].Y1 = v1.Y+5;
-            line[edgeCount - 1].X2 = v2.X+5;
-            line[edgeCount - 1].Y2 = v2.Y+5;
+            line[edgeCount - 1].X1 = v1.X+10;
+            line[edgeCount - 1].Y1 = v1.Y+10;
+            line[edgeCount - 1].X2 = v2.X+10;
+            line[edgeCount - 1].Y2 = v2.Y+10;
             canvas.Children.Add(line[edgeCount - 1]);
         }
     }

GraphDrawer/GraphByMatrix.xaml

@@ -5,7 +5,7 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:GraphDrawer"
         mc:Ignorable="d"
-        Title="GraphByMatrix" Height="500" Width="400">
+        Title="Graph Drawer" Height="500" Width="400">
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition/>
@@ -25,7 +25,7 @@
                 </ComboBox>
             </StackPanel>
             <StackPanel Grid.Column="1" VerticalAlignment="Center">
-                <Button x:Name="submitBtn" Content="Сохранить" Width="100" Height="30" Margin="5" VerticalAlignment="Center" Background="LightBlue" Click="submitBtn_Click"/>
+                <Button x:Name="submitBtn" Content="Сохранить" Width="100" Height="30" Margin="5" VerticalAlignment="Center" Background="LightBlue" Click="SubmitBtn_Click"/>
                 <Button x:Name="backBtn" Content="Назад" Width="100" Height="30" Margin="5" VerticalAlignment="Center" Background="IndianRed"/>
             </StackPanel>
             

GraphDrawer/GraphByMatrix.xaml.cs

@@ -24,7 +24,7 @@ namespace GraphDrawer
             InitializeComponent();
         }
 
-        private void submitBtn_Click(object sender, RoutedEventArgs e)
+        private void SubmitBtn_Click(object sender, RoutedEventArgs e)
         {
             ComboBoxItem selectedItem = (ComboBoxItem)ModeSelection.SelectedItem;
             if (selectedItem.Content.ToString() == "Матрица смежности")
@@ -48,30 +48,33 @@ namespace GraphDrawer
             var line = MatrixTextBox.GetLineText(0);
             line = RemoveEmptyEntries(line);
             var length = line.Length;
-            string newText = String.Empty;
             List<string> lines = MatrixTextBox.Text.Split(new string[] { Environment.NewLine }, StringSplitOptions.RemoveEmptyEntries).ToList();
             for (int i = 0; i < lines.Count; i++)
             {
                 lines[i] = RemoveEmptyEntries(lines[i]);
             }
 
-            int[,] matrix = new int[length, lines.Count];
-            for (int i = 0; i < length; i++)
+            int[,] matrix = new int[lines.Count, length];
+            for(int i = 0; i < lines.Count; i++)
             {
-                line = lines[i];
-                for (int j = 0; j < lines.Count; j++)
+                var newLine = lines[i];
+                for(int j = 0; j < length; j++)
                 {
-                    matrix[i, j] = line[j];
+                    if (newLine[j] == '1')
+                        matrix[i, j] = 1;
+                    if (newLine[j] == '0')
+                        matrix[i, j] = 0;
                 }
             }
+            
 
             return matrix;
         }
 
         public string RemoveEmptyEntries(string line)
         {
-            line = line.Replace(", ", string.Empty);
             line = line.Replace(",", string.Empty);
+            line = line.Replace(", ", string.Empty);
             line = line.Replace(" ", string.Empty);
             line = line.Replace("\0", string.Empty);
             line = line.Replace("\n", string.Empty);

GraphDrawer/GraphDrawer.csproj

@@ -50,6 +50,21 @@
     <Reference Include="WindowsBase" />
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
+    <Reference Include="Xceed.Wpf.AvalonDock, Version=3.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.6.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=3.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.6.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=3.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.6.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=3.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.6.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.Toolkit, Version=3.6.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.6.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <ApplicationDefinition Include="App.xaml">
@@ -62,6 +77,9 @@
       <DependentUpon>ChoiceMode.xaml</DependentUpon>
     </Compile>
     <Compile Include="Edge.cs" />
+    <Compile Include="EdgeCreateWindow.xaml.cs">
+      <DependentUpon>EdgeCreateWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="GraphByClick.xaml.cs">
       <DependentUpon>GraphByClick.xaml</DependentUpon>
     </Compile>
@@ -77,6 +95,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="EdgeCreateWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="GraphByClick.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -120,6 +142,7 @@
       <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
+    <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>

GraphDrawer/obj/Debug/EdgeCreateWindow.g.i.cs

@@ -0,0 +1,98 @@
+#pragma checksum "..\..\EdgeCreateWindow.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "507A858302590857B6AC67D8CFE5AB61F574564D9CBA88CADDE68763FF6DB298"
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Diagnostics;
+using System.Windows;
+using System.Windows.Automation;
+using System.Windows.Controls;
+using System.Windows.Controls.Primitives;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Ink;
+using System.Windows.Input;
+using System.Windows.Markup;
+using System.Windows.Media;
+using System.Windows.Media.Animation;
+using System.Windows.Media.Effects;
+using System.Windows.Media.Imaging;
+using System.Windows.Media.Media3D;
+using System.Windows.Media.TextFormatting;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+using System.Windows.Shell;
+
+
+namespace GraphDrawer
+{
+
+
+    /// <summary>
+    /// EdgeCreateWindow
+    /// </summary>
+    public partial class EdgeCreateWindow : System.Windows.Window, System.Windows.Markup.IComponentConnector
+    {
+
+
+#line 15 "..\..\EdgeCreateWindow.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.Slider weightSlider;
+
+#line default
+#line hidden
+
+        private bool _contentLoaded;
+
+        /// <summary>
+        /// InitializeComponent
+        /// </summary>
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        public void InitializeComponent()
+        {
+            if (_contentLoaded)
+            {
+                return;
+            }
+            _contentLoaded = true;
+            System.Uri resourceLocater = new System.Uri("/GraphDrawer;component/edgecreatewindow.xaml", System.UriKind.Relative);
+
+#line 1 "..\..\EdgeCreateWindow.xaml"
+            System.Windows.Application.LoadComponent(this, resourceLocater);
+
+#line default
+#line hidden
+        }
+
+        [System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [System.CodeDom.Compiler.GeneratedCodeAttribute("PresentationBuildTasks", "4.0.0.0")]
+        [System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Design", "CA1033:InterfaceMethodsShouldBeCallableByChildTypes")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Maintainability", "CA1502:AvoidExcessiveComplexity")]
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")]
+        void System.Windows.Markup.IComponentConnector.Connect(int connectionId, object target)
+        {
+            switch (connectionId)
+            {
+                case 1:
+                    this.weightSlider = ((System.Windows.Controls.Slider)(target));
+                    return;
+            }
+            this._contentLoaded = true;
+        }
+
+        internal System.Windows.Controls.TextBox currentWeightBox;
+        internal System.Windows.Controls.Button focusedBtn;
+        internal System.Windows.Controls.Button unfocusedBtn;
+        internal Xceed.Wpf.Toolkit.ColorCanvas colorCanvas;
+    }
+}
+

GraphDrawer/obj/Debug/GraphByClick.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\GraphByClick.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "482C1987395841D59809FCC2DFB25DF4C7E2BEB738323A9183526CEF3BEAFF9D"
+#pragma checksum "..\..\GraphByClick.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1CCAD26DC76E062C5CCDC34BB65BA922D15C711F1316FE311D3F80CE290913B3"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -226,7 +226,7 @@ namespace GraphDrawer {
             this.focusedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 18 "..\..\GraphByClick.xaml"
-            this.focusedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.focusedGraphBtn_Click);
+            this.focusedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.FocusedGraphBtn_Click);
             
             #line default
             #line hidden
@@ -235,7 +235,7 @@ namespace GraphDrawer {
             this.unfocusedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 19 "..\..\GraphByClick.xaml"
-            this.unfocusedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.unfocusedGraphBtn_Click);
+            this.unfocusedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.UnfocusedGraphBtn_Click);
             
             #line default
             #line hidden
@@ -244,7 +244,7 @@ namespace GraphDrawer {
             this.namedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 22 "..\..\GraphByClick.xaml"
-            this.namedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.namedGraphBtn_Click);
+            this.namedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.NamedGraphBtn_Click);
             
             #line default
             #line hidden
@@ -253,7 +253,7 @@ namespace GraphDrawer {
             this.unnamedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 23 "..\..\GraphByClick.xaml"
-            this.unnamedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.unnamedGraphBtn_Click);
+            this.unnamedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.UnnamedGraphBtn_Click);
             
             #line default
             #line hidden
@@ -298,7 +298,7 @@ namespace GraphDrawer {
             this.clearBtn = ((System.Windows.Controls.Button)(target));
             
             #line 46 "..\..\GraphByClick.xaml"
-            this.clearBtn.Click += new System.Windows.RoutedEventHandler(this.clearBtn_Click);
+            this.clearBtn.Click += new System.Windows.RoutedEventHandler(this.ClearBtn_Click);
             
             #line default
             #line hidden
@@ -307,7 +307,7 @@ namespace GraphDrawer {
             this.exportPngBtn = ((System.Windows.Controls.Button)(target));
             
             #line 47 "..\..\GraphByClick.xaml"
-            this.exportPngBtn.Click += new System.Windows.RoutedEventHandler(this.exportPngBtn_Click);
+            this.exportPngBtn.Click += new System.Windows.RoutedEventHandler(this.ExportPngBtn_Click);
             
             #line default
             #line hidden
@@ -316,7 +316,7 @@ namespace GraphDrawer {
             this.backBtn = ((System.Windows.Controls.Button)(target));
             
             #line 48 "..\..\GraphByClick.xaml"
-            this.backBtn.Click += new System.Windows.RoutedEventHandler(this.backBtn_Click);
+            this.backBtn.Click += new System.Windows.RoutedEventHandler(this.BackBtn_Click);
             
             #line default
             #line hidden
@@ -325,7 +325,7 @@ namespace GraphDrawer {
             this.canvas = ((System.Windows.Controls.Canvas)(target));
             
             #line 51 "..\..\GraphByClick.xaml"
-            this.canvas.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.canvas_MouseUp);
+            this.canvas.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Canvas_MouseUp);
             
             #line default
             #line hidden
@@ -334,7 +334,7 @@ namespace GraphDrawer {
             this.saveBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 54 "..\..\GraphByClick.xaml"
-            this.saveBtn.Click += new System.Windows.RoutedEventHandler(this.exportPngBtn_Click);
+            this.saveBtn.Click += new System.Windows.RoutedEventHandler(this.ExportPngBtn_Click);
             
             #line default
             #line hidden
@@ -343,7 +343,7 @@ namespace GraphDrawer {
             this.printBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 55 "..\..\GraphByClick.xaml"
-            this.printBtn.Click += new System.Windows.RoutedEventHandler(this.printBtn_Click);
+            this.printBtn.Click += new System.Windows.RoutedEventHandler(this.PrintBtn_Click);
             
             #line default
             #line hidden
@@ -352,7 +352,7 @@ namespace GraphDrawer {
             this.delEdgeBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 60 "..\..\GraphByClick.xaml"
-            this.delEdgeBtn.Click += new System.Windows.RoutedEventHandler(this.delEdgeBtn_Click);
+            this.delEdgeBtn.Click += new System.Windows.RoutedEventHandler(this.DelEdgeBtn_Click);
             
             #line default
             #line hidden
@@ -364,7 +364,7 @@ namespace GraphDrawer {
             this.delAllBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 62 "..\..\GraphByClick.xaml"
-            this.delAllBtn.Click += new System.Windows.RoutedEventHandler(this.clearBtn_Click);
+            this.delAllBtn.Click += new System.Windows.RoutedEventHandler(this.ClearBtn_Click);
             
             #line default
             #line hidden

GraphDrawer/obj/Debug/GraphByClick.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\GraphByClick.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "482C1987395841D59809FCC2DFB25DF4C7E2BEB738323A9183526CEF3BEAFF9D"
+#pragma checksum "..\..\GraphByClick.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1CCAD26DC76E062C5CCDC34BB65BA922D15C711F1316FE311D3F80CE290913B3"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -226,7 +226,7 @@ namespace GraphDrawer {
             this.focusedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 18 "..\..\GraphByClick.xaml"
-            this.focusedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.focusedGraphBtn_Click);
+            this.focusedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.FocusedGraphBtn_Click);
             
             #line default
             #line hidden
@@ -235,7 +235,7 @@ namespace GraphDrawer {
             this.unfocusedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 19 "..\..\GraphByClick.xaml"
-            this.unfocusedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.unfocusedGraphBtn_Click);
+            this.unfocusedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.UnfocusedGraphBtn_Click);
             
             #line default
             #line hidden
@@ -244,7 +244,7 @@ namespace GraphDrawer {
             this.namedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 22 "..\..\GraphByClick.xaml"
-            this.namedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.namedGraphBtn_Click);
+            this.namedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.NamedGraphBtn_Click);
             
             #line default
             #line hidden
@@ -253,7 +253,7 @@ namespace GraphDrawer {
             this.unnamedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 23 "..\..\GraphByClick.xaml"
-            this.unnamedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.unnamedGraphBtn_Click);
+            this.unnamedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.UnnamedGraphBtn_Click);
             
             #line default
             #line hidden
@@ -298,7 +298,7 @@ namespace GraphDrawer {
             this.clearBtn = ((System.Windows.Controls.Button)(target));
             
             #line 46 "..\..\GraphByClick.xaml"
-            this.clearBtn.Click += new System.Windows.RoutedEventHandler(this.clearBtn_Click);
+            this.clearBtn.Click += new System.Windows.RoutedEventHandler(this.ClearBtn_Click);
             
             #line default
             #line hidden
@@ -307,7 +307,7 @@ namespace GraphDrawer {
             this.exportPngBtn = ((System.Windows.Controls.Button)(target));
             
             #line 47 "..\..\GraphByClick.xaml"
-            this.exportPngBtn.Click += new System.Windows.RoutedEventHandler(this.exportPngBtn_Click);
+            this.exportPngBtn.Click += new System.Windows.RoutedEventHandler(this.ExportPngBtn_Click);
             
             #line default
             #line hidden
@@ -316,7 +316,7 @@ namespace GraphDrawer {
             this.backBtn = ((System.Windows.Controls.Button)(target));
             
             #line 48 "..\..\GraphByClick.xaml"
-            this.backBtn.Click += new System.Windows.RoutedEventHandler(this.backBtn_Click);
+            this.backBtn.Click += new System.Windows.RoutedEventHandler(this.BackBtn_Click);
             
             #line default
             #line hidden
@@ -325,7 +325,7 @@ namespace GraphDrawer {
             this.canvas = ((System.Windows.Controls.Canvas)(target));
             
             #line 51 "..\..\GraphByClick.xaml"
-            this.canvas.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.canvas_MouseUp);
+            this.canvas.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.Canvas_MouseUp);
             
             #line default
             #line hidden
@@ -334,7 +334,7 @@ namespace GraphDrawer {
             this.saveBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 54 "..\..\GraphByClick.xaml"
-            this.saveBtn.Click += new System.Windows.RoutedEventHandler(this.exportPngBtn_Click);
+            this.saveBtn.Click += new System.Windows.RoutedEventHandler(this.ExportPngBtn_Click);
             
             #line default
             #line hidden
@@ -343,7 +343,7 @@ namespace GraphDrawer {
             this.printBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 55 "..\..\GraphByClick.xaml"
-            this.printBtn.Click += new System.Windows.RoutedEventHandler(this.printBtn_Click);
+            this.printBtn.Click += new System.Windows.RoutedEventHandler(this.PrintBtn_Click);
             
             #line default
             #line hidden
@@ -352,7 +352,7 @@ namespace GraphDrawer {
             this.delEdgeBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 60 "..\..\GraphByClick.xaml"
-            this.delEdgeBtn.Click += new System.Windows.RoutedEventHandler(this.delEdgeBtn_Click);
+            this.delEdgeBtn.Click += new System.Windows.RoutedEventHandler(this.DelEdgeBtn_Click);
             
             #line default
             #line hidden
@@ -364,7 +364,7 @@ namespace GraphDrawer {
             this.delAllBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 62 "..\..\GraphByClick.xaml"
-            this.delAllBtn.Click += new System.Windows.RoutedEventHandler(this.clearBtn_Click);
+            this.delAllBtn.Click += new System.Windows.RoutedEventHandler(this.ClearBtn_Click);
             
             #line default
             #line hidden

GraphDrawer/obj/Debug/GraphByMatrix.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\GraphByMatrix.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CAF739FF9254FDE185A4182EF86DE4975E74CF50D3CC2D451F255D02676FF1FC"
+#pragma checksum "..\..\GraphByMatrix.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1D143066A8DED68F35CDF8F8A0F9C2281B1A37D2869DF71A9BD514259D343BDF"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -123,7 +123,7 @@ namespace GraphDrawer {
             this.submitBtn = ((System.Windows.Controls.Button)(target));
             
             #line 28 "..\..\GraphByMatrix.xaml"
-            this.submitBtn.Click += new System.Windows.RoutedEventHandler(this.submitBtn_Click);
+            this.submitBtn.Click += new System.Windows.RoutedEventHandler(this.SubmitBtn_Click);
             
             #line default
             #line hidden

GraphDrawer/obj/Debug/GraphByMatrix.g.i.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\GraphByMatrix.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CAF739FF9254FDE185A4182EF86DE4975E74CF50D3CC2D451F255D02676FF1FC"
+#pragma checksum "..\..\GraphByMatrix.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "1D143066A8DED68F35CDF8F8A0F9C2281B1A37D2869DF71A9BD514259D343BDF"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -123,7 +123,7 @@ namespace GraphDrawer {
             this.submitBtn = ((System.Windows.Controls.Button)(target));
             
             #line 28 "..\..\GraphByMatrix.xaml"
-            this.submitBtn.Click += new System.Windows.RoutedEventHandler(this.submitBtn_Click);
+            this.submitBtn.Click += new System.Windows.RoutedEventHandler(this.SubmitBtn_Click);
             
             #line default
             #line hidden

GraphDrawer/obj/Debug/GraphDrawer_MarkupCompile.i.cache

@@ -10,11 +10,11 @@ none
 false
 DEBUG;TRACE
 C:\Users\locadm\Desktop\Graphs\GraphDrawer\App.xaml
-5-61230628
+6344643144
 
-15827318305
-141183416626
-ChoiceMode.xaml;GraphByClick.xaml;GraphByMatrix.xaml;MainWindow.xaml;MatrixOutput.xaml;
+161529146020
+191470239246
+ChoiceMode.xaml;EdgeCreateWindow.xaml;GraphByClick.xaml;GraphByMatrix.xaml;MainWindow.xaml;MatrixOutput.xaml;
 
 True
 

GraphDrawer/obj/Debug/GraphDrawer_MarkupCompile.i.lref

@@ -1,5 +1,7 @@
 
 
 FC:\Users\locadm\Desktop\Graphs\GraphDrawer\GraphByClick.xaml;;
+FC:\Users\locadm\Desktop\Graphs\GraphDrawer\GraphByMatrix.xaml;;
+FC:\Users\locadm\Desktop\Graphs\GraphDrawer\MainWindow.xaml;;
 FC:\Users\locadm\Desktop\Graphs\GraphDrawer\MatrixOutput.xaml;;
 

GraphDrawer/packages.config

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Extended.Wpf.Toolkit" version="3.6.0" targetFramework="net472" />
+</packages>