From 1310766ce87a8226040f9579dcfb189f99a1ab99 Mon Sep 17 00:00:00 2001 From: AlyonaFr <149268946+AlyonaFr@users.noreply.github.com> Date: Tue, 19 Mar 2024 21:06:59 +0400 Subject: [PATCH 1/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=80=D0=BE=D0=B4=D0=B8=D1=82=D0=B5=D0=BB?= =?UTF-8?q?=D0=B5=D0=B9=20=D0=B8=20=D0=B2=D0=B2=D0=BE=D0=B4=20=D0=BA=D0=BE?= =?UTF-8?q?=D0=BD=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82=D0=BE=D1=80=D0=BE?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ => Drawnings}/DirectionType.cs | 8 +- .../DrawningBoat.cs} | 137 +++++++++--------- .../Drawnings/DrawningCatamaran.cs | 95 ++++++++++++ .../{ => Entities}/EntityCatamaran.cs | 30 +--- .../Entities/EntityCatamaran_1.cs | 47 ++++++ .../FormCatamaran.Designer.cs | 19 ++- .../ProjectCatamaran/FormCatamaran.cs | 67 ++++++--- .../{ => Resources}/Program.cs | 2 +- 8 files changed, 277 insertions(+), 128 deletions(-) rename ProjectCatamaran/ProjectCatamaran/{ => Drawnings}/DirectionType.cs (67%) rename ProjectCatamaran/ProjectCatamaran/{DrawningCatamaran.cs => Drawnings/DrawningBoat.cs} (51%) create mode 100644 ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningCatamaran.cs rename ProjectCatamaran/ProjectCatamaran/{ => Entities}/EntityCatamaran.cs (67%) create mode 100644 ProjectCatamaran/ProjectCatamaran/Entities/EntityCatamaran_1.cs rename ProjectCatamaran/ProjectCatamaran/{ => Resources}/Program.cs (92%) diff --git a/ProjectCatamaran/ProjectCatamaran/DirectionType.cs b/ProjectCatamaran/ProjectCatamaran/Drawnings/DirectionType.cs similarity index 67% rename from ProjectCatamaran/ProjectCatamaran/DirectionType.cs rename to ProjectCatamaran/ProjectCatamaran/Drawnings/DirectionType.cs index f76939e..d6c8da6 100644 --- a/ProjectCatamaran/ProjectCatamaran/DirectionType.cs +++ b/ProjectCatamaran/ProjectCatamaran/Drawnings/DirectionType.cs @@ -1,10 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ProjectCatamaran; +namespace ProjectCatamaran.Drawnings; public enum DirectionType { diff --git a/ProjectCatamaran/ProjectCatamaran/DrawningCatamaran.cs b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs similarity index 51% rename from ProjectCatamaran/ProjectCatamaran/DrawningCatamaran.cs rename to ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs index 5a01c1b..9ecd91a 100644 --- a/ProjectCatamaran/ProjectCatamaran/DrawningCatamaran.cs +++ b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs @@ -1,14 +1,18 @@ -namespace ProjectCatamaran; +using ProjectCatamaran.Entities; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; -/// -/// Класс, отвечающий за прорисовку и перемещение объекта-сущности -/// -public class DrawningCatamaran +namespace ProjectCatamaran.Drawnings; + +public class DrawningBoat { /// /// Класс-сущность /// - public EntityCatamaran? EntityCatamaran { get; private set; } + public EntityBoat? EntityBoat { get; protected set; } /// /// Ширина окна @@ -23,43 +27,56 @@ public class DrawningCatamaran /// /// Левая координата прорисовки катамарана /// - private int? _startPosX; + protected int? _startPosX; /// /// Верхняя координата прорисовки катамарана /// - private int? _startPosY; + protected int? _startPosY; /// /// Ширина прорисовки катамарана /// - private readonly int _drawningCatamaranWidth = 87; + private readonly int _drawningCatamaranWidth = 80; /// /// Высота прорисовки катамарана /// - private readonly int _drawningCatamaranHeight = 81; + private readonly int _drawningCatamaranHeight = 62; /// - /// Инициализация свойств + /// Пустой конструктор /// - /// - /// - /// - /// - /// - /// - /// - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool sail, - bool leftfloater, bool rightfloater) + private DrawningBoat() { - EntityCatamaran = new EntityCatamaran(); - EntityCatamaran.Init(speed, weight, bodyColor, additionalColor, sail, leftfloater, rightfloater); _pictureWidth = null; _pictureHeight = null; _startPosX = null; _startPosY = null; } + /// + /// Конструктор + /// + /// + /// + /// + /// Конструктор для наследников + /// + /// Ширина прорисовки катамарана + /// Высота прорисовки катамарана + protected DrawningBoat(int drawningCatamaranWidth, int drawningCatamaranHeight) : this() + { + _drawningCatamaranWidth = drawningCatamaranWidth; + _drawningCatamaranHeight = drawningCatamaranHeight; + } + /// /// Установка границ поля @@ -98,14 +115,21 @@ public class DrawningCatamaran return; } - if (x < 0 || x + _drawningCatamaranWidth > _pictureWidth || y < 0 || y + _drawningCatamaranHeight > _pictureHeight) + if (x < 0 || x + _drawningCatamaranWidth > _pictureWidth) { _startPosX = _pictureWidth - _drawningCatamaranWidth; - _startPosY = _pictureHeight - _drawningCatamaranHeight; } else { _startPosX = x; + } + + if (y < 0 || y + _drawningCatamaranHeight > _pictureHeight) + { + _startPosY = _pictureHeight - _drawningCatamaranHeight; + } + else + { _startPosY = y; } } @@ -117,7 +141,7 @@ public class DrawningCatamaran /// - перемещение выполнено, false - перемещение невозможно public bool MoveTransport(DirectionType direction) { - if (EntityCatamaran == null || !_startPosX.HasValue || !_startPosY.HasValue) + if (EntityBoat == null || !_startPosX.HasValue || !_startPosY.HasValue) { return false; } @@ -125,31 +149,31 @@ public class DrawningCatamaran { //влево case DirectionType.Left: - if (_startPosX.Value - EntityCatamaran.Step > 0) + if (_startPosX.Value - EntityBoat.Step > 0) { - _startPosX -= (int)EntityCatamaran.Step; + _startPosX -= (int)EntityBoat.Step; } return true; //вверх case DirectionType.Up: - if (_startPosY.Value - EntityCatamaran.Step > 0) + if (_startPosY.Value - EntityBoat.Step > 0) { - _startPosY -= (int)EntityCatamaran.Step; + _startPosY -= (int)EntityBoat.Step; } return true; // вправо case DirectionType.Right: - if (_startPosX.Value + EntityCatamaran.Step + _drawningCatamaranWidth < _pictureWidth) + if (_startPosX.Value + EntityBoat.Step + _drawningCatamaranWidth < _pictureWidth) { - _startPosX += (int)EntityCatamaran.Step; + _startPosX += (int)EntityBoat.Step; return true; } return true; //вниз case DirectionType.Down: - if (_startPosY.Value + EntityCatamaran.Step + _drawningCatamaranHeight < _pictureHeight) + if (_startPosY.Value + EntityBoat.Step + _drawningCatamaranHeight < _pictureHeight) { - _startPosY += (int)EntityCatamaran.Step; + _startPosY += (int)EntityBoat.Step; } return true; default: @@ -161,57 +185,30 @@ public class DrawningCatamaran /// Прорисовка объекта /// /// - public void DrawTransport(Graphics g) + public virtual void DrawTransport(Graphics g) { - if (EntityCatamaran == null || !_startPosX.HasValue || !_startPosY.HasValue) + if (EntityBoat == null || !_startPosX.HasValue || !_startPosY.HasValue) { return; } Pen pen = new(Color.Black); - Brush bodyColorBrush = new SolidBrush(EntityCatamaran.BodyColor); - Brush additionalBrush = new SolidBrush(EntityCatamaran.AdditionalColor); + Brush bodyColorBrush = new SolidBrush(EntityBoat.BodyColor); //тело катамарана - g.FillRectangle(bodyColorBrush, _startPosX.Value + 10, _startPosY.Value + 40, 57, 30); - g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 40, 57, 30); + g.FillRectangle(bodyColorBrush, _startPosX.Value, _startPosY.Value + 32, 57, 30); + g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + 32, 57, 30); - g.FillEllipse(bodyColorBrush, _startPosX.Value + 20, _startPosY.Value + 48, 40, 13); - g.DrawEllipse(pen, _startPosX.Value + 20, _startPosY.Value + 48, 40, 13); + g.FillEllipse(bodyColorBrush, _startPosX.Value + 9, _startPosY.Value + 40, 40, 13); + g.DrawEllipse(pen, _startPosX.Value + 9, _startPosY.Value + 40, 40, 13); //нос катамарана Point[] Nose = new Point[3]; - Nose[0].X = _startPosX.Value + 67; Nose[0].Y = _startPosY.Value + 40; - Nose[1].X = _startPosX.Value + 88; Nose[1].Y = _startPosY.Value + 55; - Nose[2].X = _startPosX.Value + 67; Nose[2].Y = _startPosY.Value + 70; + Nose[0].X = _startPosX.Value + 57; Nose[0].Y = _startPosY.Value + 32; + Nose[1].X = _startPosX.Value + 80; Nose[1].Y = _startPosY.Value + 47; + Nose[2].X = _startPosX.Value + 57; Nose[2].Y = _startPosY.Value + 62; g.FillPolygon(bodyColorBrush, Nose); g.DrawPolygon(pen, Nose); - //поплавки - if (EntityCatamaran.Leftfloater) - { - g.FillEllipse(additionalBrush, _startPosX.Value + 10, _startPosY.Value + 27, 57, 13); - g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 27, 57, 13); - } - - if (EntityCatamaran.Rightfloater) - { - g.FillEllipse(additionalBrush, _startPosX.Value + 10, _startPosY.Value + 70, 57, 13); - g.DrawEllipse(pen, _startPosX.Value + 10, _startPosY.Value + 70, 57, 13); - } - - //флаг - if (EntityCatamaran.Sail) - { - g.DrawLine(pen, _startPosX.Value + 38, _startPosY.Value + 55, _startPosX.Value + 38, _startPosY.Value + 10); - Point[] Flag = new Point[3]; - Flag[0].X = _startPosX.Value + 38; Flag[0].Y = _startPosY.Value + 10; - Flag[1].X = _startPosX.Value + 55; Flag[1].Y = _startPosY.Value + 45; - Flag[2].X = _startPosX.Value + 38; Flag[2].Y = _startPosY.Value + 45; - g.FillPolygon(additionalBrush, Flag); - g.DrawPolygon(pen, Flag); - } } - - } diff --git a/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningCatamaran.cs b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningCatamaran.cs new file mode 100644 index 0000000..55c2890 --- /dev/null +++ b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningCatamaran.cs @@ -0,0 +1,95 @@ +using ProjectCatamaran.Entities; + +namespace ProjectCatamaran.Drawnings; + +/// +/// Класс, отвечающий за прорисовку и перемещение объекта-сущности +/// +public class DrawningCatamaran : DrawningBoat +{ + + /// + /// Ширина окна + /// + private int? _pictureWidth; + + /// + /// Высота окна + /// + private int? _pictureHeight; + + /// + /// Левая координата прорисовки катамарана + /// + private int? GetPosX => _startPosX; + + /// + /// Верхняя координата прорисовки катамарана + /// + private int? GetPosY => _startPosY; + + /// + /// Ширина прорисовки катамарана + /// + private readonly int _drawningCatamaranWidth = 79; + + /// + /// Высота прорисовки катамарана + /// + private readonly int _drawningCatamaranHeight = 75; + + /// + /// Конструктор + /// + /// + /// + /// + /// + /// + /// + /// + public DrawningCatamaran(int speed, double weight, Color bodyColor, Color additionalColor, bool sail, bool leftfloater, bool rightfloater) : base(79, 75) + { + EntityBoat = new EntityCatamaran(speed, weight, bodyColor, additionalColor, sail, leftfloater, rightfloater); + + } + + + public override void DrawTransport(Graphics g) + { + if (EntityBoat == null || EntityBoat is not EntityCatamaran catamaran || !_startPosX.HasValue || !_startPosY.HasValue) + { + return; + } + + Pen pen = new(Color.Black); + Brush additionalBrush = new SolidBrush(catamaran.AdditionalColor); + base.DrawTransport(g); + //поплавки + if (catamaran.Leftfloater) + { + g.FillEllipse(additionalBrush, _startPosX.Value, _startPosY.Value + 20, 57, 13); + g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value + 20, 57, 13); + } + + if (catamaran.Rightfloater) + { + g.FillEllipse(additionalBrush, _startPosX.Value, _startPosY.Value + 62, 57, 13); + g.DrawEllipse(pen, _startPosX.Value, _startPosY.Value + 62, 57, 13); + } + + //флаг + if (catamaran.Sail) + { + g.DrawLine(pen, _startPosX.Value + 29, _startPosY.Value + 48, _startPosX.Value + 29, _startPosY.Value); + Point[] Flag = new Point[3]; + Flag[0].X = _startPosX.Value + 29; Flag[0].Y = _startPosY.Value + 38; + Flag[1].X = _startPosX.Value + 48; Flag[1].Y = _startPosY.Value + 38; + Flag[2].X = _startPosX.Value + 29; Flag[2].Y = _startPosY.Value; + g.FillPolygon(additionalBrush, Flag); + g.DrawPolygon(pen, Flag); + } + } + + +} diff --git a/ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs b/ProjectCatamaran/ProjectCatamaran/Entities/EntityCatamaran.cs similarity index 67% rename from ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs rename to ProjectCatamaran/ProjectCatamaran/Entities/EntityCatamaran.cs index 25affe6..57ebd06 100644 --- a/ProjectCatamaran/ProjectCatamaran/EntityCatamaran.cs +++ b/ProjectCatamaran/ProjectCatamaran/Entities/EntityCatamaran.cs @@ -1,24 +1,10 @@ -namespace ProjectCatamaran; +namespace ProjectCatamaran.Entities; /// /// Класс-сущность "Катамаран" /// -public class EntityCatamaran +public class EntityCatamaran : EntityBoat { - /// - /// Скорость - /// - public int Speed { get; private set; } - - /// - /// Вес - /// - public double Weight { get; private set; } - - /// - /// Основной цвет - /// - public Color BodyColor { get; private set; } /// /// Дополнительный цвет (для опциональных элементов) @@ -40,14 +26,9 @@ public class EntityCatamaran /// public bool Sail { get; private set; } - /// - /// - /// - public double Step => Speed * 100 / Weight; - /// - /// + /// Инициализация полей объекта-класса катамарана /// /// Скорость /// Вес @@ -56,11 +37,8 @@ public class EntityCatamaran /// Признак наличия левого поплавка /// Признак наличия правого поплавка /// Признак наличия паруса - public void Init(int speed, double weight, Color bodyColor, Color additionalColor, bool leftfloater, bool rightfloater, bool sail) + public EntityCatamaran(int speed, double weight, Color bodyColor, Color additionalColor, bool leftfloater, bool rightfloater, bool sail) : base(speed, weight, bodyColor) { - Speed = speed; - Weight = weight; - BodyColor = bodyColor; AdditionalColor = additionalColor; Leftfloater = leftfloater; Rightfloater = rightfloater; diff --git a/ProjectCatamaran/ProjectCatamaran/Entities/EntityCatamaran_1.cs b/ProjectCatamaran/ProjectCatamaran/Entities/EntityCatamaran_1.cs new file mode 100644 index 0000000..fc61713 --- /dev/null +++ b/ProjectCatamaran/ProjectCatamaran/Entities/EntityCatamaran_1.cs @@ -0,0 +1,47 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectCatamaran.Entities; + +/// +/// Класс-сущности "Катамарана_1" +/// +public class EntityBoat +{ + /// + /// Скорость + /// + public int Speed { get; private set; } + + /// + /// Вес + /// + public double Weight { get; private set; } + + /// + /// Основной цвет + /// + public Color BodyColor { get; private set; } + + /// + /// + /// + public double Step => Speed * 100 / Weight; + + /// + /// Конструктор сущности + /// + /// Скорость + /// Вес + /// Основной цвет + + public EntityBoat(int speed, double weight, Color bodyColor) + { + Speed = speed; + Weight = weight; + BodyColor = bodyColor; + } +} diff --git a/ProjectCatamaran/ProjectCatamaran/FormCatamaran.Designer.cs b/ProjectCatamaran/ProjectCatamaran/FormCatamaran.Designer.cs index e1650d2..ece7e00 100644 --- a/ProjectCatamaran/ProjectCatamaran/FormCatamaran.Designer.cs +++ b/ProjectCatamaran/ProjectCatamaran/FormCatamaran.Designer.cs @@ -34,6 +34,7 @@ buttonLeft = new Button(); buttonDown = new Button(); buttonRight = new Button(); + buttonCreatBoat = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxCatamaran).BeginInit(); SuspendLayout(); // @@ -45,16 +46,15 @@ pictureBoxCatamaran.Size = new Size(800, 450); pictureBoxCatamaran.TabIndex = 0; pictureBoxCatamaran.TabStop = false; - pictureBoxCatamaran.Click += ButtonMove_Click; // // buttonCreateCatamaran // buttonCreateCatamaran.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; buttonCreateCatamaran.Location = new Point(12, 409); buttonCreateCatamaran.Name = "buttonCreateCatamaran"; - buttonCreateCatamaran.Size = new Size(94, 29); + buttonCreateCatamaran.Size = new Size(203, 29); buttonCreateCatamaran.TabIndex = 1; - buttonCreateCatamaran.Text = "Создать"; + buttonCreateCatamaran.Text = "Создать катамаран"; buttonCreateCatamaran.UseVisualStyleBackColor = true; buttonCreateCatamaran.Click += ButtonCreateCatamaran_Click; // @@ -108,11 +108,23 @@ buttonRight.UseVisualStyleBackColor = false; buttonRight.Click += ButtonMove_Click; // + // buttonCreatBoat + // + buttonCreatBoat.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; + buttonCreatBoat.Location = new Point(233, 409); + buttonCreatBoat.Name = "buttonCreatBoat"; + buttonCreatBoat.Size = new Size(203, 29); + buttonCreatBoat.TabIndex = 6; + buttonCreatBoat.Text = "Создать лодку"; + buttonCreatBoat.UseVisualStyleBackColor = true; + buttonCreatBoat.Click += ButtonCreatBoat_Click; + // // FormCatamaran // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(800, 450); + Controls.Add(buttonCreatBoat); Controls.Add(buttonRight); Controls.Add(buttonDown); Controls.Add(buttonLeft); @@ -133,5 +145,6 @@ private Button buttonLeft; private Button buttonDown; private Button buttonRight; + private Button buttonCreatBoat; } } \ No newline at end of file diff --git a/ProjectCatamaran/ProjectCatamaran/FormCatamaran.cs b/ProjectCatamaran/ProjectCatamaran/FormCatamaran.cs index 507fc01..a57d253 100644 --- a/ProjectCatamaran/ProjectCatamaran/FormCatamaran.cs +++ b/ProjectCatamaran/ProjectCatamaran/FormCatamaran.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using System.Windows.Forms; +using ProjectCatamaran.Drawnings; namespace ProjectCatamaran { @@ -15,7 +16,7 @@ namespace ProjectCatamaran /// /// Поле-объект для прорисовки объекта /// - private DrawningCatamaran? _drawningCatamaran; + private DrawningBoat? _drawningBoat; /// /// Конструктор формы @@ -25,40 +26,63 @@ namespace ProjectCatamaran InitializeComponent(); } + /// + /// Создание объекта класса-перемещения + /// + /// + private void CreateObject(string type) + { + Random random = new(); + switch (type) + { + case nameof(DrawningBoat): + _drawningBoat = new DrawningBoat(random.Next(100, + 300), random.Next(1000, 3000), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256))); + break; + case nameof(DrawningCatamaran): + _drawningBoat = new DrawningCatamaran(random.Next(100, 300), random.Next(1000, 3000), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), + Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), + Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); + break; + default: + return; + } + _drawningBoat.SetPictureSize(pictureBoxCatamaran.Width, pictureBoxCatamaran.Height); + _drawningBoat.SetPosition(random.Next(10, 100), random.Next(10, 100)); + Draw(); + } /// - /// Обработка нажатия кнопки "Создать" + /// Обработка нажатия кнопки "Создать катамаран" /// /// /// - private void ButtonCreateCatamaran_Click(object sender, EventArgs e) - { - Random random = new(); - _drawningCatamaran = new DrawningCatamaran(); - _drawningCatamaran.Init(random.Next(100, 300), random.Next(1000, 3000), - Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), - Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), - Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); - _drawningCatamaran.SetPictureSize(pictureBoxCatamaran.Width, pictureBoxCatamaran.Height); - _drawningCatamaran.SetPosition(random.Next(10, 100), random.Next(10, 100)); - Draw(); + private void ButtonCreateCatamaran_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningCatamaran)); - } + + /// + /// Обработка нажатия кнопки "Создать лодку" + /// + /// + /// + private void ButtonCreatBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBoat)); /// /// Метод прорисовки катамарана /// private void Draw() { - if (_drawningCatamaran == null) + if (_drawningBoat == null) { return; } Bitmap bmp = new(pictureBoxCatamaran.Width, pictureBoxCatamaran.Height); Graphics gr = Graphics.FromImage(bmp); - _drawningCatamaran.DrawTransport(gr); + _drawningBoat.DrawTransport(gr); pictureBoxCatamaran.Image = bmp; } @@ -70,7 +94,7 @@ namespace ProjectCatamaran private void ButtonMove_Click(object sender, EventArgs e) { - if (_drawningCatamaran == null) + if (_drawningBoat == null) { return; } @@ -79,16 +103,16 @@ namespace ProjectCatamaran switch (name) { case "buttonUp": - result = _drawningCatamaran.MoveTransport(DirectionType.Up); + result = _drawningBoat.MoveTransport(DirectionType.Up); break; case "buttonDown": - result = _drawningCatamaran.MoveTransport(DirectionType.Down); + result = _drawningBoat.MoveTransport(DirectionType.Down); break; case "buttonLeft": - result = _drawningCatamaran.MoveTransport(DirectionType.Left); + result = _drawningBoat.MoveTransport(DirectionType.Left); break; case "buttonRight": - result = _drawningCatamaran.MoveTransport(DirectionType.Right); + result = _drawningBoat.MoveTransport(DirectionType.Right); break; } if (result) @@ -97,5 +121,6 @@ namespace ProjectCatamaran } } + } } diff --git a/ProjectCatamaran/ProjectCatamaran/Program.cs b/ProjectCatamaran/ProjectCatamaran/Resources/Program.cs similarity index 92% rename from ProjectCatamaran/ProjectCatamaran/Program.cs rename to ProjectCatamaran/ProjectCatamaran/Resources/Program.cs index 4d620b5..89a0c0b 100644 --- a/ProjectCatamaran/ProjectCatamaran/Program.cs +++ b/ProjectCatamaran/ProjectCatamaran/Resources/Program.cs @@ -1,4 +1,4 @@ -namespace ProjectCatamaran +namespace ProjectCatamaran.Resources { internal static class Program { -- 2.25.1 From 1cdad7b7ac037a66cc0c7db93265013c822e0859 Mon Sep 17 00:00:00 2001 From: AlyonaFr <149268946+AlyonaFr@users.noreply.github.com> Date: Wed, 20 Mar 2024 17:46:35 +0400 Subject: [PATCH 2/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D0=B8=20=D1=81=D1=82=D1=80=D0=B0=D1=82=D0=B5=D0=B3?= =?UTF-8?q?=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Drawnings/DirectionType.cs | 5 + .../Drawnings/DrawningBoat.cs | 39 ++++-- .../Drawnings/DrawningCatamaran.cs | 32 +---- .../FormCatamaran.Designer.cs | 26 ++++ .../ProjectCatamaran/FormCatamaran.cs | 52 ++++++++ .../MovementStrategy/AbstractStrategy.cs | 126 ++++++++++++++++++ .../MovementStrategy/IMoveableObject.cs | 30 +++++ .../MovementStrategy/MoveToBorder.cs | 56 ++++++++ .../MovementStrategy/MoveToCenter.cs | 55 ++++++++ .../MovementStrategy/MovebleBoat.cs | 62 +++++++++ .../MovementStrategy/MovementDirection.cs | 33 +++++ .../MovementStrategy/ObjectParameters.cs | 71 ++++++++++ .../MovementStrategy/StrategyStatus.cs | 28 ++++ 13 files changed, 573 insertions(+), 42 deletions(-) create mode 100644 ProjectCatamaran/ProjectCatamaran/MovementStrategy/AbstractStrategy.cs create mode 100644 ProjectCatamaran/ProjectCatamaran/MovementStrategy/IMoveableObject.cs create mode 100644 ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs create mode 100644 ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToCenter.cs create mode 100644 ProjectCatamaran/ProjectCatamaran/MovementStrategy/MovebleBoat.cs create mode 100644 ProjectCatamaran/ProjectCatamaran/MovementStrategy/MovementDirection.cs create mode 100644 ProjectCatamaran/ProjectCatamaran/MovementStrategy/ObjectParameters.cs create mode 100644 ProjectCatamaran/ProjectCatamaran/MovementStrategy/StrategyStatus.cs diff --git a/ProjectCatamaran/ProjectCatamaran/Drawnings/DirectionType.cs b/ProjectCatamaran/ProjectCatamaran/Drawnings/DirectionType.cs index d6c8da6..f1a237c 100644 --- a/ProjectCatamaran/ProjectCatamaran/Drawnings/DirectionType.cs +++ b/ProjectCatamaran/ProjectCatamaran/Drawnings/DirectionType.cs @@ -2,6 +2,11 @@ public enum DirectionType { + /// + /// Неизвестное направление + /// + Unknow = -1, + /// /// Вверх /// diff --git a/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs index 9ecd91a..c80533c 100644 --- a/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs +++ b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs @@ -37,12 +37,29 @@ public class DrawningBoat /// /// Ширина прорисовки катамарана /// - private readonly int _drawningCatamaranWidth = 80; + private readonly int _drawningBoatWidth = 80; /// /// Высота прорисовки катамарана /// - private readonly int _drawningCatamaranHeight = 62; + private readonly int _drawningBoatHeight = 80; + + /// + /// Координата X объекта + /// + public int? GetPosX => _startPosX; + /// + /// Координата Y объекта + /// + public int? GetPosY => _startPosY; + /// + /// Ширина объекта + /// + public int GetWidth => _drawningBoatWidth; + /// + /// Высота объекта + /// + public int GetHeight => _drawningBoatHeight; /// /// Пустой конструктор @@ -73,8 +90,8 @@ public class DrawningBoat /// Высота прорисовки катамарана protected DrawningBoat(int drawningCatamaranWidth, int drawningCatamaranHeight) : this() { - _drawningCatamaranWidth = drawningCatamaranWidth; - _drawningCatamaranHeight = drawningCatamaranHeight; + _drawningBoatWidth = drawningCatamaranWidth; + _pictureHeight = drawningCatamaranHeight; } @@ -86,7 +103,7 @@ public class DrawningBoat /// - границы заданы, false - проверка не пройдена, нельзя разместить объект в этих размерах public bool SetPictureSize(int width, int height) { - if (_drawningCatamaranHeight > height || _drawningCatamaranWidth > width) + if (_drawningBoatHeight > height || _drawningBoatWidth > width) { return false; } @@ -115,18 +132,18 @@ public class DrawningBoat return; } - if (x < 0 || x + _drawningCatamaranWidth > _pictureWidth) + if (x < 0 || x + _drawningBoatWidth > _pictureWidth) { - _startPosX = _pictureWidth - _drawningCatamaranWidth; + _startPosX = _pictureWidth - _drawningBoatWidth; } else { _startPosX = x; } - if (y < 0 || y + _drawningCatamaranHeight > _pictureHeight) + if (y < 0 || y + _drawningBoatHeight > _pictureHeight) { - _startPosY = _pictureHeight - _drawningCatamaranHeight; + _startPosY = _pictureHeight - _drawningBoatHeight; } else { @@ -163,7 +180,7 @@ public class DrawningBoat return true; // вправо case DirectionType.Right: - if (_startPosX.Value + EntityBoat.Step + _drawningCatamaranWidth < _pictureWidth) + if (_startPosX.Value + EntityBoat.Step + _drawningBoatWidth < _pictureWidth) { _startPosX += (int)EntityBoat.Step; return true; @@ -171,7 +188,7 @@ public class DrawningBoat return true; //вниз case DirectionType.Down: - if (_startPosY.Value + EntityBoat.Step + _drawningCatamaranHeight < _pictureHeight) + if (_startPosY.Value + EntityBoat.Step + _drawningBoatHeight < _pictureHeight) { _startPosY += (int)EntityBoat.Step; } diff --git a/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningCatamaran.cs b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningCatamaran.cs index 55c2890..40f166f 100644 --- a/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningCatamaran.cs +++ b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningCatamaran.cs @@ -8,36 +8,6 @@ namespace ProjectCatamaran.Drawnings; public class DrawningCatamaran : DrawningBoat { - /// - /// Ширина окна - /// - private int? _pictureWidth; - - /// - /// Высота окна - /// - private int? _pictureHeight; - - /// - /// Левая координата прорисовки катамарана - /// - private int? GetPosX => _startPosX; - - /// - /// Верхняя координата прорисовки катамарана - /// - private int? GetPosY => _startPosY; - - /// - /// Ширина прорисовки катамарана - /// - private readonly int _drawningCatamaranWidth = 79; - - /// - /// Высота прорисовки катамарана - /// - private readonly int _drawningCatamaranHeight = 75; - /// /// Конструктор /// @@ -48,7 +18,7 @@ public class DrawningCatamaran : DrawningBoat /// /// /// - public DrawningCatamaran(int speed, double weight, Color bodyColor, Color additionalColor, bool sail, bool leftfloater, bool rightfloater) : base(79, 75) + public DrawningCatamaran(int speed, double weight, Color bodyColor, Color additionalColor, bool sail, bool leftfloater, bool rightfloater) : base(80, 80) { EntityBoat = new EntityCatamaran(speed, weight, bodyColor, additionalColor, sail, leftfloater, rightfloater); diff --git a/ProjectCatamaran/ProjectCatamaran/FormCatamaran.Designer.cs b/ProjectCatamaran/ProjectCatamaran/FormCatamaran.Designer.cs index ece7e00..bc91fa0 100644 --- a/ProjectCatamaran/ProjectCatamaran/FormCatamaran.Designer.cs +++ b/ProjectCatamaran/ProjectCatamaran/FormCatamaran.Designer.cs @@ -35,6 +35,8 @@ buttonDown = new Button(); buttonRight = new Button(); buttonCreatBoat = new Button(); + comboBoxStrategy = new ComboBox(); + buttonStrategyStep = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxCatamaran).BeginInit(); SuspendLayout(); // @@ -119,11 +121,33 @@ buttonCreatBoat.UseVisualStyleBackColor = true; buttonCreatBoat.Click += ButtonCreatBoat_Click; // + // comboBoxStrategy + // + comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxStrategy.FormattingEnabled = true; + comboBoxStrategy.Items.AddRange(new object[] { "К центру", "К краю" }); + comboBoxStrategy.Location = new Point(653, 12); + comboBoxStrategy.Name = "comboBoxStrategy"; + comboBoxStrategy.Size = new Size(135, 28); + comboBoxStrategy.TabIndex = 8; + // + // buttonStrategyStep + // + buttonStrategyStep.Location = new Point(694, 46); + buttonStrategyStep.Name = "buttonStrategyStep"; + buttonStrategyStep.Size = new Size(94, 29); + buttonStrategyStep.TabIndex = 9; + buttonStrategyStep.Text = "Шаг"; + buttonStrategyStep.UseVisualStyleBackColor = true; + buttonStrategyStep.Click += ButtonStrategyStep_Click; + // // FormCatamaran // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; ClientSize = new Size(800, 450); + Controls.Add(buttonStrategyStep); + Controls.Add(comboBoxStrategy); Controls.Add(buttonCreatBoat); Controls.Add(buttonRight); Controls.Add(buttonDown); @@ -146,5 +170,7 @@ private Button buttonDown; private Button buttonRight; private Button buttonCreatBoat; + private ComboBox comboBoxStrategy; + private Button buttonStrategyStep; } } \ No newline at end of file diff --git a/ProjectCatamaran/ProjectCatamaran/FormCatamaran.cs b/ProjectCatamaran/ProjectCatamaran/FormCatamaran.cs index a57d253..8b7a425 100644 --- a/ProjectCatamaran/ProjectCatamaran/FormCatamaran.cs +++ b/ProjectCatamaran/ProjectCatamaran/FormCatamaran.cs @@ -8,6 +8,7 @@ using System.Text; using System.Threading.Tasks; using System.Windows.Forms; using ProjectCatamaran.Drawnings; +using ProjectCatamaran.MovementStrategy; namespace ProjectCatamaran { @@ -18,12 +19,19 @@ namespace ProjectCatamaran /// private DrawningBoat? _drawningBoat; + /// + /// Стратегия перемещения + /// + private AbstractStrategy? _strategy; + + /// /// Конструктор формы /// public FormCatamaran() { InitializeComponent(); + _strategy = null; } /// @@ -51,6 +59,8 @@ namespace ProjectCatamaran } _drawningBoat.SetPictureSize(pictureBoxCatamaran.Width, pictureBoxCatamaran.Height); _drawningBoat.SetPosition(random.Next(10, 100), random.Next(10, 100)); + _strategy = null; + comboBoxStrategy.Enabled = true; Draw(); } @@ -121,6 +131,48 @@ namespace ProjectCatamaran } } + /// + /// обработка нажатия кнопки шаг + /// + /// + /// + private void ButtonStrategyStep_Click(object sender, EventArgs e) + { + if (_drawningBoat == null) + { + return; + } + if (comboBoxStrategy.Enabled) + { + _strategy = comboBoxStrategy.SelectedIndex switch + { + 0 => new MoveToCenter(), + 1 => new MoveToBorder(), + _ => null, + }; + + if (_strategy == null) + { + return; + } + _strategy.SetData(new MovebleBoat(_drawningBoat), pictureBoxCatamaran.Width, pictureBoxCatamaran.Height); + } + + if (_strategy == null) + { + return; + } + + comboBoxStrategy.Enabled = false; + _strategy.MakeStep(); + Draw(); + + if (_strategy.GetStatus() == StrategyStatus.Finish) + { + comboBoxStrategy.Enabled = true; + _strategy = null; + } + } } } diff --git a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/AbstractStrategy.cs b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/AbstractStrategy.cs new file mode 100644 index 0000000..394eab7 --- /dev/null +++ b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/AbstractStrategy.cs @@ -0,0 +1,126 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectCatamaran.MovementStrategy; +/// +/// Класс-стратегия перемещения объекта +/// +public abstract class AbstractStrategy +{ + /// + /// Перемещаемый объект + /// + private IMoveableObject? _moveableObject; + /// + /// Статус перемещения + /// + private StrategyStatus _state = StrategyStatus.NotInit; + /// + /// Ширина поля + /// + protected int FieldWidth { get; private set; } + /// + /// Высота поля + /// + protected int FieldHeight { get; private set; } + /// + /// Статус перемещения + /// + public StrategyStatus GetStatus() { return _state; } + /// + /// Установка данных + /// + /// Перемещаемый объект + /// Ширина поля + /// Высота поля + public void SetData(IMoveableObject moveableObject, int width, int height) + { + if (moveableObject == null) + { + _state = StrategyStatus.NotInit; + return; + } + _state = StrategyStatus.InProgress; + _moveableObject = moveableObject; + FieldWidth = width; + FieldHeight = height; + } + /// + /// Шаг перемещения + /// + public void MakeStep() + { + if (_state != StrategyStatus.InProgress) + { + return; + } + if (IsTargetDestinaion()) + { + _state = StrategyStatus.Finish; + return; + } + MoveToTarget(); + } + /// + /// Перемещение влево + /// + /// Результат перемещения (true - удалось переместиться, false - неудача) + protected bool MoveLeft() => MoveTo(MovementDirection.Left); + /// + /// Перемещение вправо + /// + /// Результат перемещения (true - удалось переместиться, false - неудача) + protected bool MoveRight() => MoveTo(MovementDirection.Right); + /// + /// Перемещение вверх + /// + /// Результат перемещения (true - удалось переместиться, false - неудача) + protected bool MoveUp() => MoveTo(MovementDirection.Up); + /// + /// Перемещение вниз + /// + /// Результат перемещения (true - удалось переместиться, false - неудача) + protected bool MoveDown() => MoveTo(MovementDirection.Down); + /// + /// Параметры объекта + /// + protected ObjectParameters? GetObjectParameters => + _moveableObject?.GetObjectPosition; + /// + /// Шаг объекта + /// + /// + protected int? GetStep() + { + if (_state != StrategyStatus.InProgress) + { + return null; + } + return _moveableObject?.GetStep; + } + /// + /// Перемещение к цели + /// + protected abstract void MoveToTarget(); + /// + /// Достигнута ли цель + /// + /// + protected abstract bool IsTargetDestinaion(); + /// + /// Попытка перемещения в требуемом направлении + /// + /// Направление + /// Результат попытки (true - удалось переместиться, false - неудача) + private bool MoveTo(MovementDirection movementDirection) + { + if (_state != StrategyStatus.InProgress) + { + return false; + } + return _moveableObject?.TryMoveObject(movementDirection) ?? false; + } +} diff --git a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/IMoveableObject.cs b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/IMoveableObject.cs new file mode 100644 index 0000000..969fa2e --- /dev/null +++ b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/IMoveableObject.cs @@ -0,0 +1,30 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectCatamaran.MovementStrategy; + +/// +/// Интерфейс для работы с перемещаемым объектом +/// +public interface IMoveableObject +{ + /// + /// Получение координаты объекта + /// + ObjectParameters? GetObjectPosition { get; } + + /// + /// Шаг объекта + /// + int GetStep { get; } + + /// + /// Попытка переместить объект в указанном направлении + /// + /// Направление + /// true - объект перемещен, false - перемещение невозможно + bool TryMoveObject(MovementDirection direction); +} diff --git a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs new file mode 100644 index 0000000..9208068 --- /dev/null +++ b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToBorder.cs @@ -0,0 +1,56 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectCatamaran.MovementStrategy; + +public class MoveToBorder : AbstractStrategy +{ + protected override bool IsTargetDestinaion() + { + ObjectParameters? objParams = GetObjectParameters; + if (objParams == null) + { + return false; + } + return objParams.RightBorder - GetStep() <= FieldWidth + && objParams.RightBorder + GetStep() >= FieldWidth && + objParams.DownBorder - GetStep() <= FieldHeight + && objParams.DownBorder + GetStep() >= FieldHeight; + } + protected override void MoveToTarget() + { + ObjectParameters? objParams = GetObjectParameters; + if (objParams == null) + { + return; + } + int diffX = objParams.RightBorder - FieldWidth; + if (Math.Abs(diffX) > GetStep()) + { + if (diffX > 0) + { + MoveLeft(); + } + else + { + MoveRight(); + } + } + int diffY = objParams.DownBorder - FieldHeight; + if (Math.Abs(diffY) > GetStep()) + { + if (diffY > 0) + { + MoveUp(); + } + else + { + MoveDown(); + } + } + } +} + diff --git a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToCenter.cs b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToCenter.cs new file mode 100644 index 0000000..ae5a690 --- /dev/null +++ b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MoveToCenter.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectCatamaran.MovementStrategy; + +public class MoveToCenter : AbstractStrategy +{ + protected override bool IsTargetDestinaion() + { + ObjectParameters? objParams = GetObjectParameters; + if (objParams == null) + { + return false; + } + return objParams.ObjectMiddleHorizontal - GetStep() <= FieldWidth / 2 + && objParams.ObjectMiddleHorizontal + GetStep() >= FieldWidth / 2 && + objParams.ObjectMiddleVertical - GetStep() <= FieldHeight / 2 + && objParams.ObjectMiddleVertical + GetStep() >= FieldHeight / 2; + } + protected override void MoveToTarget() + { + ObjectParameters? objParams = GetObjectParameters; + if (objParams == null) + { + return; + } + int diffX = objParams.ObjectMiddleHorizontal - FieldWidth / 2; + if (Math.Abs(diffX) > GetStep()) + { + if (diffX > 0) + { + MoveLeft(); + } + else + { + MoveRight(); + } + } + int diffY = objParams.ObjectMiddleVertical - FieldHeight / 2; + if (Math.Abs(diffY) > GetStep()) + { + if (diffY > 0) + { + MoveUp(); + } + else + { + MoveDown(); + } + } + } +} diff --git a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MovebleBoat.cs b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MovebleBoat.cs new file mode 100644 index 0000000..11ba420 --- /dev/null +++ b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MovebleBoat.cs @@ -0,0 +1,62 @@ +using ProjectCatamaran.Drawnings; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectCatamaran.MovementStrategy; + +public class MovebleBoat : IMoveableObject +{ + /// + /// Поле-объект класса DrawningBoat или его наследника + /// + private readonly DrawningBoat? _boat = null; + /// + /// Конструктор + /// + /// Объект класса DrawningBoat + public MovebleBoat(DrawningBoat boat) + { + _boat = boat; + } + public ObjectParameters? GetObjectPosition + { + get + { + if (_boat == null || _boat.EntityBoat == null || + !_boat.GetPosX.HasValue || !_boat.GetPosY.HasValue) + { + return null; + } + return new ObjectParameters(_boat.GetPosX.Value, + _boat.GetPosY.Value, _boat.GetWidth, _boat.GetHeight); + } + } + public int GetStep => (int)(_boat?.EntityBoat?.Step ?? 0); + public bool TryMoveObject(MovementDirection direction) + { + if (_boat == null || _boat.EntityBoat == null) + { + return false; + } + return _boat.MoveTransport(GetDirectionType(direction)); + } + /// + /// Конвертация из MovementDirection в DirectionType + /// + /// MovementDirection + /// DirectionType + private static DirectionType GetDirectionType(MovementDirection direction) + { + return direction switch + { + MovementDirection.Left => DirectionType.Left, + MovementDirection.Right => DirectionType.Right, + MovementDirection.Up => DirectionType.Up, + MovementDirection.Down => DirectionType.Down, + _ => DirectionType.Unknow, + }; + } +} diff --git a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MovementDirection.cs b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MovementDirection.cs new file mode 100644 index 0000000..47cf476 --- /dev/null +++ b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/MovementDirection.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectCatamaran.MovementStrategy; + +/// +/// Направление перемещения +/// +public enum MovementDirection +{ + /// + /// Вверх + /// + Up = 1, + + /// + /// Вниз + /// + Down = 2, + + /// + /// Влево + /// + Left = 3, + + /// + /// Вправо + /// + Right = 4 +} diff --git a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/ObjectParameters.cs b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/ObjectParameters.cs new file mode 100644 index 0000000..7c50ff0 --- /dev/null +++ b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/ObjectParameters.cs @@ -0,0 +1,71 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectCatamaran.MovementStrategy + +{ + /// + /// Парметры-координаты объекта + /// + public class ObjectParameters + { + /// + /// Координата X + /// + private readonly int _x; + /// + /// Координата Y + /// + 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; + _y = y; + _width = width; + _height = height; + } + } +} diff --git a/ProjectCatamaran/ProjectCatamaran/MovementStrategy/StrategyStatus.cs b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/StrategyStatus.cs new file mode 100644 index 0000000..cc85dcf --- /dev/null +++ b/ProjectCatamaran/ProjectCatamaran/MovementStrategy/StrategyStatus.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectCatamaran.MovementStrategy; + +/// +/// Статус выполнения операции перемещения +/// +public enum StrategyStatus +{ + /// + /// Все готово к началу + /// + NotInit, + + /// + /// Выполняется + /// + InProgress, + + /// + /// Завершено + /// + Finish +} -- 2.25.1 From 98e928a3cda04c6465875179a2a0d6e114f43c71 Mon Sep 17 00:00:00 2001 From: AlyonaFr <149268946+AlyonaFr@users.noreply.github.com> Date: Wed, 20 Mar 2024 17:54:26 +0400 Subject: [PATCH 3/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs | 3 +++ .../Entities/{EntityCatamaran_1.cs => EntityBoat.cs} | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) rename ProjectCatamaran/ProjectCatamaran/Entities/{EntityCatamaran_1.cs => EntityBoat.cs} (94%) diff --git a/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs index c80533c..14a33d9 100644 --- a/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs +++ b/ProjectCatamaran/ProjectCatamaran/Drawnings/DrawningBoat.cs @@ -7,6 +7,9 @@ using System.Threading.Tasks; namespace ProjectCatamaran.Drawnings; +/// +/// Класс, отвечающий за прорисовку и перемещение базового объекта-сущности +/// public class DrawningBoat { /// diff --git a/ProjectCatamaran/ProjectCatamaran/Entities/EntityCatamaran_1.cs b/ProjectCatamaran/ProjectCatamaran/Entities/EntityBoat.cs similarity index 94% rename from ProjectCatamaran/ProjectCatamaran/Entities/EntityCatamaran_1.cs rename to ProjectCatamaran/ProjectCatamaran/Entities/EntityBoat.cs index fc61713..1cc8f3f 100644 --- a/ProjectCatamaran/ProjectCatamaran/Entities/EntityCatamaran_1.cs +++ b/ProjectCatamaran/ProjectCatamaran/Entities/EntityBoat.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace ProjectCatamaran.Entities; /// -/// Класс-сущности "Катамарана_1" +/// Класс-сущности "Лодка" /// public class EntityBoat { -- 2.25.1