From 65f140055c82b08c349d7eb22ee1a2caf2e65028 Mon Sep 17 00:00:00 2001
From: ekallin <elina_kallin@mail.ru>
Date: Tue, 7 Nov 2023 12:45:40 +0400
Subject: [PATCH] Almost ready lab 5 for push

---
 .../ProjectElectricLocomotive/DelegateLoco.cs     | 15 ---------------
 .../FormLocomotiveConfig.Designer.cs              |  2 +-
 .../FormLocomotiveConfig.cs                       | 11 +++++++++--
 3 files changed, 10 insertions(+), 18 deletions(-)
 delete mode 100644 ProjectElectricLocomotive/ProjectElectricLocomotive/DelegateLoco.cs

diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/DelegateLoco.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/DelegateLoco.cs
deleted file mode 100644
index 3479c87..0000000
--- a/ProjectElectricLocomotive/ProjectElectricLocomotive/DelegateLoco.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using ProjectElectricLocomotive.DrawingObjects;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace ProjectElectricLocomotive
-{
-    /// <summary>
-    /// Делегат для передачи объекта-локомотив
-    /// </summary>
-    /// <param name="loco"></param>
-    public delegate void Action(DrawingLocomotive loco);
-}
diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.Designer.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.Designer.cs
index 9ef3f22..b305860 100644
--- a/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.Designer.cs
+++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.Designer.cs
@@ -330,7 +330,7 @@
             this.ButtonOk.TabIndex = 2;
             this.ButtonOk.Text = "Добавить";
             this.ButtonOk.UseVisualStyleBackColor = true;
-            this.ButtonOk.Click += new System.EventHandler(this.ButtonOk_Click);
+           // this.ButtonOk.Click += new System.EventHandler(this.ButtonOk_Click);
             // 
             // buttonCancel
             // 
diff --git a/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.cs b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.cs
index 260d57d..8143741 100644
--- a/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.cs
+++ b/ProjectElectricLocomotive/ProjectElectricLocomotive/FormLocomotiveConfig.cs
@@ -13,6 +13,7 @@ namespace ProjectElectricLocomotive
 {
     public partial class FormLocomotiveConfig : Form
     {
+
         /// <summary>
         /// Переменная-выбранный локомотив
         /// </summary>
@@ -22,7 +23,7 @@ namespace ProjectElectricLocomotive
         /// Событие
         /// </summary>
 
-        private event Action? EventAddLoco;
+        private event Action<DrawingLocomotive>? EventAddLoco;
 
         public FormLocomotiveConfig()
         {
@@ -37,6 +38,12 @@ namespace ProjectElectricLocomotive
             panelPastelLilac.MouseDown += PanelColor_MouseDown;
             panelPastelViolet.MouseDown += PanelColor_MouseDown;
 
+            /*ButtonOk.Click += delegate
+            {
+                EventAddLoco?.Invoke(_loco);
+                Close();
+            };*/
+
             buttonCancel.Click += (sender, e) => Close();
         }
 
@@ -44,7 +51,7 @@ namespace ProjectElectricLocomotive
         /// Добавление события
         /// </summary>
         /// <param name="ev">Привязанный метод</param>
-        public void AddEvent(Action ev)
+        public void AddEvent(Action<DrawingLocomotive> ev)
         {
             if (EventAddLoco == null)
             {