diff --git a/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/AbstractCompany.cs b/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/AbstractCompany.cs
new file mode 100644
index 0000000..1403f66
--- /dev/null
+++ b/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/AbstractCompany.cs
@@ -0,0 +1,116 @@
+using ProjectMotorBoat.Drawings;
+
+namespace ProjectMotorBoat.CollectionGenericObjects;
+
+///
+/// Абстракция компании, хранящий коллекцию лодок
+///
+public abstract class AbstractCompany
+{
+ ///
+ /// Размер места (ширина)
+ ///
+ protected readonly int _placeSizeWidth = 120;
+
+ ///
+ /// Размер места (высота)
+ ///
+ protected readonly int _placeSizeHeight = 60;
+
+ ///
+ /// Ширина окна
+ ///
+ protected readonly int _pictureWidth;
+
+ ///
+ /// Высота окна
+ ///
+ protected readonly int _pictureHeight;
+
+ ///
+ /// Коллекция лодок
+ ///
+ protected ICollectionGenericObjects? _collection = null;
+
+ ///
+ /// Вычисление максимального количества элементов, который можно разместить в окне
+ ///
+ private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
+
+ ///
+ /// Конструктор
+ ///
+ /// Ширина окна
+ /// Высота окна
+ /// Коллекция лодок
+ public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects collection)
+ {
+ _pictureWidth = picWidth;
+ _pictureHeight = picHeight;
+ _collection = collection;
+ _collection.SetMaxCount = GetMaxCount;
+ }
+
+ ///
+ /// Перегрузка оператора сложения для класса
+ ///
+ /// Компания
+ /// Добавляемый объект
+ ///
+ public static int? operator +(AbstractCompany company, DrawingBoat boat)
+ {
+ return company._collection?.Insert(boat);
+ }
+
+ ///
+ /// Перегрузка оператора удаления для класса
+ ///
+ /// Компания
+ /// Номер удаляемого объекта
+ ///
+ public static DrawingBoat? operator -(AbstractCompany company, int position)
+ {
+ return company._collection?.Remove(position);
+ }
+
+ ///
+ /// Получение случайного объекта из коллекции
+ ///
+ ///
+ public DrawingBoat? GetRandomObject()
+ {
+ Random rnd = new();
+ return _collection?.Get(rnd.Next(GetMaxCount));
+ }
+
+ ///
+ /// Вывод всей коллекции
+ ///
+ ///
+ public Bitmap? Show()
+ {
+ Bitmap bitmap = new(_pictureWidth, _pictureHeight);
+ Graphics graphics = Graphics.FromImage(bitmap);
+ DrawBackground(graphics);
+
+ SetObjectsPosition();
+ for (int i = 0; i < (_collection?.Count ?? 0); ++i)
+ {
+ DrawingBoat? obj = _collection?.Get(i);
+ obj?.DrawTransport(graphics);
+ }
+
+ return bitmap;
+ }
+
+ ///
+ /// Вывод заднего фона
+ ///
+ ///
+ protected abstract void DrawBackground(Graphics g);
+
+ ///
+ /// Расстановка объектов
+ ///
+ protected abstract void SetObjectsPosition();
+}
diff --git a/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/BoatHarborService.cs b/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/BoatHarborService.cs
new file mode 100644
index 0000000..0854001
--- /dev/null
+++ b/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/BoatHarborService.cs
@@ -0,0 +1,62 @@
+using ProjectMotorBoat.Drawings;
+using ProjectMotorBoat.Entities;
+using System.Drawing;
+
+namespace ProjectMotorBoat.CollectionGenericObjects;
+
+///
+/// Реализация абстрактной компании - гавань
+///
+public class BoatHarborService : AbstractCompany
+{
+ ///
+ /// Конструктор
+ ///
+ ///
+ ///
+ ///
+ public BoatHarborService(int picWidth, int picHeight, ICollectionGenericObjects collection) : base(picWidth, picHeight, collection)
+ {
+ }
+
+
+ protected override void DrawBackground(Graphics g)
+ {
+ Pen pen = new(Color.BurlyWood, 4);
+
+ for (int startPosX = 5; (startPosX + _placeSizeWidth) < _pictureWidth; startPosX += _placeSizeWidth)
+ {
+ for (int startPosY = 5; (startPosY + _placeSizeHeight) < _pictureHeight; startPosY += _placeSizeHeight)
+ {
+ Point[] points =
+ {
+ new Point(startPosX + (_placeSizeWidth / 2), startPosY),
+ new Point(startPosX + _placeSizeWidth, startPosY),
+ new Point(startPosX + _placeSizeWidth, startPosY + _placeSizeHeight),
+ new Point(startPosX + (_placeSizeWidth / 2), startPosY + _placeSizeHeight),
+ };
+ g.DrawLines(pen, points);
+ }
+ }
+ }
+
+ protected override void SetObjectsPosition()
+ {
+ int startPosX = 10;
+ int startPosY = 10;
+
+ for (int i = 0; _collection?.Get(i) != null; i++)
+ {
+ if (startPosX + _placeSizeWidth > _pictureWidth)
+ {
+ startPosX = 10;
+ startPosY += _placeSizeHeight;
+ }
+
+ _collection.Get(i).SetPictureSize(_pictureWidth, _pictureHeight);
+ _collection.Get(i).SetPosition(startPosX, startPosY);
+
+ startPosX += _placeSizeWidth;
+ }
+ }
+}
diff --git a/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/ICollectionGenericObjects.cs
new file mode 100644
index 0000000..f5e51e7
--- /dev/null
+++ b/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/ICollectionGenericObjects.cs
@@ -0,0 +1,48 @@
+namespace ProjectMotorBoat.CollectionGenericObjects;
+
+///
+/// Интерфейс описания действий для набора хранимых объектов
+///
+/// Параметр: ограничение - ссылочный тип
+public interface ICollectionGenericObjects
+ where T : class
+{
+ ///
+ /// Количество объектов в коллекции
+ ///
+ int Count { get; }
+
+ ///
+ /// Установка максимального количества элементов
+ ///
+ int SetMaxCount { set; }
+
+ ///
+ /// Добавление объекта в коллекцию
+ ///
+ /// Добавляемый объект
+ /// true - вставка прошла удачно, false - вставка не удалась
+ int Insert(T obj);
+
+ ///
+ /// Добавление объекта в коллекцию на конкретную позицию
+ ///
+ /// Добавляемый объект
+ /// Позиция
+ /// true - вставка прошла удачно, false - вставка не удалась
+ int Insert(T obj, int position);
+
+ ///
+ /// Удаление объекта из коллекции с конкретной позиции
+ ///
+ /// Позиция
+ /// true - удаление прошло удачно, false - удаление не удалось
+ T? Remove(int position);
+
+ ///
+ /// Получение объекта по позиции
+ ///
+ /// Позиция
+ /// Объект
+ T? Get(int position);
+}
diff --git a/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/MassiveGenericObjects.cs
new file mode 100644
index 0000000..1c056ac
--- /dev/null
+++ b/ProjectMotorBoat/ProjectMotorBoat/CollectionGenericObjects/MassiveGenericObjects.cs
@@ -0,0 +1,110 @@
+namespace ProjectMotorBoat.CollectionGenericObjects;
+
+///
+/// Параметризованный набор объектов
+///
+/// Параметр: ограничение - ссылочный тип
+public class MassiveGenericObjects : ICollectionGenericObjects
+ where T : class
+{
+ ///
+ /// Массив объектов, которые храним
+ ///
+ private T?[] _collection;
+
+ public int Count => _collection.Length;
+
+ public int SetMaxCount
+ {
+ set
+ {
+ if (value > 0)
+ {
+ if (_collection.Length > 0)
+ {
+ Array.Resize(ref _collection, value);
+ }
+ else
+ {
+ _collection = new T?[value];
+ }
+ }
+ }
+ }
+
+ ///
+ /// Конструктор
+ ///
+ public MassiveGenericObjects()
+ {
+ _collection = Array.Empty();
+ }
+
+ public T? Get(int position)
+ {
+ // TODO проверка позиции ✔
+ if (_collection[position] != null && position < Count - 1)
+ {
+ return _collection[position];
+ }
+ return null;
+ }
+
+ public int Insert(T obj)
+ {
+ // TODO вставка в свободное место набора ✔
+ for (int i = 0; i < _collection.Length; i++)
+ {
+ if (_collection[i] == null)
+ {
+ _collection[i] = obj;
+ return i;
+ }
+ }
+ return -1;
+ }
+
+ public int Insert(T obj, int position)
+ {
+ // TODO проверка позиции ✔
+ // TODO проверка, что элемент массива по этой позиции пустой, если нет, то
+ // ищется свободное место после этой позиции и идет вставка туда
+ // если нет после, ищем до ✔
+ // TODO вставка ✔
+ if (_collection[position] != null)
+ {
+ for (int i = position; i < _collection.Length; i++)
+ {
+ if (_collection[i] == null)
+ {
+ _collection[position] = obj;
+ return position;
+ }
+ }
+
+ for (int i = position; i > 0; i--)
+ {
+ if (_collection[i] == null)
+ {
+ _collection[position] = obj;
+ return position;
+ }
+ }
+ }
+
+ return -1;
+ }
+
+ public T? Remove(int position)
+ {
+ // TODO проверка позиции ✔
+ // TODO удаление объекта из массива, присвоив элементу массива значение null ✔
+ if (_collection[position] != null)
+ {
+ _collection[position] = null;
+ return _collection[position];
+ }
+
+ return null;
+ }
+}
diff --git a/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.Designer.cs b/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.Designer.cs
new file mode 100644
index 0000000..3101d35
--- /dev/null
+++ b/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.Designer.cs
@@ -0,0 +1,173 @@
+namespace ProjectMotorBoat
+{
+ partial class FormBoatCollection
+ {
+ ///
+ /// Required designer variable.
+ ///
+ 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()
+ {
+ groupBoxTools = new GroupBox();
+ buttonRefresh = new Button();
+ buttonGoToCheck = new Button();
+ buttonRemoveBoat = new Button();
+ maskedTextBoxPosition = new MaskedTextBox();
+ buttonAddMotorBoat = new Button();
+ buttonAddBoat = new Button();
+ comboBoxSelectorCompany = new ComboBox();
+ pictureBox = new PictureBox();
+ groupBoxTools.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+ SuspendLayout();
+ //
+ // groupBoxTools
+ //
+ groupBoxTools.Controls.Add(buttonRefresh);
+ groupBoxTools.Controls.Add(buttonGoToCheck);
+ groupBoxTools.Controls.Add(buttonRemoveBoat);
+ groupBoxTools.Controls.Add(maskedTextBoxPosition);
+ groupBoxTools.Controls.Add(buttonAddMotorBoat);
+ groupBoxTools.Controls.Add(buttonAddBoat);
+ groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+ groupBoxTools.Dock = DockStyle.Right;
+ groupBoxTools.Location = new Point(777, 0);
+ groupBoxTools.Name = "groupBoxTools";
+ groupBoxTools.Size = new Size(201, 585);
+ groupBoxTools.TabIndex = 0;
+ groupBoxTools.TabStop = false;
+ groupBoxTools.Text = "Инструменты";
+ //
+ // buttonRefresh
+ //
+ buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonRefresh.Location = new Point(12, 389);
+ buttonRefresh.Name = "buttonRefresh";
+ buttonRefresh.Size = new Size(189, 32);
+ buttonRefresh.TabIndex = 6;
+ buttonRefresh.Text = "Обновить";
+ buttonRefresh.UseVisualStyleBackColor = true;
+ buttonRefresh.Click += ButtonRefresh_Click;
+ //
+ // buttonGoToCheck
+ //
+ buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonGoToCheck.Location = new Point(6, 289);
+ buttonGoToCheck.Name = "buttonGoToCheck";
+ buttonGoToCheck.Size = new Size(189, 32);
+ buttonGoToCheck.TabIndex = 5;
+ buttonGoToCheck.Text = "Передать на тесты";
+ buttonGoToCheck.UseVisualStyleBackColor = true;
+ buttonGoToCheck.Click += ButtonGoToCheck_Click;
+ //
+ // buttonRemoveBoat
+ //
+ buttonRemoveBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonRemoveBoat.Location = new Point(6, 201);
+ buttonRemoveBoat.Name = "buttonRemoveBoat";
+ buttonRemoveBoat.Size = new Size(189, 32);
+ buttonRemoveBoat.TabIndex = 4;
+ buttonRemoveBoat.Text = "Удалить лодку";
+ buttonRemoveBoat.UseVisualStyleBackColor = true;
+ buttonRemoveBoat.Click += ButtonRemoveBoat_Click;
+ //
+ // maskedTextBoxPosition
+ //
+ maskedTextBoxPosition.Location = new Point(6, 172);
+ maskedTextBoxPosition.Mask = "00";
+ maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+ maskedTextBoxPosition.Size = new Size(189, 23);
+ maskedTextBoxPosition.TabIndex = 3;
+ maskedTextBoxPosition.ValidatingType = typeof(int);
+ //
+ // buttonAddMotorBoat
+ //
+ buttonAddMotorBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonAddMotorBoat.Location = new Point(6, 107);
+ buttonAddMotorBoat.Name = "buttonAddMotorBoat";
+ buttonAddMotorBoat.Size = new Size(189, 32);
+ buttonAddMotorBoat.TabIndex = 2;
+ buttonAddMotorBoat.Text = "Добавление моторной лодки";
+ buttonAddMotorBoat.UseVisualStyleBackColor = true;
+ buttonAddMotorBoat.Click += ButtonAddMotorBoat_Click;
+ //
+ // buttonAddBoat
+ //
+ buttonAddBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonAddBoat.Location = new Point(6, 69);
+ buttonAddBoat.Name = "buttonAddBoat";
+ buttonAddBoat.Size = new Size(189, 32);
+ buttonAddBoat.TabIndex = 1;
+ buttonAddBoat.Text = "Добавление лодки";
+ buttonAddBoat.UseVisualStyleBackColor = true;
+ buttonAddBoat.Click += ButtonAddBoat_Click;
+ //
+ // comboBoxSelectorCompany
+ //
+ comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
+ comboBoxSelectorCompany.FormattingEnabled = true;
+ comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
+ comboBoxSelectorCompany.Location = new Point(6, 22);
+ comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+ comboBoxSelectorCompany.Size = new Size(189, 23);
+ comboBoxSelectorCompany.TabIndex = 0;
+ comboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged;
+ //
+ // pictureBox
+ //
+ pictureBox.Dock = DockStyle.Fill;
+ pictureBox.Location = new Point(0, 0);
+ pictureBox.Name = "pictureBox";
+ pictureBox.Size = new Size(777, 585);
+ pictureBox.TabIndex = 1;
+ pictureBox.TabStop = false;
+ //
+ // FormBoatCollection
+ //
+ AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(978, 585);
+ Controls.Add(pictureBox);
+ Controls.Add(groupBoxTools);
+ Name = "FormBoatCollection";
+ Text = " Коллекция лодок";
+ groupBoxTools.ResumeLayout(false);
+ groupBoxTools.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+ ResumeLayout(false);
+ }
+
+ #endregion
+
+ private GroupBox groupBoxTools;
+ private Button buttonAddMotorBoat;
+ private Button buttonAddBoat;
+ private ComboBox comboBoxSelectorCompany;
+ private Button buttonGoToCheck;
+ private Button buttonRemoveBoat;
+ private MaskedTextBox maskedTextBoxPosition;
+ private PictureBox pictureBox;
+ private Button buttonRefresh;
+ }
+}
\ No newline at end of file
diff --git a/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.cs b/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.cs
new file mode 100644
index 0000000..4c35f84
--- /dev/null
+++ b/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.cs
@@ -0,0 +1,179 @@
+using ProjectMotorBoat.CollectionGenericObjects;
+using ProjectMotorBoat.Drawings;
+
+namespace ProjectMotorBoat;
+
+///
+/// Форма работы с компанией и ее коллекцией
+///
+public partial class FormBoatCollection : Form
+{
+ ///
+ /// Компания
+ ///
+ private AbstractCompany? _company = null;
+
+ ///
+ /// Конструктор
+ ///
+ public FormBoatCollection()
+ {
+ InitializeComponent();
+ }
+
+ ///
+ /// Выбор компании
+ ///
+ ///
+ ///
+ private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ switch (comboBoxSelectorCompany.Text)
+ {
+ case "Хранилище":
+ _company = new BoatHarborService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects());
+ break;
+ }
+ }
+
+ ///
+ /// Добавление обычной лодки
+ ///
+ ///
+ ///
+ private void ButtonAddBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingBoat));
+
+ ///
+ /// Добавление моторной лодки
+ ///
+ ///
+ ///
+ private void ButtonAddMotorBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingMotorBoat));
+
+ ///
+ /// Создание объекта класса-перемещения
+ ///
+ /// Тип создаваемого объекта
+ private void CreateObject(string type)
+ {
+ if (_company == null)
+ {
+ return;
+ }
+
+ Random random = new();
+ DrawingBoat drawingBoat;
+ switch (type)
+ {
+ case nameof(DrawingBoat):
+ drawingBoat = new DrawingBoat(random.Next(100, 300), random.Next(1000, 3000),
+ GetColor(random));
+ break;
+ case nameof(DrawingMotorBoat):
+ drawingBoat = new DrawingMotorBoat(random.Next(100, 300), random.Next(1000, 3000),
+ GetColor(random),
+ GetColor(random),
+ Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+ break;
+ default:
+ return;
+ }
+
+ if (_company + drawingBoat >= 0)
+ {
+ MessageBox.Show("Объект добавлен");
+ pictureBox.Image = _company.Show();
+ }
+ else
+ {
+ MessageBox.Show("Не удалось добавить объект");
+ }
+ }
+
+ ///
+ /// Получение цвета
+ ///
+ /// Генератор случайных чисел
+ ///
+ private static Color GetColor(Random random)
+ {
+ Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256));
+ ColorDialog dialog = new();
+ if (dialog.ShowDialog() == DialogResult.OK)
+ {
+ color = dialog.Color;
+ }
+
+ return color;
+ }
+
+ ///
+ /// Удаление объекта
+ ///
+ ///
+ ///
+ private void ButtonRemoveBoat_Click(object sender, EventArgs e)
+ {
+ if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null)
+ {
+ return;
+ }
+
+ if (MessageBox.Show("Удалить объект?", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+ {
+ return;
+ }
+
+ int pos = Convert.ToInt32(maskedTextBoxPosition.Text);
+ if (_company - pos != null)
+ {
+ MessageBox.Show("Объект удален");
+ pictureBox.Image = _company.Show();
+ }
+ else
+ {
+ MessageBox.Show("Не удалось удалить объект");
+ }
+ }
+
+ private void ButtonGoToCheck_Click(object sender, EventArgs e)
+ {
+ if (_company == null)
+ {
+ return;
+ }
+
+ DrawingBoat? boat = null;
+ int counter = 100;
+ while (boat == null)
+ {
+ boat = _company.GetRandomObject();
+ counter--;
+ if (counter <= 0)
+ {
+ break;
+ }
+ }
+
+ if (boat == null)
+ {
+ return;
+ }
+
+ FormMotorBoat form = new()
+ {
+ SetBoat = boat
+ };
+ form.ShowDialog();
+ }
+
+ private void ButtonRefresh_Click(object sender, EventArgs e)
+ {
+ if (_company == null)
+ {
+ return;
+ }
+
+ pictureBox.Image = _company.Show();
+ }
+}
diff --git a/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.resx b/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.resx
new file mode 100644
index 0000000..af32865
--- /dev/null
+++ b/ProjectMotorBoat/ProjectMotorBoat/FormBoatCollection.resx
@@ -0,0 +1,120 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
\ No newline at end of file
diff --git a/ProjectMotorBoat/ProjectMotorBoat/FormMotorBoat.Designer.cs b/ProjectMotorBoat/ProjectMotorBoat/FormMotorBoat.Designer.cs
index 333d251..86d5061 100644
--- a/ProjectMotorBoat/ProjectMotorBoat/FormMotorBoat.Designer.cs
+++ b/ProjectMotorBoat/ProjectMotorBoat/FormMotorBoat.Designer.cs
@@ -29,12 +29,10 @@
private void InitializeComponent()
{
pictureBoxMotorBoat = new PictureBox();
- buttonCreateMotorBoat = new Button();
buttonLeft = new Button();
buttonUp = new Button();
buttonRight = new Button();
buttonDown = new Button();
- buttonCreateBoat = new Button();
comboBoxStrategy = new ComboBox();
buttonStrategyStep = new Button();
((System.ComponentModel.ISupportInitialize)pictureBoxMotorBoat).BeginInit();
@@ -50,17 +48,6 @@
pictureBoxMotorBoat.TabIndex = 0;
pictureBoxMotorBoat.TabStop = false;
//
- // buttonCreateMotorBoat
- //
- buttonCreateMotorBoat.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
- buttonCreateMotorBoat.Location = new Point(12, 448);
- buttonCreateMotorBoat.Name = "buttonCreateMotorBoat";
- buttonCreateMotorBoat.Size = new Size(160, 23);
- buttonCreateMotorBoat.TabIndex = 1;
- buttonCreateMotorBoat.Text = "Создать моторную лодку";
- buttonCreateMotorBoat.UseVisualStyleBackColor = true;
- buttonCreateMotorBoat.Click += ButtonCreateMotorBoat_Click;
- //
// buttonLeft
//
buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
@@ -109,17 +96,6 @@
buttonDown.UseVisualStyleBackColor = true;
buttonDown.Click += ButtonMoveMotorBoat_click;
//
- // buttonCreateBoat
- //
- buttonCreateBoat.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
- buttonCreateBoat.Location = new Point(178, 448);
- buttonCreateBoat.Name = "buttonCreateBoat";
- buttonCreateBoat.Size = new Size(160, 23);
- buttonCreateBoat.TabIndex = 6;
- buttonCreateBoat.Text = "Создать лодку";
- buttonCreateBoat.UseVisualStyleBackColor = true;
- buttonCreateBoat.Click += ButtonCreateBoat_Click;
- //
// comboBoxStrategy
//
comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
@@ -147,12 +123,10 @@
ClientSize = new Size(956, 483);
Controls.Add(buttonStrategyStep);
Controls.Add(comboBoxStrategy);
- Controls.Add(buttonCreateBoat);
Controls.Add(buttonDown);
Controls.Add(buttonRight);
Controls.Add(buttonUp);
Controls.Add(buttonLeft);
- Controls.Add(buttonCreateMotorBoat);
Controls.Add(pictureBoxMotorBoat);
Name = "FormMotorBoat";
Text = "Катер";
@@ -164,12 +138,10 @@
#endregion
private PictureBox pictureBoxMotorBoat;
- private Button buttonCreateMotorBoat;
private Button buttonLeft;
private Button buttonUp;
private Button buttonRight;
private Button buttonDown;
- private Button buttonCreateBoat;
private ComboBox comboBoxStrategy;
private Button buttonStrategyStep;
}
diff --git a/ProjectMotorBoat/ProjectMotorBoat/FormMotorBoat.cs b/ProjectMotorBoat/ProjectMotorBoat/FormMotorBoat.cs
index 3c11644..8433b30 100644
--- a/ProjectMotorBoat/ProjectMotorBoat/FormMotorBoat.cs
+++ b/ProjectMotorBoat/ProjectMotorBoat/FormMotorBoat.cs
@@ -13,8 +13,26 @@ public partial class FormMotorBoat : Form
///
private DrawingBoat? _drawingBoat;
+ ///
+ /// Стратегия перемещения
+ ///
private AbstractStrategy? _strategy;
+ ///
+ /// Получение объекта
+ ///
+ public DrawingBoat SetBoat
+ {
+ set
+ {
+ _drawingBoat = value;
+ _drawingBoat.SetPictureSize(pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
+ comboBoxStrategy.Enabled = true;
+ _strategy = null;
+ Draw();
+ }
+ }
+
///
/// Конструктор формы
///
@@ -40,50 +58,6 @@ public partial class FormMotorBoat : Form
pictureBoxMotorBoat.Image = bmp;
}
- ///
- /// Создание объекта класса-перемещения
- ///
- /// Тип создаваемого объекта
- private void CreateObject(string type)
- {
- Random random = new();
- switch (type)
- {
- case nameof(DrawingBoat):
- _drawingBoat = new DrawingBoat(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(DrawingMotorBoat):
- _drawingBoat = new DrawingMotorBoat(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;
- }
-
- _drawingBoat.SetPictureSize(pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height);
- _drawingBoat.SetPosition(random.Next(10, 100), random.Next(10, 100));
- _strategy = null;
- comboBoxStrategy.Enabled = true;
- Draw();
- }
-
- ///
- /// Обработка нажатия кнопки "Создать моторную лодку"
- ///
- ///
- ///
- private void ButtonCreateMotorBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingMotorBoat));
-
- ///
- /// Обработка нажатия кнопки "Создать лодку"
- ///
- ///
- ///
- private void ButtonCreateBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingBoat));
-
///
/// Перемещение объекта по форме (нажатие кнопок навигации)
///
diff --git a/ProjectMotorBoat/ProjectMotorBoat/MovementStrategy/MoveToBorder.cs b/ProjectMotorBoat/ProjectMotorBoat/MovementStrategy/MoveToBorder.cs
index e354b4f..c0af011 100644
--- a/ProjectMotorBoat/ProjectMotorBoat/MovementStrategy/MoveToBorder.cs
+++ b/ProjectMotorBoat/ProjectMotorBoat/MovementStrategy/MoveToBorder.cs
@@ -1,19 +1,10 @@
namespace ProjectMotorBoat.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;
@@ -48,4 +39,16 @@ 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;
+ }
}
diff --git a/ProjectMotorBoat/ProjectMotorBoat/Program.cs b/ProjectMotorBoat/ProjectMotorBoat/Program.cs
index 30a5090..bcbd11e 100644
--- a/ProjectMotorBoat/ProjectMotorBoat/Program.cs
+++ b/ProjectMotorBoat/ProjectMotorBoat/Program.cs
@@ -11,7 +11,7 @@ namespace ProjectMotorBoat
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
- Application.Run(new FormMotorBoat());
+ Application.Run(new FormBoatCollection());
}
}
}
\ No newline at end of file