0.0.5

+ Пункты контекстного меню
   + Удаление отдельных групп элементов графа
+ Минорные изменения

GraphDrawer/GraphByClick.xaml

@@ -3,7 +3,7 @@
         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"
-        xmlns:local="clr-namespace:GraphDrawer"
+        xmlns:local="clr-namespace:GraphDrawer.Properties"
         mc:Ignorable="d"
         Title="Graph Drawer" Height="500" Width="800">
     <Grid  Background="LightBlue">
@@ -13,7 +13,7 @@
             <RowDefinition Height="0.8*"/>
         </Grid.RowDefinitions>
         <Menu Height="25" VerticalAlignment="Top" Margin="0,0,0,1">
-            <MenuItem Header="Вид" VerticalAlignment="Center" Height="25">
+            <MenuItem Header="Вид графа" VerticalAlignment="Center" Height="25">
                 <MenuItem Header="Петли">
                     <MenuItem Header="Мультиграф" x:Name="multiGraphBtn" Click="multiGraphBtn_Click"/>
                     <MenuItem Header="Псевдограф" x:Name="pseudoGraphBtn" Click="pseudoGraphBtn_Click"/>
@@ -40,13 +40,18 @@
             <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" MouseUp="canvas_MouseUp">
+        <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 Header="Удалить">
-                        <MenuItem Header="Все ребра"/>
-                        <MenuItem Header="Все дуги"/>
-                        <MenuItem Header="Все элементы"/>
+                        <MenuItem.Icon>
+                            <TextBlock Text="🗑"/>
+                        </MenuItem.Icon>
+                        <MenuItem Name="delEdgeBtn" Header="Все ребра" Click="delEdgeBtn_Click"/>
+                        <MenuItem Name="delArcBtn" Header="Все дуги"/>
+                        <MenuItem Name="delAllBtn" Header="Все элементы" Click="clearBtn_Click"/>
                     </MenuItem>
                 </ContextMenu>
             </Canvas.ContextMenu>

GraphDrawer/GraphByClick.xaml.cs

@@ -33,8 +33,6 @@ namespace GraphDrawer
             regime.Show();
             Close();
         }
-
-        Vertex[] buffer = new Vertex[2];
         private void canvas_MouseUp(object sender, MouseButtonEventArgs e)
         {
             
@@ -161,8 +159,10 @@ namespace GraphDrawer
 
         private void exportPngBtn_Click(object sender, RoutedEventArgs e)
         {
-            SaveFileDialog sfg = new SaveFileDialog();
-            sfg.Filter = "PNG (*.png) | *.png";
+            SaveFileDialog sfg = new SaveFileDialog
+            {
+                Filter = "PNG (*.png) | *.png"
+            };
             sfg.ShowDialog();
             string filename = sfg.FileName;
             Rect rect = new Rect(canvas.Margin.Left, canvas.Margin.Top, canvas.ActualWidth, canvas.ActualHeight);
@@ -190,6 +190,22 @@ namespace GraphDrawer
                 MessageBox.Show(err.ToString(), "Error", MessageBoxButton.OK, MessageBoxImage.Error);
             }
         }
+
+        private void delEdgeBtn_Click(object sender, RoutedEventArgs e)
+        {
+            for(int i = 0; i < EdgeArray.edgeCount; i++)
+            {
+                canvas.Children.Remove(EdgeArray.line[i]);
+            }
+            EdgeArray.edgeCount = 0;
+            Array.Clear(EdgeArray.edge, 0, EdgeArray.edge.Length);
+        }
+
+        private void printBtn_Click(object sender, RoutedEventArgs e)
+        {
+            PrintDialog printDialog = new PrintDialog();
+            printDialog.PrintVisual(canvas, "Your graph");
+        }
     }
 
     public class VertexArray
@@ -207,11 +223,13 @@ namespace GraphDrawer
             Array.Resize(ref vertex, vertexCount);
             Array.Resize(ref ellipse, vertexCount);
             vertex[vertexCount-1] = new Vertex(x, y);
-            ellipse[vertexCount-1] = new Ellipse();
-            ellipse[vertexCount-1].Height = 10;
-            ellipse[vertexCount-1].Width = 10;
-            ellipse[vertexCount-1].StrokeThickness = 2;
-            ellipse[vertexCount-1].Stroke = new SolidColorBrush(Color.FromRgb(0, 0, 0));
+            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;
             Canvas.SetTop(ellipse[vertexCount-1], vertex[vertexCount-1].Y);
             Canvas.SetLeft(ellipse[vertexCount-1], vertex[vertexCount-1].X);

GraphDrawer/GraphDrawer.csproj

@@ -37,6 +37,7 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
     <Reference Include="System.Xml" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Core" />
@@ -102,7 +103,7 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
     <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
+      <Generator>PublicResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
     <None Include="Properties\Settings.settings">
@@ -113,5 +114,8 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="Resources\delIcon.jpg" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

GraphDrawer/Properties/Resources.Designer.cs

@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace GraphDrawer.Properties
-{
-
-
+namespace GraphDrawer.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,53 +19,55 @@ namespace GraphDrawer.Properties
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    public class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        public static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("GraphDrawer.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        public static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        /// </summary>
+        public static System.Drawing.Bitmap delIcon {
+            get {
+                object obj = ResourceManager.GetObject("delIcon", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
     }
 }

GraphDrawer/Properties/Resources.resx

@@ -46,7 +46,7 @@
     
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
             : and then encoded with base64 encoding.
     -->
   <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
     <xsd:element name="root" msdata:IsDataSet="true">
       <xsd:complexType>
         <xsd:choice maxOccurs="unbounded">
@@ -68,9 +69,10 @@
               <xsd:sequence>
                 <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="name" use="required" type="xsd:string" />
               <xsd:attribute name="type" type="xsd:string" />
               <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="assembly">
@@ -85,9 +87,10 @@
                 <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
                 <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
               <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
               <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
             </xsd:complexType>
           </xsd:element>
           <xsd:element name="resheader">
@@ -109,9 +112,13 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <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="delIcon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\delIcon.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>

GraphDrawer/obj/Debug/GraphByClick.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\GraphByClick.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A5E3E8CF98D1C938DB97C7160BCC519F7D60D6C49335A42FBA8C273901E87830"
+#pragma checksum "..\..\GraphByClick.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CA556E9DC71E75B50735953F3A965C91F99DFC57958C3FBD3855E274361DB281"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -9,7 +9,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-using GraphDrawer;
+using GraphDrawer.Properties;
 using System;
 using System.Diagnostics;
 using System.Windows;
@@ -136,6 +136,46 @@ namespace GraphDrawer {
         #line default
         #line hidden
         
+        
+        #line 46 "..\..\GraphByClick.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.MenuItem saveBtn;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 47 "..\..\GraphByClick.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.MenuItem printBtn;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 52 "..\..\GraphByClick.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.MenuItem delEdgeBtn;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 53 "..\..\GraphByClick.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.MenuItem delArcBtn;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 54 "..\..\GraphByClick.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.MenuItem delAllBtn;
+        
+        #line default
+        #line hidden
+        
         private bool _contentLoaded;
         
         /// <summary>
@@ -245,7 +285,46 @@ namespace GraphDrawer {
             this.canvas = ((System.Windows.Controls.Canvas)(target));
             
             #line 43 "..\..\GraphByClick.xaml"
-            this.canvas.MouseUp += new System.Windows.Input.MouseButtonEventHandler(this.canvas_MouseUp);
+            this.canvas.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.canvas_MouseUp);
+            
+            #line default
+            #line hidden
+            return;
+            case 13:
+            this.saveBtn = ((System.Windows.Controls.MenuItem)(target));
+            
+            #line 46 "..\..\GraphByClick.xaml"
+            this.saveBtn.Click += new System.Windows.RoutedEventHandler(this.exportPngBtn_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 14:
+            this.printBtn = ((System.Windows.Controls.MenuItem)(target));
+            
+            #line 47 "..\..\GraphByClick.xaml"
+            this.printBtn.Click += new System.Windows.RoutedEventHandler(this.printBtn_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 15:
+            this.delEdgeBtn = ((System.Windows.Controls.MenuItem)(target));
+            
+            #line 52 "..\..\GraphByClick.xaml"
+            this.delEdgeBtn.Click += new System.Windows.RoutedEventHandler(this.delEdgeBtn_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 16:
+            this.delArcBtn = ((System.Windows.Controls.MenuItem)(target));
+            return;
+            case 17:
+            this.delAllBtn = ((System.Windows.Controls.MenuItem)(target));
+            
+            #line 54 "..\..\GraphByClick.xaml"
+            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}" "A5E3E8CF98D1C938DB97C7160BCC519F7D60D6C49335A42FBA8C273901E87830"
+#pragma checksum "..\..\GraphByClick.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "CA556E9DC71E75B50735953F3A965C91F99DFC57958C3FBD3855E274361DB281"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -9,7 +9,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-using GraphDrawer;
+using GraphDrawer.Properties;
 using System;
 using System.Diagnostics;
 using System.Windows;
@@ -136,6 +136,46 @@ namespace GraphDrawer {
         #line default
         #line hidden
         
+        
+        #line 46 "..\..\GraphByClick.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.MenuItem saveBtn;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 47 "..\..\GraphByClick.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.MenuItem printBtn;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 52 "..\..\GraphByClick.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.MenuItem delEdgeBtn;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 53 "..\..\GraphByClick.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.MenuItem delArcBtn;
+        
+        #line default
+        #line hidden
+        
+        
+        #line 54 "..\..\GraphByClick.xaml"
+        [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
+        internal System.Windows.Controls.MenuItem delAllBtn;
+        
+        #line default
+        #line hidden
+        
         private bool _contentLoaded;
         
         /// <summary>
@@ -245,7 +285,46 @@ namespace GraphDrawer {
             this.canvas = ((System.Windows.Controls.Canvas)(target));
             
             #line 43 "..\..\GraphByClick.xaml"
-            this.canvas.MouseUp += new System.Windows.Input.MouseButtonEventHandler(this.canvas_MouseUp);
+            this.canvas.MouseLeftButtonUp += new System.Windows.Input.MouseButtonEventHandler(this.canvas_MouseUp);
+            
+            #line default
+            #line hidden
+            return;
+            case 13:
+            this.saveBtn = ((System.Windows.Controls.MenuItem)(target));
+            
+            #line 46 "..\..\GraphByClick.xaml"
+            this.saveBtn.Click += new System.Windows.RoutedEventHandler(this.exportPngBtn_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 14:
+            this.printBtn = ((System.Windows.Controls.MenuItem)(target));
+            
+            #line 47 "..\..\GraphByClick.xaml"
+            this.printBtn.Click += new System.Windows.RoutedEventHandler(this.printBtn_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 15:
+            this.delEdgeBtn = ((System.Windows.Controls.MenuItem)(target));
+            
+            #line 52 "..\..\GraphByClick.xaml"
+            this.delEdgeBtn.Click += new System.Windows.RoutedEventHandler(this.delEdgeBtn_Click);
+            
+            #line default
+            #line hidden
+            return;
+            case 16:
+            this.delArcBtn = ((System.Windows.Controls.MenuItem)(target));
+            return;
+            case 17:
+            this.delAllBtn = ((System.Windows.Controls.MenuItem)(target));
+            
+            #line 54 "..\..\GraphByClick.xaml"
+            this.delAllBtn.Click += new System.Windows.RoutedEventHandler(this.clearBtn_Click);
             
             #line default
             #line hidden

GraphDrawer/obj/Debug/GraphDrawer_MarkupCompile.cache

@@ -13,7 +13,7 @@ C:\Users\locadm\Desktop\Graphs\GraphDrawer\App.xaml
 3616127476
 
 12871213070
-13-1505183044
+141183416626
 ChoiseRegime.xaml;GraphByClick.xaml;MainWindow.xaml;
 
 False

GraphDrawer/obj/Debug/GraphDrawer_MarkupCompile.i.cache

@@ -4,16 +4,16 @@
 winexe
 C#
 .cs
-C:\Users\locadm\Desktop\Drawer\GraphDrawer\obj\Debug\
+C:\Users\locadm\Desktop\Graphs\GraphDrawer\obj\Debug\
 GraphDrawer
 none
 false
 DEBUG;TRACE
-C:\Users\locadm\Desktop\Drawer\GraphDrawer\App.xaml
+C:\Users\locadm\Desktop\Graphs\GraphDrawer\App.xaml
 3616127476
 
 131271447095
-13-1505183044
+141183416626
 ChoiseRegime.xaml;GraphByClick.xaml;MainWindow.xaml;
 
 False

GraphDrawer/obj/Debug/GraphDrawer_MarkupCompile.i.lref

@@ -1,6 +0,0 @@
-
-
-FC:\Users\locadm\source\repos\GraphDrawer\GraphDrawer\ChoiseRegime.xaml;;
-FC:\Users\locadm\source\repos\GraphDrawer\GraphDrawer\GraphByClick.xaml;;
-FC:\Users\locadm\source\repos\GraphDrawer\GraphDrawer\MainWindow.xaml;;
-

GraphDrawer/obj/Release/GraphByClick.g.cs

@@ -1,4 +1,4 @@
-#pragma checksum "..\..\GraphByClick.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "934C912879B70A3B7F57A7D3879477438A1E10A95EC1500236D243D483C63CA2"
+#pragma checksum "..\..\GraphByClick.xaml" "{8829d00f-11b8-4213-878b-770e8597ac16}" "A5E3E8CF98D1C938DB97C7160BCC519F7D60D6C49335A42FBA8C273901E87830"
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
@@ -41,7 +41,7 @@ namespace GraphDrawer {
     public partial class GraphByClick : System.Windows.Window, System.Windows.Markup.IComponentConnector {
         
         
-        #line 13 "..\..\GraphByClick.xaml"
+        #line 18 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem multiGraphBtn;
         
@@ -49,7 +49,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 14 "..\..\GraphByClick.xaml"
+        #line 19 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem pseudoGraphBtn;
         
@@ -57,7 +57,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 17 "..\..\GraphByClick.xaml"
+        #line 22 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem focusedGraphBtn;
         
@@ -65,7 +65,7 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 18 "..\..\GraphByClick.xaml"
+        #line 23 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
         internal System.Windows.Controls.MenuItem unfocusedGraphBtn;
         
@@ -73,65 +73,65 @@ namespace GraphDrawer {
         #line hidden
         
         
-        #line 22 "..\..\GraphByClick.xaml"
+        #line 27 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Canvas canvas;
+        internal System.Windows.Controls.Grid choiceGrid;
         
         #line default
         #line hidden
         
         
-        #line 23 "..\..\GraphByClick.xaml"
+        #line 33 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button backBtn;
+        internal System.Windows.Controls.RadioButton vertexRb;
         
         #line default
         #line hidden
         
         
-        #line 24 "..\..\GraphByClick.xaml"
+        #line 34 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Grid choiceGrid;
+        internal System.Windows.Controls.RadioButton edgeRb;
         
         #line default
         #line hidden
         
         
-        #line 29 "..\..\GraphByClick.xaml"
+        #line 35 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.RadioButton vertexRb;
+        internal System.Windows.Controls.RadioButton arcRb;
         
         #line default
         #line hidden
         
         
-        #line 30 "..\..\GraphByClick.xaml"
+        #line 38 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.RadioButton edgeRb;
+        internal System.Windows.Controls.Button clearBtn;
         
         #line default
         #line hidden
         
         
-        #line 32 "..\..\GraphByClick.xaml"
+        #line 39 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Label coords;
+        internal System.Windows.Controls.Button exportPngBtn;
         
         #line default
         #line hidden
         
         
-        #line 33 "..\..\GraphByClick.xaml"
+        #line 40 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button clearBtn;
+        internal System.Windows.Controls.Button backBtn;
         
         #line default
         #line hidden
         
         
-        #line 34 "..\..\GraphByClick.xaml"
+        #line 43 "..\..\GraphByClick.xaml"
         [System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields")]
-        internal System.Windows.Controls.Button exportPngBtn;
+        internal System.Windows.Controls.Canvas canvas;
         
         #line default
         #line hidden
@@ -167,93 +167,85 @@ namespace GraphDrawer {
             switch (connectionId)
             {
             case 1:
-            
-            #line 9 "..\..\GraphByClick.xaml"
-            ((System.Windows.Controls.Grid)(target)).MouseMove += new System.Windows.Input.MouseEventHandler(this.Grid_MouseMove);
-            
-            #line default
-            #line hidden
-            return;
-            case 2:
             this.multiGraphBtn = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 13 "..\..\GraphByClick.xaml"
+            #line 18 "..\..\GraphByClick.xaml"
             this.multiGraphBtn.Click += new System.Windows.RoutedEventHandler(this.multiGraphBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 3:
+            case 2:
             this.pseudoGraphBtn = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 14 "..\..\GraphByClick.xaml"
+            #line 19 "..\..\GraphByClick.xaml"
             this.pseudoGraphBtn.Click += new System.Windows.RoutedEventHandler(this.pseudoGraphBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 4:
+            case 3:
             this.focusedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 17 "..\..\GraphByClick.xaml"
+            #line 22 "..\..\GraphByClick.xaml"
             this.focusedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.focusedGraphBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 5:
+            case 4:
             this.unfocusedGraphBtn = ((System.Windows.Controls.MenuItem)(target));
             
-            #line 18 "..\..\GraphByClick.xaml"
+            #line 23 "..\..\GraphByClick.xaml"
             this.unfocusedGraphBtn.Click += new System.Windows.RoutedEventHandler(this.unfocusedGraphBtn_Click);
             
             #line default
             #line hidden
             return;
+            case 5:
+            this.choiceGrid = ((System.Windows.Controls.Grid)(target));
+            return;
             case 6:
-            this.canvas = ((System.Windows.Controls.Canvas)(target));
+            this.vertexRb = ((System.Windows.Controls.RadioButton)(target));
+            return;
+            case 7:
+            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 22 "..\..\GraphByClick.xaml"
-            this.canvas.MouseUp += new System.Windows.Input.MouseButtonEventHandler(this.canvas_MouseUp);
+            #line 38 "..\..\GraphByClick.xaml"
+            this.clearBtn.Click += new System.Windows.RoutedEventHandler(this.clearBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 7:
-            this.backBtn = ((System.Windows.Controls.Button)(target));
+            case 10:
+            this.exportPngBtn = ((System.Windows.Controls.Button)(target));
             
-            #line 23 "..\..\GraphByClick.xaml"
-            this.backBtn.Click += new System.Windows.RoutedEventHandler(this.backBtn_Click);
+            #line 39 "..\..\GraphByClick.xaml"
+            this.exportPngBtn.Click += new System.Windows.RoutedEventHandler(this.exportPngBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 8:
-            this.choiceGrid = ((System.Windows.Controls.Grid)(target));
-            return;
-            case 9:
-            this.vertexRb = ((System.Windows.Controls.RadioButton)(target));
-            return;
-            case 10:
-            this.edgeRb = ((System.Windows.Controls.RadioButton)(target));
-            return;
             case 11:
-            this.coords = ((System.Windows.Controls.Label)(target));
-            return;
-            case 12:
-            this.clearBtn = ((System.Windows.Controls.Button)(target));
+            this.backBtn = ((System.Windows.Controls.Button)(target));
             
-            #line 33 "..\..\GraphByClick.xaml"
-            this.clearBtn.Click += new System.Windows.RoutedEventHandler(this.clearBtn_Click);
+            #line 40 "..\..\GraphByClick.xaml"
+            this.backBtn.Click += new System.Windows.RoutedEventHandler(this.backBtn_Click);
             
             #line default
             #line hidden
             return;
-            case 13:
-            this.exportPngBtn = ((System.Windows.Controls.Button)(target));
+            case 12:
+            this.canvas = ((System.Windows.Controls.Canvas)(target));
             
-            #line 34 "..\..\GraphByClick.xaml"
-            this.exportPngBtn.Click += new System.Windows.RoutedEventHandler(this.exportPngBtn_Click);
+            #line 43 "..\..\GraphByClick.xaml"
+            this.canvas.MouseUp += new System.Windows.Input.MouseButtonEventHandler(this.canvas_MouseUp);
             
             #line default
             #line hidden

GraphDrawer/obj/Release/GraphDrawer_MarkupCompile.cache

@@ -4,12 +4,12 @@
 winexe
 C#
 .cs
-C:\Users\locadm\Desktop\Drawer\GraphDrawer\obj\Release\
+C:\Users\locadm\Desktop\Graphs\GraphDrawer\obj\Release\
 GraphDrawer
 none
 false
 TRACE
-C:\Users\locadm\Desktop\Drawer\GraphDrawer\App.xaml
+C:\Users\locadm\Desktop\Graphs\GraphDrawer\App.xaml
 3616127476
 
 12871213070

GraphDrawer/obj/Release/GraphDrawer_MarkupCompile.lref

@@ -1,6 +1,6 @@
 
 
-FC:\Users\locadm\Desktop\Drawer\GraphDrawer\ChoiseRegime.xaml;;
-FC:\Users\locadm\Desktop\Drawer\GraphDrawer\GraphByClick.xaml;;
-FC:\Users\locadm\Desktop\Drawer\GraphDrawer\MainWindow.xaml;;
+FC:\Users\locadm\Desktop\Graphs\GraphDrawer\ChoiseRegime.xaml;;
+FC:\Users\locadm\Desktop\Graphs\GraphDrawer\GraphByClick.xaml;;
+FC:\Users\locadm\Desktop\Graphs\GraphDrawer\MainWindow.xaml;;