From ef93a0293cba62f769edf8c6160019d0f01699bf Mon Sep 17 00:00:00 2001 From: AparyanLuiza Date: Wed, 13 Dec 2023 17:44:18 +0400 Subject: [PATCH] =?UTF-8?q?=D0=92=D0=BD=D0=B5=D1=81=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C=D1=88=D0=B8=D1=85?= =?UTF-8?q?=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BE=D0=BA.=20=D0=A1=D0=B4=D0=B0?= =?UTF-8?q?=D0=BD=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectBulldozer/Drawning/DrawingTractor.cs | 4 ---- ProjectBulldozer/FormBulldozer.Designer.cs | 22 +------------------ ProjectBulldozer/FormBulldozerCollections.cs | 7 ------ .../FormBulldozerConfig.Designer.cs | 3 +-- ProjectBulldozer/FormBulldozerConfig.cs | 2 -- .../MovementStrategy/DrawingObjectTractor.cs | 4 +--- .../MovementStrategy/ObjectsParameters.cs | 8 ------- 7 files changed, 3 insertions(+), 47 deletions(-) diff --git a/ProjectBulldozer/Drawning/DrawingTractor.cs b/ProjectBulldozer/Drawning/DrawingTractor.cs index 22eda72..89d203f 100644 --- a/ProjectBulldozer/Drawning/DrawingTractor.cs +++ b/ProjectBulldozer/Drawning/DrawingTractor.cs @@ -119,13 +119,9 @@ namespace ProjectBulldozer.Drawning } return direction switch { - //влево DirectionType.Left => _startPosX - EntityTractor.Step > 0, - //вверх DirectionType.Up => _startPosY - EntityTractor.Step > 0, - // вправо DirectionType.Right => _startPosX + EntityTractor.Step < _pictureWidth, - //вниз DirectionType.Down => _startPosY + EntityTractor.Step < _pictureHeight, }; } diff --git a/ProjectBulldozer/FormBulldozer.Designer.cs b/ProjectBulldozer/FormBulldozer.Designer.cs index a543a34..a4b9ab3 100644 --- a/ProjectBulldozer/FormBulldozer.Designer.cs +++ b/ProjectBulldozer/FormBulldozer.Designer.cs @@ -1,27 +1,8 @@ - -namespace Bulldozer +namespace Bulldozer { partial class FormBulldozer { private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - #region Windows Form Designer generated code - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormBulldozer)); @@ -185,7 +166,6 @@ namespace Bulldozer ResumeLayout(false); PerformLayout(); } - #endregion private PictureBox pictureBoxBulldozer; private Button buttonCreateBulldozer; private Button buttonLeft; diff --git a/ProjectBulldozer/FormBulldozerCollections.cs b/ProjectBulldozer/FormBulldozerCollections.cs index 59c03eb..748e1ce 100644 --- a/ProjectBulldozer/FormBulldozerCollections.cs +++ b/ProjectBulldozer/FormBulldozerCollections.cs @@ -31,7 +31,6 @@ namespace ProjectBulldozer listBoxStorage.SelectedIndex = index; } } - private void ButtonAddObject_Click(object sender, EventArgs e) { if (string.IsNullOrEmpty(textBoxStorageName.Text)) @@ -42,12 +41,10 @@ namespace ProjectBulldozer _storage.AddSet(textBoxStorageName.Text); ReloadObjects(); } - private void listBoxStorage_SelectedIndexChanged(object sender, EventArgs e) { pictureBoxCollections.Image = _storage[listBoxStorage.SelectedItem?.ToString() ?? string.Empty]?.ShowTractors(); } - private void ButtonRemoveObject_Click(object sender, EventArgs e) { if (listBoxStorage.SelectedIndex == -1) @@ -118,9 +115,5 @@ namespace ProjectBulldozer MessageBox.Show("Не удалось удалить объект"); } } - private void textBoxStorageName_TextChanged(object sender, EventArgs e) - { - - } } } diff --git a/ProjectBulldozer/FormBulldozerConfig.Designer.cs b/ProjectBulldozer/FormBulldozerConfig.Designer.cs index c1c7ced..3dd3e55 100644 --- a/ProjectBulldozer/FormBulldozerConfig.Designer.cs +++ b/ProjectBulldozer/FormBulldozerConfig.Designer.cs @@ -1,5 +1,4 @@ - -namespace Bulldozer +namespace Bulldozer { partial class FormBulldozerConfig { diff --git a/ProjectBulldozer/FormBulldozerConfig.cs b/ProjectBulldozer/FormBulldozerConfig.cs index a31cc5f..53f502d 100644 --- a/ProjectBulldozer/FormBulldozerConfig.cs +++ b/ProjectBulldozer/FormBulldozerConfig.cs @@ -1,6 +1,5 @@ using ProjectBulldozer.Drawning; using ProjectBulldozer.Entities; - namespace Bulldozer { public partial class FormBulldozerConfig : Form @@ -115,7 +114,6 @@ namespace Bulldozer { EventAddTractor?.Invoke(obj: _tractor); Close(); - } } } diff --git a/ProjectBulldozer/MovementStrategy/DrawingObjectTractor.cs b/ProjectBulldozer/MovementStrategy/DrawingObjectTractor.cs index f3eae94..24fb7b8 100644 --- a/ProjectBulldozer/MovementStrategy/DrawingObjectTractor.cs +++ b/ProjectBulldozer/MovementStrategy/DrawingObjectTractor.cs @@ -1,11 +1,9 @@ -using Bulldozer; -using ProjectBulldozer.MovementStrategy; +using ProjectBulldozer.MovementStrategy; namespace ProjectBulldozer.Drawning { public class DrawingObjectTractor : IMoveableObject { private readonly DrawingTractor? _drawningTractor = null; - public DrawingObjectTractor(DrawingTractor drawningTractor) { _drawningTractor = drawningTractor; diff --git a/ProjectBulldozer/MovementStrategy/ObjectsParameters.cs b/ProjectBulldozer/MovementStrategy/ObjectsParameters.cs index 439a349..b4aba32 100644 --- a/ProjectBulldozer/MovementStrategy/ObjectsParameters.cs +++ b/ProjectBulldozer/MovementStrategy/ObjectsParameters.cs @@ -6,17 +6,9 @@ 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; public ObjectParameters(int x, int y, int width, int height) {