From fa09914efb8bbcf1e20506d3609a740e06848b6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=93=D0=BE=D1=80=D0=B4?= =?UTF-8?q?=D0=B5=D0=B5=D0=B2?= <89176335310x@gmail.com> Date: Thu, 16 Nov 2023 16:07:19 +0400 Subject: [PATCH] Full Lab --- .../DrawningElectricLocomotive.cs | 3 -- .../ElectricLocomotive/DrawningLocomotive.cs | 2 -- .../DrawningObjectLocomotive.cs | 3 +- .../ElectricLocomotive/EntityLocomotive.cs | 1 - .../ElectricLocomotive/ObjectParameters.cs | 28 ------------------- 5 files changed, 1 insertion(+), 36 deletions(-) diff --git a/ElectricLocomotive/ElectricLocomotive/DrawningElectricLocomotive.cs b/ElectricLocomotive/ElectricLocomotive/DrawningElectricLocomotive.cs index e34a7b8..a9aa508 100644 --- a/ElectricLocomotive/ElectricLocomotive/DrawningElectricLocomotive.cs +++ b/ElectricLocomotive/ElectricLocomotive/DrawningElectricLocomotive.cs @@ -59,10 +59,7 @@ namespace ElectricLocomotive g.DrawPolygon(pen, horns2); } base.DrawTransport(g); - - } - } } diff --git a/ElectricLocomotive/ElectricLocomotive/DrawningLocomotive.cs b/ElectricLocomotive/ElectricLocomotive/DrawningLocomotive.cs index fbef2bb..9422635 100644 --- a/ElectricLocomotive/ElectricLocomotive/DrawningLocomotive.cs +++ b/ElectricLocomotive/ElectricLocomotive/DrawningLocomotive.cs @@ -30,7 +30,6 @@ namespace ElectricLocomotive.DrawningObject public int GetWidth => _locoWidth; public int GetHeight => _locoHeight; - public DrawningLocomotive(int speed, double weight, Color bodyColor, Color additionalColor, int width, int heigth) { if (width < _locoWidth || heigth < _locoHeight) @@ -184,7 +183,6 @@ namespace ElectricLocomotive.DrawningObject ///дверь g.FillRectangle(brush, _startPosX + 50, _startPosY + 15, 10, 25); - ///Батарея g.FillRectangle(brush, _startPosX + 45, _startPosY + 5, 15, 5); diff --git a/ElectricLocomotive/ElectricLocomotive/DrawningObjectLocomotive.cs b/ElectricLocomotive/ElectricLocomotive/DrawningObjectLocomotive.cs index 7604f4d..0ea33dc 100644 --- a/ElectricLocomotive/ElectricLocomotive/DrawningObjectLocomotive.cs +++ b/ElectricLocomotive/ElectricLocomotive/DrawningObjectLocomotive.cs @@ -19,8 +19,7 @@ namespace ElectricLocomotive { get { - if (_drawningLocomotive == null || _drawningLocomotive.EntityLocomotive == - null) + if (_drawningLocomotive == null || _drawningLocomotive.EntityLocomotive == null) { return null; } diff --git a/ElectricLocomotive/ElectricLocomotive/EntityLocomotive.cs b/ElectricLocomotive/ElectricLocomotive/EntityLocomotive.cs index f80e673..550fa55 100644 --- a/ElectricLocomotive/ElectricLocomotive/EntityLocomotive.cs +++ b/ElectricLocomotive/ElectricLocomotive/EntityLocomotive.cs @@ -7,7 +7,6 @@ using System.Threading.Tasks; namespace ElectricLocomotive.Entities { public class EntityLocomotive - { /// /// Скорость diff --git a/ElectricLocomotive/ElectricLocomotive/ObjectParameters.cs b/ElectricLocomotive/ElectricLocomotive/ObjectParameters.cs index 64ce1e8..0962f19 100644 --- a/ElectricLocomotive/ElectricLocomotive/ObjectParameters.cs +++ b/ElectricLocomotive/ElectricLocomotive/ObjectParameters.cs @@ -12,37 +12,10 @@ namespace ElectricLocomotive private readonly int _y; private readonly int _width; private readonly int _height; - /// - /// Левая граница - /// - public int LeftBorder => _x; - /// - /// Верхняя граница - /// - public int TopBorder => _y; - /// - /// Правая граница - /// public int RightBorder => _x + _width; - /// - /// Нижняя граница - /// public int DownBorder => _y + _height; - /// - /// Середина объекта - /// public int ObjectMiddleHorizontal => _x + _width / 2; - /// - /// Середина объекта - /// public int ObjectMiddleVertical => _y + _height / 2; - /// - /// Конструктор - /// - /// Координата X - /// Координата Y - /// Ширина - /// Высота public ObjectParameters(int x, int y, int width, int height) { _x = x; @@ -50,6 +23,5 @@ namespace ElectricLocomotive _width = width; _height = height; } - } }