diff --git a/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/AbstractCompany.cs b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/AbstractCompany.cs
new file mode 100644
index 0000000..af1727a
--- /dev/null
+++ b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/AbstractCompany.cs
@@ -0,0 +1,115 @@
+using ProjectContainerShip.Drawnings;
+
+namespace ProjectContainerShip.CollectionGenericObjects;
+///
+/// Абстракция компании, хранящий коллекцию кораблей
+///
+public abstract class AbstractCompany
+{
+ ///
+ /// Размер места (ширина)
+ ///
+ protected readonly int _placeSizeWidth = 210;
+
+ ///
+ /// Размер места (высота)
+ ///
+ protected readonly int _placeSizeHeight = 80;
+
+ ///
+ /// Ширина окна
+ ///
+ 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, DrawningShip boat)
+ {
+ return company._collection?.Insert(boat) ?? -1;
+ }
+
+ ///
+ /// Перегрузка оператора удаления для класса
+ ///
+ /// Компания
+ /// Номер удаляемого объекта
+ ///
+ public static DrawningShip operator -(AbstractCompany company, int position)
+ {
+ return company._collection?.Remove(position) ?? null;
+ }
+
+ ///
+ /// Получение случайного объекта из коллекции
+ ///
+ ///
+ public DrawningShip? 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)
+ {
+ DrawningShip? obj = _collection?.Get(i);
+ obj?.DrawTransport(graphics);
+ }
+
+ return bitmap;
+ }
+
+ ///
+ /// Вывод заднего фона
+ ///
+ ///
+ protected abstract void DrawBackground(Graphics g);
+
+ ///
+ /// Расстановка объектов
+ ///
+ protected abstract void SetObjectsPosition();
+}
diff --git a/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ICollectionGenericObjects.cs
index f537a94..2dc17b3 100644
--- a/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ICollectionGenericObjects.cs
+++ b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ICollectionGenericObjects.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
+
namespace ProjectContainerShip.CollectionGenericObjects;
public interface ICollectionGenericObjects
@@ -24,7 +19,7 @@ public interface ICollectionGenericObjects
///
/// Добавляемый объект
/// true - вставка прошла удачно, false - вставка не удалась
- bool Insert (T obj);
+ int Insert (T obj);
///
/// Добавление объекта в коллекцию на конкретную позицию
@@ -32,14 +27,14 @@ public interface ICollectionGenericObjects
/// /// Добавляемый объект
/// /// Позиция
/// true - вставка прошла удачно, false - вставка не удалась
- bool Insert (T obj, int position);
+ int Insert (T obj, int position);
///
/// Удаление объекта из коллекции с конктретной позиции
///
/// /// Добавляемый объект
/// true - удаление прошло удачно, false - удаление не удалось
- bool Remove (int position);
+ T Remove (int position);
///
/// Получение объекта по позиции
diff --git a/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs
index b5625b4..abe67dc 100644
--- a/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs
+++ b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs
@@ -33,9 +33,9 @@ public class MassiveGenericObjects : ICollectionGenericObjects
}
///
- /// Конструктор
- ///
- public MassiveGenericObjects()
+ /// Конструктор
+ ///
+ public MassiveGenericObjects()
{
_collection = Array.Empty();
}
@@ -65,7 +65,6 @@ public class MassiveGenericObjects : ICollectionGenericObjects
public int Insert(T obj, int position)
{
-
if (position < 0 || position >= Count)
{
return -1;
@@ -75,6 +74,7 @@ public class MassiveGenericObjects : ICollectionGenericObjects
_collection[position] = obj;
return position;
}
+
for (int i = position + 1; i < Count; i++)
{
if (_collection[i] == null)
@@ -98,12 +98,11 @@ public class MassiveGenericObjects : ICollectionGenericObjects
public T Remove(int position)
{
if (position < 0 || position >= Count)
- {
+ {
return null;
}
T obj = _collection[position];
_collection[position] = null;
return obj;
}
-}
}
\ No newline at end of file
diff --git a/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ShipSharingService.cs b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ShipSharingService.cs
new file mode 100644
index 0000000..d2e7c60
--- /dev/null
+++ b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ShipSharingService.cs
@@ -0,0 +1,65 @@
+using ProjectContainerShip.Drawnings;
+
+namespace ProjectContainerShip.CollectionGenericObjects;
+
+public class ShipSharingService : AbstractCompany
+{
+ private List> locCoord = new List>();
+ private int numRows, numCols;
+ ///
+ /// Конструктор
+ ///
+ ///
+ ///
+ ///
+ public ShipSharingService(int picWidth, int picHeight, ICollectionGenericObjects collection) : base(picWidth, picHeight, collection)
+ {
+ }
+
+ protected override void DrawBackground(Graphics g)
+ {
+ //Color backgroundColor = Color.SkyBlue;
+ //using (Brush brush = new SolidBrush(backgroundColor))
+ //{
+ // g.FillRectangle(brush, new Rectangle(0, 0, _pictureWidth, _pictureHeight));
+ //}
+ Pen pen = new Pen(Color.Brown, 3);
+ int offsetX = 10, offsetY = -12;
+ int x = 1 + offsetX, y = _pictureHeight - _placeSizeHeight + offsetY;
+ numRows = 0;
+ while (y >= 0)
+ {
+ int numCols = 0;
+ while (x + _placeSizeWidth <= _pictureWidth)
+ {
+ numCols++;
+ g.DrawLine(pen, x, y, x + _placeSizeWidth / 2, y);
+ g.DrawLine(pen, x, y, x, y + _placeSizeHeight + 8);
+ locCoord.Add(new Tuple(x, y));
+ x += _placeSizeWidth + 2;
+ }
+ numRows++;
+ x = 1 + offsetX;
+ y -= _placeSizeHeight + 5 + offsetY;
+ }
+ }
+
+ protected override void SetObjectsPosition()
+ {
+ if (locCoord == null || _collection == null)
+ {
+ return;
+ }
+ int row = numRows - 1, col = numCols;
+ for (int i = 0; i < _collection?.Count; i++, col--)
+ {
+ _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight);
+ _collection?.Get(i)?.SetPosition(locCoord[row * numCols - col].Item1 + 5, locCoord[row * numCols - col].Item2 + 9);
+ if (col == 1)
+ {
+ col = numCols + 1;
+ row--;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs b/ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs
index 81a0511..53ab768 100644
--- a/ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs
+++ b/ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs
@@ -29,7 +29,7 @@ public class EntityContainerShip : EntityShip
/// Дополнительный цвет
/// Признак наличия крана
/// Признак наличия контейнеров
- public EntityContainerShip(int speed, double weight, Color bodyColor, Color additionalColor, bool crane, bool container) : base(speed, weight, Color.Black)
+ public EntityContainerShip(int speed, double weight, Color bodyColor, Color additionalColor, bool crane, bool container) : base(speed, weight, bodyColor)
{
AdditionalColor = additionalColor;
Crane = crane;
diff --git a/ProjectContainerShip/ProjectContainerShip/FormContainerShip.Designer.cs b/ProjectContainerShip/ProjectContainerShip/FormContainerShip.Designer.cs
index 5ab38c5..4974af2 100644
--- a/ProjectContainerShip/ProjectContainerShip/FormContainerShip.Designer.cs
+++ b/ProjectContainerShip/ProjectContainerShip/FormContainerShip.Designer.cs
@@ -33,12 +33,10 @@ namespace ProjectContainerShip
private void InitializeComponent()
{
pictureBoxContainerShip = new PictureBox();
- buttonCreateContainerShip = new Button();
buttonLeft = new Button();
buttonUp = new Button();
buttonDown = new Button();
buttonRight = new Button();
- buttonCreateShip = new Button();
comboBoxStrategy = new ComboBox();
buttonStrategyStep = new Button();
((System.ComponentModel.ISupportInitialize)pictureBoxContainerShip).BeginInit();
@@ -53,17 +51,6 @@ namespace ProjectContainerShip
pictureBoxContainerShip.TabIndex = 0;
pictureBoxContainerShip.TabStop = false;
//
- // buttonCreateContainerShip
- //
- buttonCreateContainerShip.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
- buttonCreateContainerShip.Location = new Point(12, 546);
- buttonCreateContainerShip.Name = "buttonCreateContainerShip";
- buttonCreateContainerShip.Size = new Size(196, 26);
- buttonCreateContainerShip.TabIndex = 1;
- buttonCreateContainerShip.Text = "Создать контейнеровоз";
- buttonCreateContainerShip.UseVisualStyleBackColor = true;
- buttonCreateContainerShip.Click += ButtonCreateContainerShip_Click;
- //
// buttonLeft
//
buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
@@ -112,17 +99,6 @@ namespace ProjectContainerShip
buttonRight.UseVisualStyleBackColor = true;
buttonRight.Click += ButtonMove_Click;
//
- // buttonCreateShip
- //
- buttonCreateShip.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
- buttonCreateShip.Location = new Point(214, 546);
- buttonCreateShip.Name = "buttonCreateShip";
- buttonCreateShip.Size = new Size(196, 26);
- buttonCreateShip.TabIndex = 6;
- buttonCreateShip.Text = "Создать корабль";
- buttonCreateShip.UseVisualStyleBackColor = true;
- buttonCreateShip.Click +=ButtonCreateShip_Click;
- //
// comboBoxStrategy
//
comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
@@ -150,12 +126,10 @@ namespace ProjectContainerShip
ClientSize = new Size(934, 586);
Controls.Add(buttonStrategyStep);
Controls.Add(comboBoxStrategy);
- Controls.Add(buttonCreateShip);
Controls.Add(buttonRight);
Controls.Add(buttonDown);
Controls.Add(buttonUp);
Controls.Add(buttonLeft);
- Controls.Add(buttonCreateContainerShip);
Controls.Add(pictureBoxContainerShip);
Name = "FormContainerShip";
Text = "Спортивный автомобиль";
@@ -166,13 +140,11 @@ namespace ProjectContainerShip
#endregion
private PictureBox pictureBoxContainerShip;
- private Button buttonCreateContainerShip;
private Button buttonLeft;
private Button buttonUp;
private Button buttonDown;
private Button buttonRight;
private Button button1;
- private Button buttonCreateShip;
private ComboBox comboBoxStrategy;
private Button buttonStrategyStep;
}
diff --git a/ProjectContainerShip/ProjectContainerShip/FormContainerShip.cs b/ProjectContainerShip/ProjectContainerShip/FormContainerShip.cs
index 4ff8e6b..34ca18a 100644
--- a/ProjectContainerShip/ProjectContainerShip/FormContainerShip.cs
+++ b/ProjectContainerShip/ProjectContainerShip/FormContainerShip.cs
@@ -18,6 +18,21 @@ public partial class FormContainerShip : Form
///
private AbstractStrategy? _strategy;
+ ///
+ /// Получение объекта
+ ///
+ public DrawningShip SetShip
+ {
+ set
+ {
+ _drawningShip = value;
+ _drawningShip.SetPictureSize(pictureBoxContainerShip.Width, pictureBoxContainerShip.Height);
+ comboBoxStrategy.Enabled = true;
+ _strategy = null;
+ Draw();
+ }
+ }
+
///
/// Конструктор формы
///
@@ -43,50 +58,6 @@ public partial class FormContainerShip : Form
pictureBoxContainerShip.Image = bmp;
}
- ///
- /// Создание объекта класса-перемещения
- ///
- /// Тип создаваемого объекта
- private void CreateObject(string type)
- {
- Random random = new();
- switch (type)
- {
- case nameof(DrawningShip):
- _drawningShip = new DrawningShip(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(DrawningContainerShip):
- _drawningShip = new DrawningContainerShip(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)));
- break;
- default:
- return;
- }
-
- _drawningShip.SetPictureSize(pictureBoxContainerShip.Width, pictureBoxContainerShip.Height);
- _drawningShip.SetPosition(random.Next(10, 100), random.Next(10, 100));
- _strategy = null;
- comboBoxStrategy.Enabled = true;
- Draw();
- }
-
- ///
- /// Обработка нажатия кнопки "Создать спортивный автомобиль"
- ///
- ///
- ///
- private void ButtonCreateContainerShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningContainerShip));
-
- ///
- /// Обработка нажатия кнопки "Создать автомобиль"
- ///
- ///
- ///
- private void ButtonCreateShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningShip));
-
///
/// Перемещение объекта по форме (нажатие кнопок навигации)
///
diff --git a/ProjectContainerShip/ProjectContainerShip/FormShipCollection.Designer.cs b/ProjectContainerShip/ProjectContainerShip/FormShipCollection.Designer.cs
new file mode 100644
index 0000000..cf8986e
--- /dev/null
+++ b/ProjectContainerShip/ProjectContainerShip/FormShipCollection.Designer.cs
@@ -0,0 +1,177 @@
+namespace ProjectContainerShip
+{
+ partial class FormShipCollection
+ {
+ ///
+ /// 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();
+ buttonDelShip = new Button();
+ maskedTextBoxPosition = new MaskedTextBox();
+ buttonAddContainerShip = new Button();
+ buttonAddShip = new Button();
+ comboBoxSelectorCompany = new ComboBox();
+ pictureBox = new PictureBox();
+ colorDialog = new ColorDialog();
+ groupBoxTools.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+ SuspendLayout();
+ //
+ // groupBoxTools
+ //
+ groupBoxTools.Controls.Add(buttonRefresh);
+ groupBoxTools.Controls.Add(buttonGoToCheck);
+ groupBoxTools.Controls.Add(buttonDelShip);
+ groupBoxTools.Controls.Add(maskedTextBoxPosition);
+ groupBoxTools.Controls.Add(buttonAddContainerShip);
+ groupBoxTools.Controls.Add(buttonAddShip);
+ groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+ groupBoxTools.Dock = DockStyle.Right;
+ groupBoxTools.Location = new Point(930, 0);
+ groupBoxTools.Name = "groupBoxTools";
+ groupBoxTools.Size = new Size(206, 617);
+ groupBoxTools.TabIndex = 0;
+ groupBoxTools.TabStop = false;
+ groupBoxTools.Text = "Инструменты";
+ //
+ // buttonRefresh
+ //
+ buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonRefresh.Location = new Point(6, 482);
+ buttonRefresh.Name = "buttonRefresh";
+ buttonRefresh.RightToLeft = RightToLeft.No;
+ buttonRefresh.Size = new Size(194, 34);
+ buttonRefresh.TabIndex = 6;
+ buttonRefresh.Text = "Обновить";
+ buttonRefresh.UseVisualStyleBackColor = true;
+ //
+ // buttonGoToCheck
+ //
+ buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonGoToCheck.Location = new Point(6, 367);
+ buttonGoToCheck.Name = "buttonGoToCheck";
+ buttonGoToCheck.RightToLeft = RightToLeft.No;
+ buttonGoToCheck.Size = new Size(194, 34);
+ buttonGoToCheck.TabIndex = 5;
+ buttonGoToCheck.Text = "Передать на тесты";
+ buttonGoToCheck.UseVisualStyleBackColor = true;
+ buttonGoToCheck.Click += ButtonGoToCheck_Click;
+ //
+ // buttonDelShip
+ //
+ buttonDelShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonDelShip.Location = new Point(6, 234);
+ buttonDelShip.Name = "buttonDelShip";
+ buttonDelShip.RightToLeft = RightToLeft.No;
+ buttonDelShip.Size = new Size(194, 34);
+ buttonDelShip.TabIndex = 4;
+ buttonDelShip.Text = "Удалить";
+ buttonDelShip.UseVisualStyleBackColor = true;
+ buttonDelShip.Click += ButtonDelShip_Click;
+ //
+ // maskedTextBoxPosition
+ //
+ maskedTextBoxPosition.Location = new Point(6, 203);
+ maskedTextBoxPosition.Mask = "00";
+ maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+ maskedTextBoxPosition.Size = new Size(188, 25);
+ maskedTextBoxPosition.TabIndex = 3;
+ maskedTextBoxPosition.ValidatingType = typeof(int);
+ //
+ // buttonAddContainerShip
+ //
+ buttonAddContainerShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonAddContainerShip.Location = new Point(6, 134);
+ buttonAddContainerShip.Name = "buttonAddContainerShip";
+ buttonAddContainerShip.Size = new Size(194, 34);
+ buttonAddContainerShip.TabIndex = 2;
+ buttonAddContainerShip.Text = "Добавление контейнеровоза";
+ buttonAddContainerShip.UseVisualStyleBackColor = true;
+ buttonAddContainerShip.Click += ButtonAddContainerShip_Click;
+ //
+ // buttonAddShip
+ //
+ buttonAddShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonAddShip.Location = new Point(6, 94);
+ buttonAddShip.Name = "buttonAddShip";
+ buttonAddShip.Size = new Size(194, 34);
+ buttonAddShip.TabIndex = 1;
+ buttonAddShip.Text = "Добавление корабля";
+ buttonAddShip.UseVisualStyleBackColor = true;
+ buttonAddShip.Click += ButtonAddShip_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, 24);
+ comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+ comboBoxSelectorCompany.Size = new Size(194, 25);
+ 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(930, 617);
+ pictureBox.TabIndex = 1;
+ pictureBox.TabStop = false;
+ //
+ // FormShipCollection
+ //
+ AutoScaleDimensions = new SizeF(7F, 17F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(1136, 617);
+ Controls.Add(pictureBox);
+ Controls.Add(groupBoxTools);
+ Name = "FormShipCollection";
+ Text = "Коллекция кораблей";
+ groupBoxTools.ResumeLayout(false);
+ groupBoxTools.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+ ResumeLayout(false);
+ }
+
+ #endregion
+
+ private GroupBox groupBoxTools;
+ private Button buttonAddShip;
+ private ComboBox comboBoxSelectorCompany;
+ private MaskedTextBox maskedTextBoxPosition;
+ private Button buttonAddContainerShip;
+ private PictureBox pictureBox;
+ private Button buttonDelShip;
+ private Button buttonRefresh;
+ private Button buttonGoToCheck;
+ private ColorDialog colorDialog;
+ }
+}
\ No newline at end of file
diff --git a/ProjectContainerShip/ProjectContainerShip/FormShipCollection.cs b/ProjectContainerShip/ProjectContainerShip/FormShipCollection.cs
new file mode 100644
index 0000000..66fc54f
--- /dev/null
+++ b/ProjectContainerShip/ProjectContainerShip/FormShipCollection.cs
@@ -0,0 +1,189 @@
+using ProjectContainerShip.CollectionGenericObjects;
+using ProjectContainerShip.Drawnings;
+
+
+namespace ProjectContainerShip
+{
+ ///
+ /// Форма работы с компанией и ее коллекцией
+ ///
+ public partial class FormShipCollection : Form
+ {
+ ///
+ /// Компания
+ ///
+ private AbstractCompany? _company;
+
+ ///
+ /// Конструктор
+ ///
+ public FormShipCollection()
+ {
+ InitializeComponent();
+ }
+
+ ///
+ /// Выбор компании
+ ///
+ ///
+ ///
+ private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ switch (comboBoxSelectorCompany.Text)
+ {
+ case "Хранилище":
+ _company = new ShipSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects());
+ break;
+ }
+ }
+
+ ///
+ /// Создание объекта класса-перемещения
+ ///
+ /// Тип создаваемого объекта
+ private void CreateObject(string type)
+ {
+ if (_company == null)
+ {
+ return;
+ }
+ DrawningShip _drawningShip;
+ Random random = new();
+ switch (type)
+ {
+ case nameof(DrawningShip):
+ _drawningShip = new DrawningShip(random.Next(30, 70), random.Next(100, 500),
+ GetColor(random));
+ break;
+ case nameof(DrawningContainerShip):
+ _drawningShip = new DrawningContainerShip(random.Next(30, 70), random.Next(100, 500),
+ GetColor(random), GetColor(random),
+ Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+ break;
+ default:
+ return;
+
+ }
+ if (_company + _drawningShip != -1)
+ {
+ MessageBox.Show("Объект добавлен");
+ pictureBox.Image = _company.Show();
+ }
+ else
+ {
+ MessageBox.Show("Не удалось добавить объект");
+ }
+ }
+
+
+ ///
+ /// Добавление обычного корабля
+ ///
+ ///
+ ///
+ private void ButtonAddShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningShip));
+
+ ///
+ /// Добавление контейнеровоза
+ ///
+ ///
+ ///
+ private void ButtonAddContainerShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningContainerShip));
+
+ ///
+ /// Получение цвета
+ ///
+ /// Генератор случайных чисел
+ ///
+ 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 ButtonDelShip_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;
+ }
+
+ DrawningShip? ship = null;
+ int counter = 100;
+ while (ship == null)
+ {
+ ship = _company.GetRandomObject();
+ counter--;
+ if (counter <= 0)
+ {
+ break;
+ }
+ }
+
+ if (ship == null)
+ {
+ return;
+ }
+
+ FormContainerShip form = new FormContainerShip();
+ form.SetShip = ship;
+ form.ShowDialog();
+ }
+
+ ///
+ /// Перерисовка коллекции
+ ///
+ ///
+ ///
+ private void ButtonRefresh_Click(object sender, EventArgs e)
+ {
+ if (_company == null)
+ {
+ return;
+ }
+
+ pictureBox.Image = _company.Show();
+ }
+
+ }
+}
diff --git a/ProjectContainerShip/ProjectContainerShip/FormShipCollection.resx b/ProjectContainerShip/ProjectContainerShip/FormShipCollection.resx
new file mode 100644
index 0000000..3bec0d5
--- /dev/null
+++ b/ProjectContainerShip/ProjectContainerShip/FormShipCollection.resx
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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
+
+
+ 17, 17
+
+
+ 79
+
+
\ No newline at end of file
diff --git a/ProjectContainerShip/ProjectContainerShip/Program.cs b/ProjectContainerShip/ProjectContainerShip/Program.cs
index 426af01..4f76f20 100644
--- a/ProjectContainerShip/ProjectContainerShip/Program.cs
+++ b/ProjectContainerShip/ProjectContainerShip/Program.cs
@@ -11,7 +11,7 @@ namespace ProjectContainerShip
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
- Application.Run(new FormContainerShip());
+ Application.Run(new FormShipCollection());
}
}
}
\ No newline at end of file