0.0.6

+ Подписи к графам
+ Переключение между режимами
- Ребра графов (временно)

GraphDrawer/GraphByClick.xaml

@@ -14,25 +14,31 @@
         </Grid.RowDefinitions>
         <Menu Height="25" VerticalAlignment="Top" Margin="0,0,0,1">
             <MenuItem Header="Вид графа" VerticalAlignment="Center" Height="25">
-                <MenuItem Header="Петли">
-                    <MenuItem Header="Мультиграф" x:Name="multiGraphBtn" Click="multiGraphBtn_Click"/>
-                    <MenuItem Header="Псевдограф" x:Name="pseudoGraphBtn" Click="pseudoGraphBtn_Click"/>
-                </MenuItem>
                 <MenuItem Header="Направление">
                     <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>
+            </MenuItem>
+            <MenuItem Header="Функции">
+                <MenuItem Header="Алгоритмы">
+                    
+                </MenuItem>
+                <MenuItem Header="WIP">
+                    
+                </MenuItem>
             </MenuItem>
         </Menu>
         <Grid x:Name="choiceGrid" VerticalAlignment="Center" HorizontalAlignment="Left" Margin="10,25,0,0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="1.8*"/>
                 <ColumnDefinition/>
-                <ColumnDefinition/>
             </Grid.ColumnDefinitions>
             <RadioButton IsChecked="True" x:Name="vertexRb" Content="Вершина" FontSize="20" Margin="10,0"/>
             <RadioButton x:Name="edgeRb" Content="Ребро" FontSize="20" Grid.Column="1" Margin="10,0"/>
-            <RadioButton x:Name="arcRb" Content="Дуга" FontSize="20" Grid.Column="2" 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"/>
@@ -43,8 +49,8 @@
         <Canvas Grid.Row="1" Background="White" x:Name="canvas" MouseLeftButtonUp="canvas_MouseUp">
             <Canvas.ContextMenu>
                 <ContextMenu>
-                    <MenuItem Name="saveBtn" Click="exportPngBtn_Click" Header="Сохранить"/>
-                    <MenuItem x:Name="printBtn" Click="printBtn_Click" Header="Печать"/>
+                    <MenuItem Name="saveBtn" Click="exportPngBtn_Click" Header="Сохранить" Icon="💾"/>
+                    <MenuItem x:Name="printBtn" Click="printBtn_Click" Header="Печать" Icon="🖨️"/>
                     <MenuItem Header="Удалить">
                         <MenuItem.Icon>
                             <TextBlock Text="🗑"/>
@@ -57,4 +63,4 @@
             </Canvas.ContextMenu>
         </Canvas>
     </Grid>
-</Window>
+</Window>

GraphDrawer/GraphByClick.xaml.cs

@@ -41,7 +41,14 @@ namespace GraphDrawer
             int y = Convert.ToInt32(point.Y);
             if (vertexRb.IsChecked == true)
             {
-                VertexArray.AddVertex(canvas, x, y);
+                if (GraphState.named)
+                {
+                    VertexArray.AddNamedVertex(canvas, x, y);
+                }
+                else
+                {
+                    VertexArray.AddVertex(canvas, x, y);
+                }
             }
             if(edgeRb.IsChecked == true)
             {
@@ -137,16 +144,6 @@ namespace GraphDrawer
 
 
         // Кнопки меню
-        private void pseudoGraphBtn_Click(object sender, RoutedEventArgs e)
-        {
-            GraphState.supergraph = false;
-        }
-
-        private void multiGraphBtn_Click(object sender, RoutedEventArgs e)
-        {
-            GraphState.supergraph = true;
-        }
-
         private void unfocusedGraphBtn_Click(object sender, RoutedEventArgs e)
         {
             GraphState.focused = false;
@@ -206,6 +203,16 @@ namespace GraphDrawer
             PrintDialog printDialog = new PrintDialog();
             printDialog.PrintVisual(canvas, "Your graph");
         }
+
+        private void namedGraphBtn_Click(object sender, RoutedEventArgs e)
+        {
+            GraphState.named = true;
+        }
+
+        private void unnamedGraphBtn_Click(object sender, RoutedEventArgs e)
+        {
+            GraphState.named = false;
+        }
     }
 
     public class VertexArray
@@ -215,6 +222,7 @@ namespace GraphDrawer
         public static Ellipse[] ellipse = new Ellipse[vertexCount];
         public static Edge[] edge = new Edge[vertexCount];
         public static Vertex[] buffer = new Vertex[2];
+        public static Label[] label = new Label[vertexCount];
 
         public static int AddVertex(Canvas canvas, int x, int y)
         {
@@ -236,6 +244,36 @@ namespace GraphDrawer
             canvas.Children.Add(ellipse[vertexCount-1]);
             return vertexCount-1;
         }
+
+        public static int AddNamedVertex(Canvas canvas, int x, int y)
+        {
+            vertexCount++;
+            Array.Resize(ref vertex, vertexCount);
+            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;
+            ellipse[vertexCount - 1] = new Ellipse
+            {
+                Height = 10,
+                Width = 10,
+                StrokeThickness = 2,
+                Stroke = new SolidColorBrush(Color.FromRgb(0, 0, 0))
+            };
+
+
+            ellipse[vertexCount - 1].Fill = ellipse[vertexCount - 1].Stroke;
+            label[vertexCount - 1].Content = vertexCount.ToString();
+            Canvas.SetTop(ellipse[vertexCount - 1], vertex[vertexCount - 1].Y);
+            Canvas.SetLeft(ellipse[vertexCount - 1], vertex[vertexCount - 1].X);
+            canvas.Children.Add(ellipse[vertexCount - 1]);
+            Canvas.SetTop(label[vertexCount - 1], vertex[vertexCount - 1].Y+5);
+            Canvas.SetLeft(label[vertexCount - 1], vertex[vertexCount - 1].X-15);
+            canvas.Children.Add(label[vertexCount-1]);
+            return vertexCount - 1;
+        }
     }
 
     public class EdgeArray
@@ -286,4 +324,6 @@ namespace GraphDrawer
             EdgeArray.edgeCount = edgeCount;
         }
     }
+
+    
 }

GraphDrawer/GraphState.cs

@@ -8,7 +8,7 @@ namespace GraphDrawer
 {
     class GraphState
     {
-        public static bool supergraph = true;
         public static bool focused = false;
+        public static bool named = false;
     }
 }

GraphDrawer/obj/Debug/GraphByClick.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\GraphByClick.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CA556E9DC71E75B50735953F3A965C91F99DFC57958C3FBD3855E274361DB281"
+#pragma checksum "..\..\GraphByClick.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "54985F503863C1EA05F6F4982CB93E9AB124A1985FA47F261FE6086EEB96BFAC"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -43,7 +43,7 @@ namespace GraphDrawer {
         
         #line 18 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem multiGraphBtn;
+        internal System.Windows.Controls.MenuItem focusedGraphBtn;
         
         #line default
         #line hidden
@@ -51,7 +51,7 @@ namespace GraphDrawer {
         
         #line 19 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem pseudoGraphBtn;
+        internal System.Windows.Controls.MenuItem unfocusedGraphBtn;
         
         #line default
         #line hidden
@@ -59,7 +59,7 @@ namespace GraphDrawer {
         
         #line 22 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem focusedGraphBtn;
+        internal System.Windows.Controls.MenuItem namedGraphBtn;
         
         #line default
         #line hidden
@@ -67,7 +67,7 @@ namespace GraphDrawer {
         
         #line 23 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem unfocusedGraphBtn;
+        internal System.Windows.Controls.MenuItem unnamedGraphBtn;
         
         #line default
         #line hidden
@@ -81,7 +81,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 33 "..\..\GraphByClick.xaml"
+        #line 32 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton vertexRb;
         
@@ -89,7 +89,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 34 "..\..\GraphByClick.xaml"
+        #line 33 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton edgeRb;
         
@@ -97,15 +97,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 35 "..\..\GraphByClick.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.RadioButton arcRb;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 38 "..\..\GraphByClick.xaml"
+        #line 36 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button clearBtn;
         
@@ -113,7 +105,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 39 "..\..\GraphByClick.xaml"
+        #line 37 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button exportPngBtn;
         
@@ -121,7 +113,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 40 "..\..\GraphByClick.xaml"
+        #line 38 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button backBtn;
         
@@ -129,7 +121,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 43 "..\..\GraphByClick.xaml"
+        #line 41 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Canvas canvas;
         
@@ -137,7 +129,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 46 "..\..\GraphByClick.xaml"
+        #line 44 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem saveBtn;
         
@@ -145,7 +137,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 47 "..\..\GraphByClick.xaml"
+        #line 45 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem printBtn;
         
@@ -153,7 +145,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 52 "..\..\GraphByClick.xaml"
+        #line 50 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem delEdgeBtn;
         
@@ -161,7 +153,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 53 "..\..\GraphByClick.xaml"
+        #line 51 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem delArcBtn;
         
@@ -169,7 +161,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 54 "..\..\GraphByClick.xaml"
+        #line 52 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem delAllBtn;
         
@@ -207,37 +199,37 @@ namespace GraphDrawer {
             switch (connectionId)
             {
             case 1:
-            this.multiGraphBtn = ((System.Windows.Controls.MenuItem)(target));
+            this.focusedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 18 "..\..\GraphByClick.xaml"
-            this.multiGraphBtn.Click += new System.Windows.RoutedEventHandler(this.multiGraphBtn_Click);
+            this.focusedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.focusedGraphBtn_Click);
             
             #line default
             #line hidden
             return;
             case 2:
-            this.pseudoGraphBtn = ((System.Windows.Controls.MenuItem)(target));
+            this.unfocusedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 19 "..\..\GraphByClick.xaml"
-            this.pseudoGraphBtn.Click += new System.Windows.RoutedEventHandler(this.pseudoGraphBtn_Click);
+            this.unfocusedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.unfocusedGraphBtn_Click);
             
             #line default
             #line hidden
             return;
             case 3:
-            this.focusedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
+            this.namedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 22 "..\..\GraphByClick.xaml"
-            this.focusedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.focusedGraphBtn_Click);
+            this.namedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.namedGraphBtn_Click);
             
             #line default
             #line hidden
             return;
             case 4:
-            this.unfocusedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
+            this.unnamedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 23 "..\..\GraphByClick.xaml"
-            this.unfocusedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.unfocusedGraphBtn_Click);
+            this.unnamedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.unnamedGraphBtn_Click);
             
             #line default
             #line hidden
@@ -252,78 +244,75 @@ namespace GraphDrawer {
             this.edgeRb = ((System.Windows.Controls.RadioButton)(target));
             return;
             case 8:
-            this.arcRb = ((System.Windows.Controls.RadioButton)(target));
-            return;
-            case 9:
             this.clearBtn = ((System.Windows.Controls.Button)(target));
             
-            #line 38 "..\..\GraphByClick.xaml"
+            #line 36 "..\..\GraphByClick.xaml"
             this.clearBtn.Click += new System.Windows.RoutedEventHandler(this.clearBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 10:
+            case 9:
             this.exportPngBtn = ((System.Windows.Controls.Button)(target));
             
-            #line 39 "..\..\GraphByClick.xaml"
+            #line 37 "..\..\GraphByClick.xaml"
             this.exportPngBtn.Click += new System.Windows.RoutedEventHandler(this.exportPngBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 11:
+            case 10:
             this.backBtn = ((System.Windows.Controls.Button)(target));
             
-            #line 40 "..\..\GraphByClick.xaml"
+            #line 38 "..\..\GraphByClick.xaml"
             this.backBtn.Click += new System.Windows.RoutedEventHandler(this.backBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 12:
+            case 11:
             this.canvas = ((System.Windows.Controls.Canvas)(target));
             
-            #line 43 "..\..\GraphByClick.xaml"
+            #line 41 "..\..\GraphByClick.xaml"
             this.canvas.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.canvas_MouseUp);
             
             #line default
             #line hidden
             return;
-            case 13:
+            case 12:
             this.saveBtn = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 46 "..\..\GraphByClick.xaml"
+            #line 44 "..\..\GraphByClick.xaml"
             this.saveBtn.Click += new System.Windows.RoutedEventHandler(this.exportPngBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 14:
+            case 13:
             this.printBtn = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 47 "..\..\GraphByClick.xaml"
+            #line 45 "..\..\GraphByClick.xaml"
             this.printBtn.Click += new System.Windows.RoutedEventHandler(this.printBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 15:
+            case 14:
             this.delEdgeBtn = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 52 "..\..\GraphByClick.xaml"
+            #line 50 "..\..\GraphByClick.xaml"
             this.delEdgeBtn.Click += new System.Windows.RoutedEventHandler(this.delEdgeBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 16:
+            case 15:
             this.delArcBtn = ((System.Windows.Controls.MenuItem)(target));
             return;
-            case 17:
+            case 16:
             this.delAllBtn = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 54 "..\..\GraphByClick.xaml"
+            #line 52 "..\..\GraphByClick.xaml"
             this.delAllBtn.Click += new System.Windows.RoutedEventHandler(this.clearBtn_Click);
             
             #line default

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

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\GraphByClick.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CA556E9DC71E75B50735953F3A965C91F99DFC57958C3FBD3855E274361DB281"
+#pragma checksum "..\..\GraphByClick.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "54985F503863C1EA05F6F4982CB93E9AB124A1985FA47F261FE6086EEB96BFAC"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -43,7 +43,7 @@ namespace GraphDrawer {
         
         #line 18 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem multiGraphBtn;
+        internal System.Windows.Controls.MenuItem focusedGraphBtn;
         
         #line default
         #line hidden
@@ -51,7 +51,7 @@ namespace GraphDrawer {
         
         #line 19 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem pseudoGraphBtn;
+        internal System.Windows.Controls.MenuItem unfocusedGraphBtn;
         
         #line default
         #line hidden
@@ -59,7 +59,7 @@ namespace GraphDrawer {
         
         #line 22 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem focusedGraphBtn;
+        internal System.Windows.Controls.MenuItem namedGraphBtn;
         
         #line default
         #line hidden
@@ -67,7 +67,7 @@ namespace GraphDrawer {
         
         #line 23 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.MenuItem unfocusedGraphBtn;
+        internal System.Windows.Controls.MenuItem unnamedGraphBtn;
         
         #line default
         #line hidden
@@ -81,7 +81,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 33 "..\..\GraphByClick.xaml"
+        #line 32 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton vertexRb;
         
@@ -89,7 +89,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 34 "..\..\GraphByClick.xaml"
+        #line 33 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.RadioButton edgeRb;
         
@@ -97,15 +97,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 35 "..\..\GraphByClick.xaml"
-        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.RadioButton arcRb;
-        
-        #line default
-        #line hidden
-        
-        
-        #line 38 "..\..\GraphByClick.xaml"
+        #line 36 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button clearBtn;
         
@@ -113,7 +105,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 39 "..\..\GraphByClick.xaml"
+        #line 37 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button exportPngBtn;
         
@@ -121,7 +113,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 40 "..\..\GraphByClick.xaml"
+        #line 38 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Button backBtn;
         
@@ -129,7 +121,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 43 "..\..\GraphByClick.xaml"
+        #line 41 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.Canvas canvas;
         
@@ -137,7 +129,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 46 "..\..\GraphByClick.xaml"
+        #line 44 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem saveBtn;
         
@@ -145,7 +137,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 47 "..\..\GraphByClick.xaml"
+        #line 45 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem printBtn;
         
@@ -153,7 +145,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 52 "..\..\GraphByClick.xaml"
+        #line 50 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem delEdgeBtn;
         
@@ -161,7 +153,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 53 "..\..\GraphByClick.xaml"
+        #line 51 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem delArcBtn;
         
@@ -169,7 +161,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 54 "..\..\GraphByClick.xaml"
+        #line 52 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem delAllBtn;
         
@@ -207,37 +199,37 @@ namespace GraphDrawer {
             switch (connectionId)
             {
             case 1:
-            this.multiGraphBtn = ((System.Windows.Controls.MenuItem)(target));
+            this.focusedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 18 "..\..\GraphByClick.xaml"
-            this.multiGraphBtn.Click += new System.Windows.RoutedEventHandler(this.multiGraphBtn_Click);
+            this.focusedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.focusedGraphBtn_Click);
             
             #line default
             #line hidden
             return;
             case 2:
-            this.pseudoGraphBtn = ((System.Windows.Controls.MenuItem)(target));
+            this.unfocusedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 19 "..\..\GraphByClick.xaml"
-            this.pseudoGraphBtn.Click += new System.Windows.RoutedEventHandler(this.pseudoGraphBtn_Click);
+            this.unfocusedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.unfocusedGraphBtn_Click);
             
             #line default
             #line hidden
             return;
             case 3:
-            this.focusedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
+            this.namedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 22 "..\..\GraphByClick.xaml"
-            this.focusedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.focusedGraphBtn_Click);
+            this.namedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.namedGraphBtn_Click);
             
             #line default
             #line hidden
             return;
             case 4:
-            this.unfocusedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
+            this.unnamedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
             
             #line 23 "..\..\GraphByClick.xaml"
-            this.unfocusedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.unfocusedGraphBtn_Click);
+            this.unnamedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.unnamedGraphBtn_Click);
             
             #line default
             #line hidden
@@ -252,78 +244,75 @@ namespace GraphDrawer {
             this.edgeRb = ((System.Windows.Controls.RadioButton)(target));
             return;
             case 8:
-            this.arcRb = ((System.Windows.Controls.RadioButton)(target));
-            return;
-            case 9:
             this.clearBtn = ((System.Windows.Controls.Button)(target));
             
-            #line 38 "..\..\GraphByClick.xaml"
+            #line 36 "..\..\GraphByClick.xaml"
             this.clearBtn.Click += new System.Windows.RoutedEventHandler(this.clearBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 10:
+            case 9:
             this.exportPngBtn = ((System.Windows.Controls.Button)(target));
             
-            #line 39 "..\..\GraphByClick.xaml"
+            #line 37 "..\..\GraphByClick.xaml"
             this.exportPngBtn.Click += new System.Windows.RoutedEventHandler(this.exportPngBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 11:
+            case 10:
             this.backBtn = ((System.Windows.Controls.Button)(target));
             
-            #line 40 "..\..\GraphByClick.xaml"
+            #line 38 "..\..\GraphByClick.xaml"
             this.backBtn.Click += new System.Windows.RoutedEventHandler(this.backBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 12:
+            case 11:
             this.canvas = ((System.Windows.Controls.Canvas)(target));
             
-            #line 43 "..\..\GraphByClick.xaml"
+            #line 41 "..\..\GraphByClick.xaml"
             this.canvas.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.canvas_MouseUp);
             
             #line default
             #line hidden
             return;
-            case 13:
+            case 12:
             this.saveBtn = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 46 "..\..\GraphByClick.xaml"
+            #line 44 "..\..\GraphByClick.xaml"
             this.saveBtn.Click += new System.Windows.RoutedEventHandler(this.exportPngBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 14:
+            case 13:
             this.printBtn = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 47 "..\..\GraphByClick.xaml"
+            #line 45 "..\..\GraphByClick.xaml"
             this.printBtn.Click += new System.Windows.RoutedEventHandler(this.printBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 15:
+            case 14:
             this.delEdgeBtn = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 52 "..\..\GraphByClick.xaml"
+            #line 50 "..\..\GraphByClick.xaml"
             this.delEdgeBtn.Click += new System.Windows.RoutedEventHandler(this.delEdgeBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 16:
+            case 15:
             this.delArcBtn = ((System.Windows.Controls.MenuItem)(target));
             return;
-            case 17:
+            case 16:
             this.delAllBtn = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 54 "..\..\GraphByClick.xaml"
+            #line 52 "..\..\GraphByClick.xaml"
             this.delAllBtn.Click += new System.Windows.RoutedEventHandler(this.clearBtn_Click);
             
             #line default