diff --git a/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/AbstractCompany.cs b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/AbstractCompany.cs
new file mode 100644
index 0000000..beabb50
--- /dev/null
+++ b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/AbstractCompany.cs
@@ -0,0 +1,122 @@
+using ProjectAirBomber.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection.PortableExecutable;
+using System.Text;
+using System.Threading.Tasks;
+
+
+namespace ProjectAirBomber.CollectionGenericObjects;
+
+///
+/// Абстракция компании, хранящий коллекцию автомобилей
+///
+public abstract class AbstractCompany
+{
+ ///
+ /// Размер места (ширина)
+ ///
+ protected readonly int _placeSizeWidth = 230;
+
+ ///
+ /// Размер места (высота)
+ ///
+ protected readonly int _placeSizeHeight = 180;
+
+ ///
+ /// Ширина окна
+ ///
+ 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, DrawningBomber bomber)
+ {
+ return company._collection?.Insert(bomber) ?? 0;
+ }
+ ///
+ /// Перегрузка оператора удаления для класса
+ ///
+ /// Компания
+ /// Номер удаляемого объекта
+ ///
+ public static DrawningBomber? operator -(AbstractCompany company, int position)
+ {
+ return company._collection?.Remove(position);
+ }
+
+ ///
+ /// Получение случайного объекта из коллекции
+ ///
+ ///
+ public DrawningBomber? GetRandomObject()
+ {
+ Random rnd = new();
+ return _collection?.Get(rnd.Next(GetMaxCount));
+ }
+
+ ///
+ /// Вывод всей коллекции
+ ///
+ ///
+ public Bitmap? Show()
+ {
+ Bitmap bitmap = new(_pictureWidth, _pictureHeight);
+ Graphics graphics = Graphics.FromImage(bitmap);
+ DrawBackgound(graphics);
+
+ SetObjectsPosition();
+ for (int i = 0; i < (_collection?.Count ?? 0); ++i)
+ {
+ DrawningBomber? obj = _collection?.Get(i);
+ obj?.DrawTransport(graphics);
+ }
+
+ return bitmap;
+ }
+
+ ///
+ /// Вывод заднего фона
+ ///
+ ///
+ protected abstract void DrawBackgound(Graphics g);
+
+ ///
+ /// Расстановка объектов
+ ///
+ protected abstract void SetObjectsPosition();
+}
diff --git a/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/ICollectionGenericObjects.cs
index 0b14190..07b2576 100644
--- a/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/ICollectionGenericObjects.cs
+++ b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/ICollectionGenericObjects.cs
@@ -6,6 +6,10 @@ using System.Threading.Tasks;
namespace ProjectAirBomber.CollectionGenericObjects;
+///
+/// Интерфейс описания действий для набора хранимых объектов
+///
+/// Параметр: ограничение - ссылочный тип
public interface ICollectionGenericObjects
where T : class
{
diff --git a/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/WarPlaneService.cs b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/WarPlaneService.cs
new file mode 100644
index 0000000..5d41e5d
--- /dev/null
+++ b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/WarPlaneService.cs
@@ -0,0 +1,66 @@
+using ProjectAirBomber.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectAirBomber.CollectionGenericObjects;
+
+public class WarPlaneService : AbstractCompany
+{
+ public WarPlaneService(int picWidth, int picHeight, ICollectionGenericObjects collection) : base(picWidth, picHeight, collection)
+ {
+ }
+
+ protected override void DrawBackgound(Graphics g)
+ {
+ int width = _pictureWidth / _placeSizeWidth;
+ int height = _pictureHeight / _placeSizeHeight;
+ Brush brush = new SolidBrush(Color.Black);
+ for (int i = 0; i < width; ++i)
+ {
+ for (int j = 0; j < height; ++j)
+ {
+ g.FillRectangle(brush, i * _placeSizeWidth , j * _placeSizeHeight, 200, 5);
+ g.FillRectangle(brush, i * _placeSizeWidth, j * _placeSizeHeight, 5, 180);
+ }
+ }
+ for (int j = 0; j < height; ++j)
+ {
+ g.FillRectangle(brush, j * _placeSizeWidth, height * _placeSizeHeight, 200, 5);
+ }
+ }
+
+ protected override void SetObjectsPosition()
+ {
+ if (_collection == null) return;
+ int width = _pictureWidth / _placeSizeWidth;
+ int height = _pictureHeight / _placeSizeHeight;
+
+ int curWidth = width - 1;
+ int curHeight = 0;
+
+ for (int i = 0; i < _collection.Count; i++)
+ {
+ DrawningBomber? _bomber = _collection.Get(i);
+ if (_bomber != null)
+ {
+ if (_bomber.SetPictureSize(_pictureWidth, _pictureHeight))
+ {
+ _bomber.SetPosition(_placeSizeWidth * curWidth + 20, curHeight * _placeSizeHeight + 15);
+ }
+ }
+ curWidth--;
+ if (curWidth < 0)
+ {
+ curHeight++;
+ curWidth = width - 1;
+ }
+ if (curHeight >= height)
+ {
+ return;
+ }
+ }
+ }
+}
diff --git a/ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningBomber.cs b/ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningBomber.cs
index 07e54e6..aee17ab 100644
--- a/ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningBomber.cs
+++ b/ProjectAirBomber/ProjectAirBomber/Drawnings/DrawningBomber.cs
@@ -41,12 +41,12 @@ public class DrawningBomber
///
/// Ширина прорисовки бомбардировщика
///
- private readonly int _drawningBomberWidth = 148;
+ private readonly int _drawningBomberWidth = 145;
///
/// Высота прорисовки бомбардировщика
///
- private readonly int _drawningBomberHeight = 145;
+ private readonly int _drawningBomberHeight = 148;
///
/// Координата X объекта
diff --git a/ProjectAirBomber/ProjectAirBomber/FormAirBomber.Designer.cs b/ProjectAirBomber/ProjectAirBomber/FormAirBomber.Designer.cs
index 68c44f7..a23fb65 100644
--- a/ProjectAirBomber/ProjectAirBomber/FormAirBomber.Designer.cs
+++ b/ProjectAirBomber/ProjectAirBomber/FormAirBomber.Designer.cs
@@ -29,12 +29,10 @@
private void InitializeComponent()
{
pictureBoxAirBomber = new PictureBox();
- buttonCreate = new Button();
buttonLeft = new Button();
buttonUp = new Button();
buttonRight = new Button();
buttonDown = new Button();
- buttonCreateBomber = new Button();
comboBoxStrategy = new ComboBox();
buttonStrategyStep = new Button();
((System.ComponentModel.ISupportInitialize)pictureBoxAirBomber).BeginInit();
@@ -48,18 +46,6 @@
pictureBoxAirBomber.Size = new Size(800, 450);
pictureBoxAirBomber.TabIndex = 0;
pictureBoxAirBomber.TabStop = false;
- pictureBoxAirBomber.Click += pictureBoxAirBomber_Click;
- //
- // buttonCreate
- //
- buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
- buttonCreate.Location = new Point(12, 409);
- buttonCreate.Name = "buttonCreate";
- buttonCreate.Size = new Size(246, 29);
- buttonCreate.TabIndex = 1;
- buttonCreate.Text = "Создать авиабомбардировщик";
- buttonCreate.UseVisualStyleBackColor = true;
- buttonCreate.Click += ButtonCreateAirBomber_Click;
//
// buttonLeft
//
@@ -109,17 +95,6 @@
buttonDown.UseVisualStyleBackColor = true;
buttonDown.Click += ButtonMove_Click;
//
- // buttonCreateBomber
- //
- buttonCreateBomber.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
- buttonCreateBomber.Location = new Point(264, 409);
- buttonCreateBomber.Name = "buttonCreateBomber";
- buttonCreateBomber.Size = new Size(223, 29);
- buttonCreateBomber.TabIndex = 6;
- buttonCreateBomber.Text = "Создать бомбардировщик";
- buttonCreateBomber.UseVisualStyleBackColor = true;
- buttonCreateBomber.Click += buttonCreateBomber_Click;
- //
// comboBoxStrategy
//
comboBoxStrategy.FormattingEnabled = true;
@@ -146,12 +121,10 @@
ClientSize = new Size(800, 450);
Controls.Add(buttonStrategyStep);
Controls.Add(comboBoxStrategy);
- Controls.Add(buttonCreateBomber);
Controls.Add(buttonDown);
Controls.Add(buttonRight);
Controls.Add(buttonUp);
Controls.Add(buttonLeft);
- Controls.Add(buttonCreate);
Controls.Add(pictureBoxAirBomber);
Name = "FormAirBomber";
Text = "Бомбардировщик";
@@ -162,12 +135,10 @@
#endregion
private PictureBox pictureBoxAirBomber;
- private Button buttonCreate;
private Button buttonLeft;
private Button buttonUp;
private Button buttonRight;
private Button buttonDown;
- private Button buttonCreateBomber;
private ComboBox comboBoxStrategy;
private Button buttonStrategyStep;
}
diff --git a/ProjectAirBomber/ProjectAirBomber/FormAirBomber.cs b/ProjectAirBomber/ProjectAirBomber/FormAirBomber.cs
index beb92f6..2ef043a 100644
--- a/ProjectAirBomber/ProjectAirBomber/FormAirBomber.cs
+++ b/ProjectAirBomber/ProjectAirBomber/FormAirBomber.cs
@@ -28,6 +28,21 @@ public partial class FormAirBomber : Form
///
private AbstractStrategy? _strategy;
+ ///
+ /// Получение объекта
+ ///
+ public DrawningBomber SetBomber
+ {
+ set
+ {
+ _drawningBomber = value;
+ _drawningBomber.SetPictureSize(pictureBoxAirBomber.Width, pictureBoxAirBomber.Height);
+ comboBoxStrategy.Enabled = true;
+ _strategy = null;
+ Draw();
+ }
+ }
+
///
/// Конструктор формы
///
@@ -53,47 +68,6 @@ public partial class FormAirBomber : Form
pictureBoxAirBomber.Image = bmp;
}
- private void CreateObject(string type)
- {
- Random random = new();
- switch (type)
- {
- case nameof(DrawningBomber):
- _drawningBomber = new DrawningBomber(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(DrawningAirBomber):
- _drawningBomber = new DrawningAirBomber(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;
- }
-
- _drawningBomber.SetPictureSize(pictureBoxAirBomber.Width, pictureBoxAirBomber.Height);
- _drawningBomber.SetPosition(random.Next(10, 100), random.Next(10, 100));
- _strategy = null;
- comboBoxStrategy.Enabled = true;
- Draw();
- }
-
- ///
- /// Обработка нажатия кнопки "Создать авиабомбардировщик"
- ///
- ///
- ///
- private void ButtonCreateAirBomber_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAirBomber));
-
- ///
- /// Обработка нажатия кнопки "Создать бомбардировщик"
- ///
- ///
- ///
-
- private void buttonCreateBomber_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBomber));
-
///
/// Перемещение объекта по форме (нажатие кнопок навигации)
///
@@ -130,11 +104,6 @@ public partial class FormAirBomber : Form
}
}
- private void pictureBoxAirBomber_Click(object sender, EventArgs e)
- {
-
- }
-
///
/// Обработка нажатия кнопки "Шаг"
///
@@ -177,4 +146,5 @@ public partial class FormAirBomber : Form
_strategy = null;
}
}
+
}
\ No newline at end of file
diff --git a/ProjectAirBomber/ProjectAirBomber/FormBomberCollection.Designer.cs b/ProjectAirBomber/ProjectAirBomber/FormBomberCollection.Designer.cs
new file mode 100644
index 0000000..066d76e
--- /dev/null
+++ b/ProjectAirBomber/ProjectAirBomber/FormBomberCollection.Designer.cs
@@ -0,0 +1,173 @@
+namespace ProjectAirBomber
+{
+ partial class FormBomberCollection
+ {
+ ///
+ /// 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();
+ buttonDelBomber = new Button();
+ maskedTextBox = new MaskedTextBox();
+ buttonAddAirBomber = new Button();
+ buttonAddBomber = new Button();
+ comboBoxSelectorCompany = new ComboBox();
+ pictureBox1 = new PictureBox();
+ groupBoxTools.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)pictureBox1).BeginInit();
+ SuspendLayout();
+ //
+ // groupBoxTools
+ //
+ groupBoxTools.Controls.Add(buttonRefresh);
+ groupBoxTools.Controls.Add(buttonGoToCheck);
+ groupBoxTools.Controls.Add(buttonDelBomber);
+ groupBoxTools.Controls.Add(maskedTextBox);
+ groupBoxTools.Controls.Add(buttonAddAirBomber);
+ groupBoxTools.Controls.Add(buttonAddBomber);
+ groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+ groupBoxTools.Dock = DockStyle.Right;
+ groupBoxTools.Location = new Point(758, 0);
+ groupBoxTools.Name = "groupBoxTools";
+ groupBoxTools.Size = new Size(251, 560);
+ groupBoxTools.TabIndex = 0;
+ groupBoxTools.TabStop = false;
+ groupBoxTools.Text = "Инструменты";
+ //
+ // buttonRefresh
+ //
+ buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonRefresh.Location = new Point(17, 479);
+ buttonRefresh.Name = "buttonRefresh";
+ buttonRefresh.Size = new Size(222, 51);
+ buttonRefresh.TabIndex = 6;
+ buttonRefresh.Text = "Обновить";
+ buttonRefresh.UseVisualStyleBackColor = true;
+ //
+ // buttonGoToCheck
+ //
+ buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonGoToCheck.Location = new Point(17, 378);
+ buttonGoToCheck.Name = "buttonGoToCheck";
+ buttonGoToCheck.Size = new Size(222, 51);
+ buttonGoToCheck.TabIndex = 5;
+ buttonGoToCheck.Text = "Передать на тесты";
+ buttonGoToCheck.UseVisualStyleBackColor = true;
+ buttonGoToCheck.Click += ButtonGoToCheck_Click;
+ //
+ // buttonDelBomber
+ //
+ buttonDelBomber.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonDelBomber.Location = new Point(17, 291);
+ buttonDelBomber.Name = "buttonDelBomber";
+ buttonDelBomber.Size = new Size(222, 51);
+ buttonDelBomber.TabIndex = 4;
+ buttonDelBomber.Text = "Удаление бомбардировщика";
+ buttonDelBomber.UseVisualStyleBackColor = true;
+ buttonDelBomber.Click += ButtonRemoveBomber_Click;
+ //
+ // maskedTextBox
+ //
+ maskedTextBox.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ maskedTextBox.Location = new Point(17, 258);
+ maskedTextBox.Mask = "00";
+ maskedTextBox.Name = "maskedTextBox";
+ maskedTextBox.Size = new Size(222, 27);
+ maskedTextBox.TabIndex = 3;
+ maskedTextBox.ValidatingType = typeof(int);
+ //
+ // buttonAddAirBomber
+ //
+ buttonAddAirBomber.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonAddAirBomber.Location = new Point(17, 153);
+ buttonAddAirBomber.Name = "buttonAddAirBomber";
+ buttonAddAirBomber.Size = new Size(222, 51);
+ buttonAddAirBomber.TabIndex = 2;
+ buttonAddAirBomber.Text = "Добавление воздушного бомбардировщика";
+ buttonAddAirBomber.UseVisualStyleBackColor = true;
+ buttonAddAirBomber.Click += ButtonAddAirBomber_Click;
+ //
+ // buttonAddBomber
+ //
+ buttonAddBomber.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonAddBomber.Location = new Point(17, 87);
+ buttonAddBomber.Name = "buttonAddBomber";
+ buttonAddBomber.Size = new Size(222, 51);
+ buttonAddBomber.TabIndex = 1;
+ buttonAddBomber.Text = "Добавление бомбардировщика";
+ buttonAddBomber.UseVisualStyleBackColor = true;
+ buttonAddBomber.Click += ButtonAddBomber_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(17, 26);
+ comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+ comboBoxSelectorCompany.Size = new Size(222, 28);
+ comboBoxSelectorCompany.TabIndex = 0;
+ comboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged;
+ //
+ // pictureBox1
+ //
+ pictureBox1.Dock = DockStyle.Fill;
+ pictureBox1.Location = new Point(0, 0);
+ pictureBox1.Name = "pictureBox1";
+ pictureBox1.Size = new Size(758, 560);
+ pictureBox1.TabIndex = 1;
+ pictureBox1.TabStop = false;
+ //
+ // FormBomberCollection
+ //
+ AutoScaleDimensions = new SizeF(8F, 20F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(1009, 560);
+ Controls.Add(pictureBox1);
+ Controls.Add(groupBoxTools);
+ Name = "FormBomberCollection";
+ Text = "Коллекция бомбардировщиков";
+ groupBoxTools.ResumeLayout(false);
+ groupBoxTools.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)pictureBox1).EndInit();
+ ResumeLayout(false);
+ }
+
+ #endregion
+
+ private GroupBox groupBoxTools;
+ private Button buttonAddBomber;
+ private ComboBox comboBoxSelectorCompany;
+ private Button buttonAddAirBomber;
+ private PictureBox pictureBox1;
+ private Button buttonDelBomber;
+ private MaskedTextBox maskedTextBox;
+ private Button buttonRefresh;
+ private Button buttonGoToCheck;
+ }
+}
\ No newline at end of file
diff --git a/ProjectAirBomber/ProjectAirBomber/FormBomberCollection.cs b/ProjectAirBomber/ProjectAirBomber/FormBomberCollection.cs
new file mode 100644
index 0000000..956c8af
--- /dev/null
+++ b/ProjectAirBomber/ProjectAirBomber/FormBomberCollection.cs
@@ -0,0 +1,196 @@
+using ProjectAirBomber.CollectionGenericObjects;
+using ProjectAirBomber.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ProjectAirBomber;
+
+///
+/// Форма работы с компанией и ее коллекцией
+///
+public partial class FormBomberCollection : Form
+{
+ ///
+ /// Компания
+ ///
+ private AbstractCompany? _company = null;
+
+ ///
+ /// конструктор
+ ///
+ public FormBomberCollection()
+ {
+ InitializeComponent();
+ }
+
+ ///
+ /// Выбор компании
+ ///
+ ///
+ ///
+ private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ switch (comboBoxSelectorCompany.Text)
+ {
+ case "Хранилище":
+ _company = new WarPlaneService(pictureBox1.Width, pictureBox1.Height, new MassiveGenericObjects());
+ break;
+ }
+ }
+ ///
+ /// Создание объекта класса-перемещения
+ ///
+ ///
+ private void CreateObject(string type)
+ {
+ if (_company == null)
+ {
+ return;
+ }
+ Random random = new();
+ DrawningBomber drawningBomber;
+ switch (type)
+ {
+ case nameof(DrawningBomber):
+ drawningBomber = new DrawningBomber(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
+ break;
+ case nameof(DrawningAirBomber):
+ drawningBomber = new DrawningAirBomber(random.Next(100, 300), random.Next(1000, 3000),
+ GetColor(random), GetColor(random),
+ Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+ break;
+ default:
+ return;
+ }
+
+ if (_company + drawningBomber != -1)
+ {
+ MessageBox.Show("Объект добавлен");
+ pictureBox1.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 ButtonAddAirBomber_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAirBomber));
+
+ ///
+ /// добавление грузовика
+ ///
+ ///
+ ///
+ private void ButtonAddBomber_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBomber));
+
+ ///
+ /// удаление объекта
+ ///
+ ///
+ ///
+ private void ButtonRemoveBomber_Click(object sender, EventArgs e)
+ {
+ if (string.IsNullOrEmpty(maskedTextBox.Text) || _company == null)
+ {
+ return;
+ }
+
+
+ if (MessageBox.Show("Удалить объект", "Удаление", MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes)
+ {
+ return;
+ }
+
+ int pos = Convert.ToInt32(maskedTextBox.Text);
+ if (_company - pos != null)
+ {
+ MessageBox.Show("Объект удален");
+ pictureBox1.Image = _company.Show();
+ }
+ else
+ {
+ MessageBox.Show("Не удалось удалить объект");
+ }
+ }
+
+ ///
+ /// Передача объекта в другую форму
+ ///
+ ///
+ ///
+ private void ButtonGoToCheck_Click(object sender, EventArgs e)
+ {
+ if (_company == null)
+ {
+ return;
+ }
+
+ DrawningBomber? bomber = null;
+ int counter = 100;
+
+ while (bomber == null)
+ {
+ bomber = _company.GetRandomObject();
+ counter--;
+ if (counter <= 0)
+ {
+ break;
+ }
+ }
+
+ if (bomber == null)
+ {
+ return;
+ }
+
+ FormAirBomber form = new()
+ {
+ SetBomber = bomber
+ };
+ form.ShowDialog();
+ }
+
+ ///
+ /// Перерисовка коллекции
+ ///
+ ///
+ ///
+ private void ButtonRefresh_Click(object sender, EventArgs e)
+ {
+ if (_company == null)
+ {
+ return;
+ }
+
+ pictureBox1.Image = _company.Show();
+ }
+
+}
diff --git a/ProjectAirBomber/ProjectAirBomber/FormBomberCollection.resx b/ProjectAirBomber/ProjectAirBomber/FormBomberCollection.resx
new file mode 100644
index 0000000..af32865
--- /dev/null
+++ b/ProjectAirBomber/ProjectAirBomber/FormBomberCollection.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/ProjectAirBomber/ProjectAirBomber/Program.cs b/ProjectAirBomber/ProjectAirBomber/Program.cs
index 7f59104..0a98864 100644
--- a/ProjectAirBomber/ProjectAirBomber/Program.cs
+++ b/ProjectAirBomber/ProjectAirBomber/Program.cs
@@ -11,7 +11,7 @@ namespace ProjectAirBomber
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
- Application.Run(new FormAirBomber());
+ Application.Run(new FormBomberCollection());
}
}
}
\ No newline at end of file