From 0df7ae5e02483ce621b28e1cc23652581015a299 Mon Sep 17 00:00:00 2001 From: antoc0der <1@DESKTOP-K1L8ND3> Date: Tue, 7 Nov 2023 22:16:15 +0300 Subject: [PATCH] =?UTF-8?q?=E2=80=9E=D0=9D=D0=B5=D0=BF=D0=BE=D0=B1=D0=B5?= =?UTF-8?q?=D0=B4=D0=B8=D0=BC=D0=BE=D1=81=D1=82=D1=8C=20=D0=B7=D0=B0=D0=BA?= =?UTF-8?q?=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B0=20=D0=B2=20=D1=81=D0=B5?= =?UTF-8?q?=D0=B1=D0=B5=20=D1=81=D0=B0=D0=BC=D0=BE=D0=BC,=20=D0=B2=D0=BE?= =?UTF-8?q?=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=B1=D0=B5=D0=B4=D1=8B=20=D0=B7=D0=B0=D0=BA=D0=BB=D1=8E?= =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B0=20=D0=B2=20=D0=BF=D1=80=D0=BE=D1=82?= =?UTF-8?q?=D0=B8=D0=B2=D0=BD=D0=B8=D0=BA=D0=B5.=E2=80=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FormAirplanesCollection.Designer.cs | 1 + .../FormAirplanesCollection.cs | 20 +++++++++++++------ 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplanesCollection.Designer.cs b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplanesCollection.Designer.cs index 47c5322..21b5bdb 100644 --- a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplanesCollection.Designer.cs +++ b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplanesCollection.Designer.cs @@ -52,6 +52,7 @@ pictureBoxAirplanesCollection.SizeMode = PictureBoxSizeMode.AutoSize; pictureBoxAirplanesCollection.TabIndex = 0; pictureBoxAirplanesCollection.TabStop = false; + pictureBoxAirplanesCollection.Click += pictureBoxAirplanesCollection_Click; // // groupBoxAirplaneWithRadar // diff --git a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplanesCollection.cs b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplanesCollection.cs index f2ec634..65cfadc 100644 --- a/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplanesCollection.cs +++ b/ProjectAirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplanesCollection.cs @@ -1,6 +1,7 @@ using ProjectAirplaneWithRadar.DrawningObjects; using ProjectAirplaneWithRadar.MovementStrategy; using ProjectAirplaneWithRadar.Generics; +using System.Diagnostics.Metrics; namespace ProjectAirplaneWithRadar { @@ -44,10 +45,11 @@ namespace ProjectAirplaneWithRadar { return; } - FormAirplaneWithRadar form = new(); - if (form.ShowDialog() == DialogResult.OK) - { - if (obj + form.SelectedAirplane) + FormAirplaneConfig form = new(); + form.Show(); + AirplaneDelegate? airplaneDelegate = new((m) => { + bool q = (obj + m); + if (q) { MessageBox.Show("Объект добавлен"); pictureBoxAirplanesCollection.Image = obj.ShowAirplanes(); @@ -56,7 +58,8 @@ namespace ProjectAirplaneWithRadar { MessageBox.Show("Не удалось добавить объект"); } - } + }); + form.AddEvent(airplaneDelegate); } private void buttonDeleteAirplane_Click(object sender, EventArgs e) { @@ -128,7 +131,12 @@ namespace ProjectAirplaneWithRadar } private void listBoxStorages_SelectedIndexChanged(object sender, EventArgs e) { - pictureBoxAirplanesCollection.Image =_storage[listBoxStorages.SelectedItem?.ToString() ?? string.Empty]?.ShowAirplanes(); + pictureBoxAirplanesCollection.Image = _storage[listBoxStorages.SelectedItem?.ToString() ?? string.Empty]?.ShowAirplanes(); + } + + private void pictureBoxAirplanesCollection_Click(object sender, EventArgs e) + { + } } } \ No newline at end of file