diff --git a/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/AbstractCompany.cs b/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/AbstractCompany.cs
new file mode 100644
index 0000000..86ce348
--- /dev/null
+++ b/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/AbstractCompany.cs
@@ -0,0 +1,116 @@
+using ProjectExcavator.Drawnings;
+
+namespace ProjectExcavator.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) + 1;
+
+ ///
+ /// Конструктор
+ ///
+ /// Ширина окна
+ /// Высота окна
+ /// Коллекция автомобилей
+ public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects collection)
+ {
+ _pictureWidth = picWidth;
+ _pictureHeight = picHeight;
+ _collection = collection;
+ _collection.SetMaxCount = GetMaxCount;
+ }
+
+ ///
+ /// Перегрузка оператора сложения для класса
+ ///
+ /// Компания
+ /// Добавляемый объект
+ ///
+ public static bool operator +(AbstractCompany company, DrawningBulldozer bulldozer)
+ {
+ return company._collection?.Insert(bulldozer) ?? false;
+ }
+
+ ///
+ /// Перегрузка оператора удаления для класса
+ ///
+ /// Компания
+ /// Номер удаляемого объекта
+ ///
+ public static bool operator -(AbstractCompany company, int position)
+ {
+ return company._collection?.Remove(position) ?? false;
+ }
+
+ ///
+ /// Получение случайного объекта из коллекции
+ ///
+ ///
+ public DrawningBulldozer? 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++)
+ {
+ DrawningBulldozer? obj = _collection?.Get(i);
+ obj?.DrawTransport(graphics);
+ }
+
+ return bitmap;
+ }
+
+ ///
+ /// Вывод фона
+ ///
+ ///
+ protected abstract void DrawBackground(Graphics g);
+
+ ///
+ /// Расстановка объектов
+ ///
+ protected abstract void SetObjectsPosition();
+}
diff --git a/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/BulldozerSharingService.cs b/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/BulldozerSharingService.cs
new file mode 100644
index 0000000..c9487e8
--- /dev/null
+++ b/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/BulldozerSharingService.cs
@@ -0,0 +1,55 @@
+
+using ProjectExcavator.Drawnings;
+
+namespace ProjectExcavator.CollectionGenericObjects;
+
+public class BulldozerSharingService : AbstractCompany
+{
+ public BulldozerSharingService(int picWidth, int picHeight, ICollectionGenericObjects collection) : base(picWidth, picHeight, collection)
+ {
+ }
+
+
+ protected override void DrawBackground(Graphics g)
+ {
+ Pen pen = new(Color.Black, 3);
+ for (int i = 0; i <= _pictureWidth / _placeSizeWidth; i++)
+ {
+ for (int j = 0; j <= _pictureHeight / _placeSizeHeight; j++)
+ {
+ g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, i * _placeSizeWidth + _placeSizeWidth / 2, j * _placeSizeHeight);
+ }
+ g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, _pictureHeight / _placeSizeHeight * _placeSizeHeight);
+ }
+ }
+
+ protected override void SetObjectsPosition()
+ {
+ int width = _pictureWidth / _placeSizeWidth;
+ int height = _pictureHeight / _placeSizeHeight;
+
+ int posWidth = width;
+ int posHeight = 0;
+
+ for (int i = 0; i < (_collection?.Count ?? 0); i++)
+ {
+ if (_collection?.Get(i) != null)
+ {
+ _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight);
+ _collection?.Get(i)?.SetPosition(_placeSizeWidth * posWidth + 4, posHeight * _placeSizeHeight + 4, width, height);
+ }
+
+ if (posWidth > 0)
+ posWidth--;
+ else
+ {
+ posWidth = width;
+ posHeight++;
+ }
+ if (posHeight > height)
+ {
+ return;
+ }
+ }
+ }
+}
diff --git a/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/ICollectionGenericObjects.cs
index 80576b6..8af06e7 100644
--- a/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/ICollectionGenericObjects.cs
+++ b/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/ICollectionGenericObjects.cs
@@ -37,7 +37,7 @@ public interface ICollectionGenericObjects
///
/// Позиция
/// true - удаление прошло успешно, false - удаление не удалось
- bool Remove(T position);
+ bool Remove(int position);
///
/// Получение объекта по позиции
diff --git a/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/MassiveGenericObjects.cs
index 6449375..d4b4179 100644
--- a/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/MassiveGenericObjects.cs
+++ b/ProjectExcavator/ProjectExcavator/CollectionGenericObjects/MassiveGenericObjects.cs
@@ -1,5 +1,9 @@
namespace ProjectExcavator.CollectionGenericObjects;
+///
+/// Параметризованный набор объектов
+///
+/// Параметр: ограничение - ссылочный тип
public class MassiveGenericObjects : ICollectionGenericObjects
where T : class
{
@@ -23,12 +27,26 @@ public class MassiveGenericObjects : ICollectionGenericObjects
public T? Get(int position)
{
// TODO проверка позиции
+ if (position >= _collection.Length || position < 0)
+ {
+ return null;
+ }
return _collection[position];
}
public bool Insert(T obj)
{
// TODO вставка в свободное место набора
+ int index = 0;
+ while (index < _collection.Length)
+ {
+ if (_collection[index] == null)
+ {
+ _collection[index] = obj;
+ return true;
+ }
+ index++;
+ }
return false;
}
@@ -39,13 +57,40 @@ public class MassiveGenericObjects : ICollectionGenericObjects
// ищется свободное место после этой позиции и идет вставка туда
// если нет после, ищем до
// TODO вставка
+ if (position >= _collection.Length || position < 0)
+ return false;
+
+ while (position + 1 < _collection.Length)
+ {
+ if (_collection[position] == null)
+ {
+ _collection[position] = obj;
+ return true;
+ }
+ position++;
+ }
+
+ while (position - 1 >= 0)
+ {
+ if (_collection[position] == null)
+ {
+ _collection[position] = obj;
+ return true;
+ }
+ position--;
+ }
return false;
}
- public bool Remove(T position)
+ public bool Remove(int position)
{
// TODO проверка позиции
// TODO удаление объекта из массива, присвоив элементу массива значение null
+ if (position >= _collection.Length || position < 0)
+ {
+ return false;
+ }
+ _collection[position] = null;
return true;
}
}
diff --git a/ProjectExcavator/ProjectExcavator/FormBulldozerCollection.Designer.cs b/ProjectExcavator/ProjectExcavator/FormBulldozerCollection.Designer.cs
new file mode 100644
index 0000000..007ec0d
--- /dev/null
+++ b/ProjectExcavator/ProjectExcavator/FormBulldozerCollection.Designer.cs
@@ -0,0 +1,173 @@
+namespace ProjectExcavator
+{
+ partial class FormBulldozerCollection
+ {
+ ///
+ /// 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();
+ buttonRemoveCar = new Button();
+ maskedTextBoxPosition = new MaskedTextBox();
+ buttonAddExcavator = new Button();
+ buttonAddBulldozer = 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(buttonRemoveCar);
+ groupBoxTools.Controls.Add(maskedTextBoxPosition);
+ groupBoxTools.Controls.Add(buttonAddExcavator);
+ groupBoxTools.Controls.Add(buttonAddBulldozer);
+ groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+ groupBoxTools.Dock = DockStyle.Right;
+ groupBoxTools.Location = new Point(774, 0);
+ groupBoxTools.Name = "groupBoxTools";
+ groupBoxTools.Size = new Size(187, 600);
+ groupBoxTools.TabIndex = 0;
+ groupBoxTools.TabStop = false;
+ groupBoxTools.Text = "Инструменты";
+ //
+ // buttonRefresh
+ //
+ buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonRefresh.Location = new Point(15, 493);
+ buttonRefresh.Name = "buttonRefresh";
+ buttonRefresh.Size = new Size(160, 42);
+ 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(15, 359);
+ buttonGoToCheck.Name = "buttonGoToCheck";
+ buttonGoToCheck.Size = new Size(160, 42);
+ buttonGoToCheck.TabIndex = 5;
+ buttonGoToCheck.Text = "Передать на тесты";
+ buttonGoToCheck.UseVisualStyleBackColor = true;
+ buttonGoToCheck.Click += ButtonGoToCheck_Click;
+ //
+ // buttonRemoveCar
+ //
+ buttonRemoveCar.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonRemoveCar.Location = new Point(15, 244);
+ buttonRemoveCar.Name = "buttonRemoveCar";
+ buttonRemoveCar.Size = new Size(160, 42);
+ buttonRemoveCar.TabIndex = 4;
+ buttonRemoveCar.Text = "Удалить автомобиль";
+ buttonRemoveCar.UseVisualStyleBackColor = true;
+ buttonRemoveCar.Click += ButtonRemoveCar_Click;
+ //
+ // maskedTextBoxPosition
+ //
+ maskedTextBoxPosition.Location = new Point(15, 215);
+ maskedTextBoxPosition.Mask = "00";
+ maskedTextBoxPosition.Name = "maskedTextBoxPosition";
+ maskedTextBoxPosition.Size = new Size(160, 23);
+ maskedTextBoxPosition.TabIndex = 3;
+ maskedTextBoxPosition.ValidatingType = typeof(int);
+ //
+ // buttonAddExcavator
+ //
+ buttonAddExcavator.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonAddExcavator.Location = new Point(15, 135);
+ buttonAddExcavator.Name = "buttonAddExcavator";
+ buttonAddExcavator.Size = new Size(160, 42);
+ buttonAddExcavator.TabIndex = 2;
+ buttonAddExcavator.Text = "Добавление экскаватора";
+ buttonAddExcavator.UseVisualStyleBackColor = true;
+ buttonAddExcavator.Click += ButtonAddExcavator_Click;
+ //
+ // buttonAddBulldozer
+ //
+ buttonAddBulldozer.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonAddBulldozer.Location = new Point(15, 87);
+ buttonAddBulldozer.Name = "buttonAddBulldozer";
+ buttonAddBulldozer.Size = new Size(160, 42);
+ buttonAddBulldozer.TabIndex = 1;
+ buttonAddBulldozer.Text = "Добавление бульдозера";
+ buttonAddBulldozer.UseVisualStyleBackColor = true;
+ buttonAddBulldozer.Click += ButtonAddBulldozer_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(15, 22);
+ comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+ comboBoxSelectorCompany.Size = new Size(160, 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(774, 600);
+ pictureBox.TabIndex = 1;
+ pictureBox.TabStop = false;
+ //
+ // FormBulldozerCollection
+ //
+ AutoScaleDimensions = new SizeF(7F, 15F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(961, 600);
+ Controls.Add(pictureBox);
+ Controls.Add(groupBoxTools);
+ Name = "FormBulldozerCollection";
+ 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 buttonAddExcavator;
+ private Button buttonAddBulldozer;
+ private PictureBox pictureBox;
+ private Button buttonRemoveCar;
+ private Button buttonRefresh;
+ private Button buttonGoToCheck;
+ }
+}
\ No newline at end of file
diff --git a/ProjectExcavator/ProjectExcavator/FormBulldozerCollection.cs b/ProjectExcavator/ProjectExcavator/FormBulldozerCollection.cs
new file mode 100644
index 0000000..6c4389e
--- /dev/null
+++ b/ProjectExcavator/ProjectExcavator/FormBulldozerCollection.cs
@@ -0,0 +1,169 @@
+using ProjectExcavator.CollectionGenericObjects;
+using ProjectExcavator.Drawnings;
+
+namespace ProjectExcavator;
+
+///
+/// Форма работы с компанией и ее коллекцией
+///
+public partial class FormBulldozerCollection : Form
+{
+ ///
+ /// Компания
+ ///
+ private AbstractCompany? _company = null;
+
+ ///
+ /// Конструктор
+ ///
+ public FormBulldozerCollection()
+ {
+ InitializeComponent();
+ }
+
+ ///
+ /// Выбор компании
+ ///
+ ///
+ ///
+ private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e)
+ {
+ switch (comboBoxSelectorCompany.Text)
+ {
+ case "Хранилище":
+ _company = new BulldozerSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects());
+ break;
+ }
+ }
+
+ ///
+ /// Добавление бульдозера
+ ///
+ ///
+ ///
+ private void ButtonAddBulldozer_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBulldozer));
+
+ ///
+ /// Добавление экскаватора
+ ///
+ ///
+ ///
+ private void ButtonAddExcavator_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningExcavator));
+
+ ///
+ /// Создание объекта класса-перемещения
+ ///
+ /// Тип создаваемого объекта
+ private void CreateObject(string type)
+ {
+ if (_company == null)
+ {
+ return;
+ }
+
+ Random random = new();
+ DrawningBulldozer drawningBulldozer;
+ switch (type)
+ {
+ case nameof(DrawningBulldozer):
+ drawningBulldozer = new DrawningBulldozer(random.Next(100, 300), random.Next(1000, 3000), GetColor(random));
+ break;
+ case nameof(DrawningExcavator):
+ drawningBulldozer = new DrawningExcavator(random.Next(100, 300), random.Next(1000, 3000),
+ GetColor(random),
+ GetColor(random),
+ Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(1, 2)));
+ break;
+ default:
+ return;
+ }
+
+ if (_company + drawningBulldozer)
+ {
+ 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 ButtonRemoveCar_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)
+ {
+ MessageBox.Show("Объект удален");
+ pictureBox.Image = _company.Show();
+ }
+ else
+ {
+ MessageBox.Show("Не удалось удалить объект");
+ }
+ }
+
+ private void ButtonGoToCheck_Click(object sender, EventArgs e)
+ {
+ if (_company == null)
+ {
+ return;
+ }
+
+ DrawningBulldozer? bulldozer = null;
+ int counter = 100;
+ while (bulldozer == null)
+ {
+ bulldozer = _company.GetRandomObject();
+ counter--;
+ if (counter <= 0)
+ {
+ break;
+ }
+ }
+
+ if (bulldozer == null)
+ {
+ return;
+ }
+
+ FormExcavator form = new()
+ {
+ SetBulldozer = bulldozer
+ };
+ form.ShowDialog();
+ }
+
+ private void ButtonRefresh_Click(object sender, EventArgs e)
+ {
+ if (_company == null)
+ {
+ return;
+ }
+
+
+ pictureBox.Image = _company.Show();
+ }
+}
diff --git a/ProjectExcavator/ProjectExcavator/FormBulldozerCollection.resx b/ProjectExcavator/ProjectExcavator/FormBulldozerCollection.resx
new file mode 100644
index 0000000..af32865
--- /dev/null
+++ b/ProjectExcavator/ProjectExcavator/FormBulldozerCollection.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/ProjectExcavator/ProjectExcavator/FormExcavator.Designer.cs b/ProjectExcavator/ProjectExcavator/FormExcavator.Designer.cs
index bf47ad7..dbe9b8e 100644
--- a/ProjectExcavator/ProjectExcavator/FormExcavator.Designer.cs
+++ b/ProjectExcavator/ProjectExcavator/FormExcavator.Designer.cs
@@ -29,12 +29,10 @@
private void InitializeComponent()
{
pictureBoxExcavator = new PictureBox();
- buttonCreateExcavator = new Button();
buttonLeft = new Button();
buttonRight = new Button();
buttonDown = new Button();
buttonUp = new Button();
- buttonCreateBulldozer = new Button();
comboBoxStrategy = new ComboBox();
buttonStrategyStep = new Button();
((System.ComponentModel.ISupportInitialize)pictureBoxExcavator).BeginInit();
@@ -48,18 +46,6 @@
pictureBoxExcavator.TabIndex = 0;
pictureBoxExcavator.TabStop = false;
//
- // buttonCreateExcavator
- //
- buttonCreateExcavator.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
- buttonCreateExcavator.BackColor = SystemColors.Control;
- buttonCreateExcavator.Location = new Point(12, 569);
- buttonCreateExcavator.Name = "buttonCreateExcavator";
- buttonCreateExcavator.Size = new Size(198, 23);
- buttonCreateExcavator.TabIndex = 1;
- buttonCreateExcavator.Text = "Создать экскаватор";
- buttonCreateExcavator.UseVisualStyleBackColor = false;
- buttonCreateExcavator.Click += ButtonCreateExcavator_Click;
- //
// buttonLeft
//
buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right;
@@ -108,18 +94,6 @@
buttonUp.UseVisualStyleBackColor = true;
buttonUp.Click += ButtonMove_Click;
//
- // buttonCreateBulldozer
- //
- buttonCreateBulldozer.Anchor = AnchorStyles.Bottom | AnchorStyles.Left;
- buttonCreateBulldozer.BackColor = SystemColors.Control;
- buttonCreateBulldozer.Location = new Point(225, 569);
- buttonCreateBulldozer.Name = "buttonCreateBulldozer";
- buttonCreateBulldozer.Size = new Size(198, 23);
- buttonCreateBulldozer.TabIndex = 6;
- buttonCreateBulldozer.Text = "Создать бульдозер";
- buttonCreateBulldozer.UseVisualStyleBackColor = false;
- buttonCreateBulldozer.Click += ButtonCreateBulldozer_Click;
- //
// comboBoxStrategy
//
comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList;
@@ -147,12 +121,10 @@
ClientSize = new Size(931, 604);
Controls.Add(buttonStrategyStep);
Controls.Add(comboBoxStrategy);
- Controls.Add(buttonCreateBulldozer);
Controls.Add(buttonUp);
Controls.Add(buttonDown);
Controls.Add(buttonRight);
Controls.Add(buttonLeft);
- Controls.Add(buttonCreateExcavator);
Controls.Add(pictureBoxExcavator);
Name = "FormExcavator";
Text = "Экскаватор";
@@ -163,12 +135,10 @@
#endregion
private PictureBox pictureBoxExcavator;
- private Button buttonCreateExcavator;
private Button buttonLeft;
private Button buttonRight;
private Button buttonDown;
private Button buttonUp;
- private Button buttonCreateBulldozer;
private ComboBox comboBoxStrategy;
private Button buttonStrategyStep;
}
diff --git a/ProjectExcavator/ProjectExcavator/FormExcavator.cs b/ProjectExcavator/ProjectExcavator/FormExcavator.cs
index 1b9b10f..69afcdd 100644
--- a/ProjectExcavator/ProjectExcavator/FormExcavator.cs
+++ b/ProjectExcavator/ProjectExcavator/FormExcavator.cs
@@ -15,6 +15,21 @@ public partial class FormExcavator : Form
///
private AbstractStrategy? _strategy;
+ ///
+ /// Получение объекта
+ ///
+ public DrawningBulldozer SetBulldozer
+ {
+ set
+ {
+ _drawningBulldozer = value;
+ _drawningBulldozer.SetPictureSize(pictureBoxExcavator.Width, pictureBoxExcavator.Height);
+ comboBoxStrategy.Enabled = true;
+ _strategy = null;
+ Draw();
+ }
+ }
+
///
/// Конструктор формы
///
@@ -40,48 +55,6 @@ public partial class FormExcavator : Form
pictureBoxExcavator.Image = bmp;
}
- ///
- /// Создание объекта класса-перемещения
- ///
- /// Тип создаваемого объекта
- private void CreateObject(string type)
- {
- Random random = new();
- switch (type)
- {
- case nameof(DrawningBulldozer):
- _drawningBulldozer = new DrawningBulldozer(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(DrawningExcavator):
- _drawningBulldozer = new DrawningExcavator(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;
- }
-
- _drawningBulldozer.SetPictureSize(pictureBoxExcavator.Width, pictureBoxExcavator.Height);
- _drawningBulldozer.SetPosition(random.Next(10, 100), random.Next(10, 100), pictureBoxExcavator.Width, pictureBoxExcavator.Height);
- _strategy = null;
- comboBoxStrategy.Enabled = true;
-
- Draw();
- }
-
- private void ButtonCreateExcavator_Click(object sender, EventArgs e)
- {
- CreateObject(nameof(DrawningExcavator));
- }
-
-
- private void ButtonCreateBulldozer_Click(object sender, EventArgs e)
- {
- CreateObject(nameof(DrawningBulldozer));
- }
-
private void ButtonMove_Click(object sender, EventArgs e)
{
if (_drawningBulldozer == null)
diff --git a/ProjectExcavator/ProjectExcavator/Program.cs b/ProjectExcavator/ProjectExcavator/Program.cs
index 59b8c54..90b02e5 100644
--- a/ProjectExcavator/ProjectExcavator/Program.cs
+++ b/ProjectExcavator/ProjectExcavator/Program.cs
@@ -11,7 +11,7 @@ namespace ProjectExcavator
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
- Application.Run(new FormExcavator());
+ Application.Run(new FormBulldozerCollection());
}
}
}
\ No newline at end of file