From e3e51539c292ee8ebfcbd6025bae42daa144597a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=BA=D1=80=D0=B8=D1=81=D1=82=D0=B8=D0=BD=D0=B0=20=D0=BB?= =?UTF-8?q?=D0=B0=D0=B2=D1=80=D0=BE=D0=B2=D0=B0?= Date: Thu, 25 Apr 2024 08:37:27 +0400 Subject: [PATCH] =?UTF-8?q?=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D0=B2=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=86=D0=B5=D1=81=D1=81=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- solution/lab1/Drawnings/DrawningEntityFighter.cs | 9 +++++---- solution/lab1/FormTrackedVehicleCollection.Designer.cs | 2 +- solution/lab1/FormTrackedVehicleCollection.cs | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/solution/lab1/Drawnings/DrawningEntityFighter.cs b/solution/lab1/Drawnings/DrawningEntityFighter.cs index 56e5816..b249e1c 100644 --- a/solution/lab1/Drawnings/DrawningEntityFighter.cs +++ b/solution/lab1/Drawnings/DrawningEntityFighter.cs @@ -32,15 +32,15 @@ public class DrawningEntityFighter : DrawningTrackedVehicle - + base.DrawTransport(g); if (fighter.Kovsh) { //ковш - g.DrawRectangle(pen, _startPosX.Value - 2, _startPosY.Value + 37, 8, 15); - g.FillRectangle(CraneBrush, _startPosX.Value - 2, _startPosY.Value + 37, 8, 15); - g.DrawRectangle(pen, _startPosX.Value - -6, _startPosY.Value + 37, 4, 1); + g.DrawRectangle(pen, _startPosX.Value - 15, _startPosY.Value + 15, 8, 15); + g.FillRectangle(CraneBrush, _startPosX.Value - 15, _startPosY.Value + 15, 8, 15); + g.DrawRectangle(pen, _startPosX.Value - 15, _startPosY.Value + , 4, 1); } @@ -52,6 +52,7 @@ public class DrawningEntityFighter : DrawningTrackedVehicle } + } } diff --git a/solution/lab1/FormTrackedVehicleCollection.Designer.cs b/solution/lab1/FormTrackedVehicleCollection.Designer.cs index a1ab031..4bb4cee 100644 --- a/solution/lab1/FormTrackedVehicleCollection.Designer.cs +++ b/solution/lab1/FormTrackedVehicleCollection.Designer.cs @@ -121,7 +121,7 @@ buttonAddFighter.TabIndex = 2; buttonAddFighter.Text = "Добавление истребителя"; buttonAddFighter.UseVisualStyleBackColor = true; - buttonAddFighter.Click += ButtonAddTrackedVehicle_Click; + buttonAddFighter.Click += ButtonAddEntityFighter_Click; // // comboBoxSelectorCompany // diff --git a/solution/lab1/FormTrackedVehicleCollection.cs b/solution/lab1/FormTrackedVehicleCollection.cs index cfa1c2a..08648ca 100644 --- a/solution/lab1/FormTrackedVehicleCollection.cs +++ b/solution/lab1/FormTrackedVehicleCollection.cs @@ -70,6 +70,7 @@ public partial class FormTrackedVehicleCollection : Form GetColor(random), GetColor(random), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); + break; default: return;