diff --git a/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneCollection.Designer.cs b/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneCollection.Designer.cs
new file mode 100644
index 0000000..8928c33
--- /dev/null
+++ b/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneCollection.Designer.cs
@@ -0,0 +1,173 @@
+namespace ProjectAirplaneWithRadar
+{
+ partial class FormAirplaneCollection
+ {
+ ///
+ /// 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();
+ buttonRemoveAirplane = new Button();
+ maskedTextBoxPosition = new MaskedTextBox();
+ buttonAddAirplaneWithRadar = new Button();
+ buttonAddAirplane = 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(buttonRemoveAirplane);
+ groupBoxTools.Controls.Add(maskedTextBoxPosition);
+ groupBoxTools.Controls.Add(buttonAddAirplaneWithRadar);
+ groupBoxTools.Controls.Add(buttonAddAirplane);
+ groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+ groupBoxTools.Dock = DockStyle.Right;
+ groupBoxTools.Location = new Point(883, 0);
+ groupBoxTools.Name = "groupBoxTools";
+ groupBoxTools.Size = new Size(206, 607);
+ groupBoxTools.TabIndex = 0;
+ groupBoxTools.TabStop = false;
+ groupBoxTools.Text = "Инструменты";
+ //
+ // buttonRefresh
+ //
+ buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonRefresh.Location = new Point(109, 513);
+ buttonRefresh.Name = "buttonRefresh";
+ buttonRefresh.Size = new Size(91, 56);
+ 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, 513);
+ buttonGoToCheck.Name = "buttonGoToCheck";
+ buttonGoToCheck.Size = new Size(91, 56);
+ buttonGoToCheck.TabIndex = 5;
+ buttonGoToCheck.Text = "Передать на тесты";
+ buttonGoToCheck.UseVisualStyleBackColor = true;
+ buttonGoToCheck.Click += buttonGoToCheck_Click;
+ //
+ // buttonRemoveAirplane
+ //
+ buttonRemoveAirplane.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonRemoveAirplane.Location = new Point(109, 204);
+ buttonRemoveAirplane.Name = "buttonRemoveAirplane";
+ buttonRemoveAirplane.Size = new Size(91, 43);
+ buttonRemoveAirplane.TabIndex = 4;
+ buttonRemoveAirplane.Text = "Удалить самолет";
+ buttonRemoveAirplane.UseVisualStyleBackColor = true;
+ buttonRemoveAirplane.Click += ButtonRemoveAirplane_Click;
+ //
+ // maskedTextBoxPosition
+ //
+ maskedTextBoxPosition.Location = new Point(6, 215);
+ maskedTextBoxPosition.Mask = "00";
+ maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+ maskedTextBoxPosition.Size = new Size(78, 23);
+ maskedTextBoxPosition.TabIndex = 3;
+ maskedTextBoxPosition.ValidatingType = typeof(int);
+ //
+ // buttonAddAirplaneWithRadar
+ //
+ buttonAddAirplaneWithRadar.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonAddAirplaneWithRadar.Location = new Point(109, 98);
+ buttonAddAirplaneWithRadar.Name = "buttonAddAirplaneWithRadar";
+ buttonAddAirplaneWithRadar.Size = new Size(91, 56);
+ buttonAddAirplaneWithRadar.TabIndex = 2;
+ buttonAddAirplaneWithRadar.Text = "Добавить самолет с радаром";
+ buttonAddAirplaneWithRadar.UseVisualStyleBackColor = true;
+ buttonAddAirplaneWithRadar.Click += ButtonAddAirplaneWithRadar_Click;
+ //
+ // buttonAddAirplane
+ //
+ buttonAddAirplane.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonAddAirplane.Location = new Point(6, 98);
+ buttonAddAirplane.Name = "buttonAddAirplane";
+ buttonAddAirplane.Size = new Size(91, 56);
+ buttonAddAirplane.TabIndex = 1;
+ buttonAddAirplane.Text = "Добавить самолет";
+ buttonAddAirplane.UseVisualStyleBackColor = true;
+ buttonAddAirplane.Click += ButtonAddAirplane_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(194, 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(883, 607);
+ pictureBox.TabIndex = 1;
+ pictureBox.TabStop = false;
+ //
+ // FormAirplaneCollection
+ //
+ AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(1089, 607);
+ Controls.Add(pictureBox);
+ Controls.Add(groupBoxTools);
+ Name = "FormAirplaneCollection";
+ Text = "Коллекция самолетов";
+ groupBoxTools.ResumeLayout(false);
+ groupBoxTools.PerformLayout();
+ ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit();
+ ResumeLayout(false);
+ }
+
+ #endregion
+
+ private GroupBox groupBoxTools;
+ private ComboBox comboBoxSelectorCompany;
+ private MaskedTextBox maskedTextBoxPosition;
+ private Button buttonAddAirplaneWithRadar;
+ private Button buttonAddAirplane;
+ private PictureBox pictureBox;
+ private Button buttonRefresh;
+ private Button buttonGoToCheck;
+ private Button buttonRemoveAirplane;
+ }
+}
\ No newline at end of file
diff --git a/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneCollection.cs b/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneCollection.cs
new file mode 100644
index 0000000..44d3655
--- /dev/null
+++ b/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneCollection.cs
@@ -0,0 +1,189 @@
+using ProjectAirplaneWithRadar.CollectionGenericObjects;
+using ProjectAirplaneWithRadar.Drawnings;
+
+namespace ProjectAirplaneWithRadar
+{
+ ///
+ /// Форма работы с компанией и ее коллекцией
+ ///
+ public partial class FormAirplaneCollection : Form
+ {
+ ///
+ /// Компания
+ ///
+ private AbstractCompany? _company = null;
+
+ ///
+ /// Конструктор
+ ///
+ public FormAirplaneCollection()
+ {
+ InitializeComponent();
+ }
+
+ ///
+ /// Выбор компании
+ ///
+ ///
+ ///
+ private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ switch (comboBoxSelectorCompany.Text)
+ {
+ case "Хранилище":
+ _company = new PlaneSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects());
+ break;
+ }
+ }
+
+ ///
+ /// Создание объекта класса-перемещения
+ ///
+ /// Тип создаваемого объекта
+ private void CreateObject(string type)
+ {
+ if (_company == null)
+ {
+ return;
+ }
+ Random random = new();
+ DrawningAirplane drawingAirplane;
+ switch (type)
+ {
+ case nameof(DrawningAirplane):
+ drawingAirplane = new DrawningAirplane(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
+ break;
+ case nameof(DrawingAirplaneWithRadar):
+ drawingAirplane = new DrawingAirplaneWithRadar(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 + drawingAirplane != -1)
+ {
+ 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 ButtonAddAirplane_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAirplane));
+
+ ///
+ /// Добавление самолета с радаром
+ ///
+ ///
+ ///
+ private void ButtonAddAirplaneWithRadar_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingAirplaneWithRadar));
+
+ ///
+ /// Удаление объекта
+ ///
+ ///
+ ///
+ private void ButtonRemoveAirplane_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;
+ }
+
+ DrawningAirplane? plane = null;
+ int counter = 100;
+ while (plane == null)
+ {
+ plane = _company.GetRandomObject();
+ counter--;
+ if (counter <= 0)
+ {
+ break;
+ }
+ }
+
+ if (plane == null)
+ {
+ return;
+ }
+
+ FormAirplaneWithRadar form = new()
+ {
+ SetAirplane = plane
+ };
+ form.ShowDialog();
+ }
+
+ ///
+ /// Перерисовка коллекции
+ ///
+ ///
+ ///
+ private void ButtonRefresh_Click(object sender, EventArgs e)
+ {
+ if (_company == null)
+ {
+ return;
+ }
+
+ pictureBox.Image = _company.Show();
+ }
+ }
+}
\ No newline at end of file
diff --git a/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneCollection.resx b/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneCollection.resx
new file mode 100644
index 0000000..af32865
--- /dev/null
+++ b/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneCollection.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/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneWithRadar.Designer.cs b/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneWithRadar.Designer.cs
index b3c9650..6f6c098 100644
--- a/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneWithRadar.Designer.cs
+++ b/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneWithRadar.Designer.cs
@@ -29,12 +29,10 @@
private void InitializeComponent()
{
pictureBoxAirplaneWithRadar = new PictureBox();
- buttonCreate = new Button();
buttonLeft = new Button();
buttonRight = new Button();
buttonDown = new Button();
buttonUp = new Button();
- ButtonCreateAirplane = new Button();
comboBoxStrategy = new ComboBox();
buttonStrategyStep = new Button();
((System.ComponentModel.ISupportInitialize)pictureBoxAirplaneWithRadar).BeginInit();
@@ -49,17 +47,6 @@
pictureBoxAirplaneWithRadar.TabIndex = 0;
pictureBoxAirplaneWithRadar.TabStop = false;
//
- // buttonCreate
- //
- buttonCreate.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
- buttonCreate.Location = new Point(12, 442);
- buttonCreate.Name = "buttonCreate";
- buttonCreate.Size = new Size(199, 23);
- buttonCreate.TabIndex = 1;
- buttonCreate.Text = "Создать Самолет с радаром";
- buttonCreate.UseVisualStyleBackColor = true;
- buttonCreate.Click += ButtonCreate_Click;
- //
// buttonLeft
//
buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
@@ -108,17 +95,6 @@
buttonUp.UseVisualStyleBackColor = true;
buttonUp.Click += ButtonMove_Click;
//
- // ButtonCreateAirplane
- //
- ButtonCreateAirplane.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
- ButtonCreateAirplane.Location = new Point(230, 442);
- ButtonCreateAirplane.Name = "ButtonCreateAirplane";
- ButtonCreateAirplane.Size = new Size(199, 23);
- ButtonCreateAirplane.TabIndex = 6;
- ButtonCreateAirplane.Text = "Создать Самолет";
- ButtonCreateAirplane.UseVisualStyleBackColor = true;
- ButtonCreateAirplane.Click += ButtonCreateAirplane_Click;
- //
// comboBoxStrategy
//
comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
@@ -146,12 +122,10 @@
ClientSize = new Size(987, 477);
Controls.Add(buttonStrategyStep);
Controls.Add(comboBoxStrategy);
- Controls.Add(ButtonCreateAirplane);
Controls.Add(buttonUp);
Controls.Add(buttonDown);
Controls.Add(buttonRight);
Controls.Add(buttonLeft);
- Controls.Add(buttonCreate);
Controls.Add(pictureBoxAirplaneWithRadar);
Name = "FormAirplaneWithRadar";
Text = "Самолет с радаром";
@@ -162,12 +136,10 @@
#endregion
private PictureBox pictureBoxAirplaneWithRadar;
- private Button buttonCreate;
private Button buttonLeft;
private Button buttonRight;
private Button buttonDown;
private Button buttonUp;
- private Button ButtonCreateAirplane;
private ComboBox comboBoxStrategy;
private Button buttonStrategyStep;
}
diff --git a/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneWithRadar.cs b/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneWithRadar.cs
index 8fb250b..476d4c1 100644
--- a/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneWithRadar.cs
+++ b/AirplaneWithRadar/ProjectAirplaneWithRadar/FormAirplaneWithRadar.cs
@@ -18,6 +18,18 @@ namespace ProjectAirplaneWithRadar
///
private AbstractStrategy? _strategy;
+ public DrawningAirplane SetAirplane
+ {
+ set
+ {
+ _drawingAirplane = value;
+ _drawingAirplane.SetPictureSize(pictureBoxAirplaneWithRadar.Width, pictureBoxAirplaneWithRadar.Height);
+ comboBoxStrategy.Enabled = true;
+ _strategy = null;
+ UpdatePlane();
+ }
+ }
+
///
/// Конструктор формы
///
@@ -27,52 +39,6 @@ namespace ProjectAirplaneWithRadar
_strategy = null;
}
- ///
- /// Создание объекта класса-перемещения
- ///
- /// Тип создаваемого объекта
- private void CreateObject(string type)
- {
- Random random = new();
- switch (type)
- {
- case nameof(DrawningAirplane):
- _drawingAirplane = new DrawningAirplane(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(DrawingAirplaneWithRadar):
- _drawingAirplane = new DrawingAirplaneWithRadar(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;
-
- }
-
- _drawingAirplane.SetPictureSize(pictureBoxAirplaneWithRadar.Width, pictureBoxAirplaneWithRadar.Height);
- _drawingAirplane.SetPosition(random.Next(10, 100), random.Next(10, 100));
-
- _strategy = null;
- comboBoxStrategy.Enabled = true;
- UpdatePlane();
- }
-
- ///
- /// Обработка нажатия кнопки "Создать Самолет с радаром"
- ///
- ///
- ///
- private void ButtonCreate_Click(object sender, EventArgs e) => CreateObject(nameof(DrawingAirplaneWithRadar));
-
- ///
- /// Обработка нажатия кнопки "Создать Самолет"
- ///
- ///
- ///
- private void ButtonCreateAirplane_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningAirplane));
-
///
/// Метод прорисовки самолета
///
diff --git a/AirplaneWithRadar/ProjectAirplaneWithRadar/Program.cs b/AirplaneWithRadar/ProjectAirplaneWithRadar/Program.cs
index 3ed1af4..42c6dca 100644
--- a/AirplaneWithRadar/ProjectAirplaneWithRadar/Program.cs
+++ b/AirplaneWithRadar/ProjectAirplaneWithRadar/Program.cs
@@ -11,7 +11,7 @@ namespace ProjectAirplaneWithRadar
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
- Application.Run(new FormAirplaneWithRadar());
+ Application.Run(new FormAirplaneCollection());
}
}
}
\ No newline at end of file