diff --git a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/AbstractCompany.cs b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/AbstractCompany.cs
new file mode 100644
index 0000000..383d382
--- /dev/null
+++ b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/AbstractCompany.cs
@@ -0,0 +1,121 @@
+using ProjectBulldozer.Drawnings;
+using ProjectBulldozer.MovementStrategy;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace ProjectBulldozer.CollectionGenericObjects;
+
+///
+/// Абстракция компании, хранящий коллецию автомобилей
+///
+public abstract class AbstractCompany
+{
+ ///
+ /// Размер места (ширина)
+ ///
+ protected readonly int _placeSizeWidth = 210;
+
+ ///
+ /// Размер места (высота)
+ ///
+ protected readonly int _placeSizeHeight = 80;
+
+ ///
+ /// Ширина окна
+ ///
+ protected readonly int _pictureWidth;
+
+ ///
+ /// Высота окна
+ ///
+ protected readonly int _pictureHeight;
+
+ ///
+ /// Коллекция автомобилей
+ ///
+ protected ICollectoinGenericObjects? _collection = null;
+
+ ///
+ /// Вычисление максимального количества элементов, который можно разместить в окне
+ ///
+ private int GetMaxCount => _pictureWidth * _pictureHeight / (_placeSizeWidth * _placeSizeHeight);
+
+ ///
+ /// Конструктор
+ ///
+ /// Ширина окна
+ /// Высота окна
+ /// Коллекция автомобилей
+ public AbstractCompany(int picWidth, int picHeight, ICollectoinGenericObjects collectoin)
+ {
+ _pictureWidth = picWidth;
+ _pictureHeight = picHeight;
+ _collection = collectoin;
+ _collection.SetMaxCount = GetMaxCount;
+ }
+
+ ///
+ /// Перегрузка оператора сложения для класса
+ ///
+ /// Компания
+ /// Добавляемый объект
+ ///
+ public static bool operator +(AbstractCompany company, DrawningDozer dozer)
+ {
+ return company._collection?.Insert(dozer) ?? false;
+ }
+
+ ///
+ /// Перегрузка оператора удаления для класса
+ ///
+ /// Компания
+ /// Номер удаляемого объекта
+ ///
+ public static bool operator -(AbstractCompany company, int position)
+ {
+ return company._collection?.Remove(position) ?? false;
+ }
+
+ ///
+ /// Получение случайного объекта из коллекции
+ ///
+ ///
+ public DrawningDozer? 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++) {
+ DrawningDozer? obj = _collection?.Get(i);
+ obj?.DrawTransport(graphics);
+ }
+
+ return bitmap;
+ }
+
+ ///
+ /// Вывод заднего фона
+ ///
+ ///
+ protected abstract void DrawBackground(Graphics g);
+
+ ///
+ /// Расстановка объектов
+ ///
+ protected abstract void SetObjectsPosition();
+}
diff --git a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/CarSharingService.cs b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/CarSharingService.cs
new file mode 100644
index 0000000..124236c
--- /dev/null
+++ b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/CarSharingService.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using ProjectBulldozer.Drawnings;
+
+namespace ProjectBulldozer.CollectionGenericObjects;
+
+///
+/// Реализация абстрактной компании
+///
+public class CarSharingService : AbstractCompany
+{
+ ///
+ /// Конструктор
+ ///
+ ///
+ ///
+ ///
+ public CarSharingService(int picWidth, int picHeight, ICollectoinGenericObjects collectoin) : base(picWidth, picHeight, collectoin)
+ {
+
+ }
+
+ protected override void DrawBackground(Graphics g)
+ {
+ throw new NotImplementedException();
+ }
+
+ protected override void SetObjectsPosition()
+ {
+ throw new NotImplementedException();
+ }
+}
diff --git a/ProjectBulldozer/ProjectBulldozer/FormBulldozer.cs b/ProjectBulldozer/ProjectBulldozer/FormBulldozer.cs
index 2b776ba..27f7b57 100644
--- a/ProjectBulldozer/ProjectBulldozer/FormBulldozer.cs
+++ b/ProjectBulldozer/ProjectBulldozer/FormBulldozer.cs
@@ -28,6 +28,21 @@ public partial class FormBulldozer : Form
///
private AbstractStrategy? _strategy;
+ ///
+ /// Получение объекта
+ ///
+ public DrawningDozer SetCar
+ {
+ set
+ {
+ _drawningDozer = value;
+ _drawningDozer.SetPictureSize(pictureBoxBulldozer.Width, pictureBoxBulldozer.Height);
+ comboBoxStrategy.Enabled = true;
+ _strategy = null;
+ Draw();
+ }
+ }
+
///
/// Конструктор формы
///
@@ -53,7 +68,7 @@ public partial class FormBulldozer : Form
pictureBoxBulldozer.Image = bmp;
}
- ///
+ /*///
/// Создание объекта класса-перемещения
///
/// Тип создаваемого объекта
@@ -99,6 +114,7 @@ public partial class FormBulldozer : Form
///
private void ButtonCreateDozer_Click(object sender, EventArgs e) =>
CreateObject(nameof(DrawningDozer));
+*/
///
/// Перемещение объекта по форме (нажатие кнопок навигации)
@@ -135,7 +151,11 @@ public partial class FormBulldozer : Form
}
}
-
+ ///
+ /// Обработка нажатия кнопки "Шаг"
+ ///
+ ///
+ ///
private void ButtonStrategyStep_Click(object sender, EventArgs e)
{
if (_drawningDozer == null)
@@ -178,5 +198,3 @@ public partial class FormBulldozer : Form
}
}
}
-
-//2
diff --git a/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.Designer.cs b/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.Designer.cs
new file mode 100644
index 0000000..846c232
--- /dev/null
+++ b/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.Designer.cs
@@ -0,0 +1,175 @@
+namespace ProjectBulldozer
+{
+ 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();
+ maskedTextBox = new MaskedTextBox();
+ buttonRefresh = new Button();
+ buttonGoToCheck = new Button();
+ buttonDelBulldozer = new Button();
+ buttonAddBulldozer = new Button();
+ buttonAddDozer = new Button();
+ comboBoxSelectorCompany = new ComboBox();
+ pictureBox = new PictureBox();
+ groupBoxTools.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit();
+ SuspendLayout();
+ //
+ // groupBoxTools
+ //
+ groupBoxTools.Controls.Add(maskedTextBox);
+ groupBoxTools.Controls.Add(buttonRefresh);
+ groupBoxTools.Controls.Add(buttonGoToCheck);
+ groupBoxTools.Controls.Add(buttonDelBulldozer);
+ groupBoxTools.Controls.Add(buttonAddBulldozer);
+ groupBoxTools.Controls.Add(buttonAddDozer);
+ groupBoxTools.Controls.Add(comboBoxSelectorCompany);
+ groupBoxTools.Dock = DockStyle.Right;
+ groupBoxTools.Location = new Point(1290, 0);
+ groupBoxTools.Name = "groupBoxTools";
+ groupBoxTools.Size = new Size(358, 914);
+ groupBoxTools.TabIndex = 0;
+ groupBoxTools.TabStop = false;
+ groupBoxTools.Text = "Инструменты";
+ //
+ // maskedTextBox
+ //
+ maskedTextBox.Location = new Point(14, 340);
+ maskedTextBox.Name = "maskedTextBox";
+ maskedTextBox.Size = new Size(332, 39);
+ maskedTextBox.TabIndex = 5;
+ maskedTextBox.ValidatingType = typeof(int);
+ //
+ // buttonRefresh
+ //
+ buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonRefresh.Font = new Font("Comic Sans MS", 9F, FontStyle.Regular, GraphicsUnit.Point);
+ buttonRefresh.Location = new Point(14, 719);
+ buttonRefresh.Name = "buttonRefresh";
+ buttonRefresh.Size = new Size(332, 63);
+ buttonRefresh.TabIndex = 3;
+ buttonRefresh.Text = "Обновить";
+ buttonRefresh.UseVisualStyleBackColor = true;
+ //
+ // buttonGoToCheck
+ //
+ buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonGoToCheck.Font = new Font("Comic Sans MS", 9F, FontStyle.Regular, GraphicsUnit.Point);
+ buttonGoToCheck.Location = new Point(14, 520);
+ buttonGoToCheck.Name = "buttonGoToCheck";
+ buttonGoToCheck.Size = new Size(332, 63);
+ buttonGoToCheck.TabIndex = 3;
+ buttonGoToCheck.Text = "Передать на тесты";
+ buttonGoToCheck.UseVisualStyleBackColor = true;
+ buttonGoToCheck.Click += ButtonGoToCheck_Click;
+ //
+ // buttonDelBulldozer
+ //
+ buttonDelBulldozer.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonDelBulldozer.Font = new Font("Comic Sans MS", 9F, FontStyle.Regular, GraphicsUnit.Point);
+ buttonDelBulldozer.Location = new Point(14, 385);
+ buttonDelBulldozer.Name = "buttonDelBulldozer";
+ buttonDelBulldozer.Size = new Size(332, 63);
+ buttonDelBulldozer.TabIndex = 3;
+ buttonDelBulldozer.Text = "Удаленить бульдозер";
+ buttonDelBulldozer.UseVisualStyleBackColor = true;
+ buttonDelBulldozer.Click += ButtonDelBulldozer_Click;
+ //
+ // buttonAddBulldozer
+ //
+ buttonAddBulldozer.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonAddBulldozer.Font = new Font("Comic Sans MS", 9F, FontStyle.Regular, GraphicsUnit.Point);
+ buttonAddBulldozer.Location = new Point(14, 210);
+ buttonAddBulldozer.Name = "buttonAddBulldozer";
+ buttonAddBulldozer.Size = new Size(332, 79);
+ buttonAddBulldozer.TabIndex = 3;
+ buttonAddBulldozer.Text = "Добавление крутого бульдозера";
+ buttonAddBulldozer.UseVisualStyleBackColor = true;
+ buttonAddBulldozer.Click += ButtonAddBulldozer_Click;
+ //
+ // buttonAddDozer
+ //
+ buttonAddDozer.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ buttonAddDozer.Font = new Font("Comic Sans MS", 9F, FontStyle.Regular, GraphicsUnit.Point);
+ buttonAddDozer.Location = new Point(14, 140);
+ buttonAddDozer.Name = "buttonAddDozer";
+ buttonAddDozer.Size = new Size(332, 64);
+ buttonAddDozer.TabIndex = 2;
+ buttonAddDozer.Text = "Добавление бульдозера";
+ buttonAddDozer.UseVisualStyleBackColor = true;
+ buttonAddDozer.Click += ButtonAddDozer_Click;
+ //
+ // comboBoxSelectorCompany
+ //
+ comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right;
+ comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList;
+ comboBoxSelectorCompany.Font = new Font("Comic Sans MS", 9F, FontStyle.Regular, GraphicsUnit.Point);
+ comboBoxSelectorCompany.FormattingEnabled = true;
+ comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" });
+ comboBoxSelectorCompany.Location = new Point(14, 52);
+ comboBoxSelectorCompany.Name = "comboBoxSelectorCompany";
+ comboBoxSelectorCompany.Size = new Size(332, 41);
+ comboBoxSelectorCompany.TabIndex = 1;
+ //
+ // pictureBox
+ //
+ pictureBox.Location = new Point(12, 12);
+ pictureBox.Name = "pictureBox";
+ pictureBox.Size = new Size(1272, 890);
+ pictureBox.TabIndex = 4;
+ pictureBox.TabStop = false;
+ //
+ // FormBulldozerCollection
+ //
+ AutoScaleDimensions = new SizeF(13F, 32F);
+ AutoScaleMode = AutoScaleMode.Font;
+ ClientSize = new Size(1648, 914);
+ 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 Button buttonAddDozer;
+ private Button buttonAddBulldozer;
+ private PictureBox pictureBox;
+ private MaskedTextBox maskedTextBox;
+ private Button buttonDelBulldozer;
+ private Button buttonRefresh;
+ private Button buttonGoToCheck;
+ }
+}
\ No newline at end of file
diff --git a/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.cs b/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.cs
new file mode 100644
index 0000000..9caa62f
--- /dev/null
+++ b/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.cs
@@ -0,0 +1,207 @@
+using ProjectBulldozer.CollectionGenericObjects;
+using ProjectBulldozer.Drawnings;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace ProjectBulldozer;
+
+///
+/// Форма работы с компанией и её коллекцией
+///
+public partial class FormBulldozerCollection : Form
+{
+ ///
+ /// Компания
+ ///
+ private AbstractCompany? _company = null;
+
+ ///
+ /// Конструктор
+ ///
+ public FormBulldozerCollection()
+ {
+ InitializeComponent();
+ }
+
+ ///
+ /// Выбор компании
+ ///
+ ///
+ ///
+ private void ComboBoxSelectorCompany_SelectedIndexChanget(object sender, EventArgs e)
+ {
+ switch (comboBoxSelectorCompany.Text)
+ {
+ case "Хранилище":
+ _company = new CarSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObject());
+ break;
+ }
+ }
+
+ ///
+ /// Добавление обычного бульдозера
+ ///
+ ///
+ ///
+ private void ButtonAddDozer_Click(object sender, EventArgs e) =>
+ CreateObject(nameof(DrawningDozer));
+
+ ///
+ /// Добавление крутого бульдозера
+ ///
+ ///
+ ///
+ private void ButtonAddBulldozer_Click(object sender, EventArgs e) =>
+ CreateObject(nameof(DrawningBulldozer));
+
+ ///
+ /// Создание объекта класса-перемещения
+ ///
+ /// Тип создаваемого объекта
+ private void CreateObject(string type)
+ {
+ if (_company == null)
+ {
+ return;
+ }
+
+ Random random = new();
+ DrawningDozer drawningDozer;
+ switch (type)
+ {
+ case nameof(DrawningDozer):
+ drawningDozer = new DrawningDozer(random.Next(100, 300), random.Next(1000, 3000),
+ GetBodyColor(random), Color.FromArgb(random.Next(30, 120), random.Next(30, 120), random.Next(30, 120)));
+ break;
+ case nameof(DrawningBulldozer):
+ //TODO вызов диалогового окна для выбора цвета
+ drawningDozer = new DrawningBulldozer(random.Next(100, 300), random.Next(1000, 3000),
+ Color.FromArgb(random.Next(170, 256), random.Next(170, 256), random.Next(30, 140)),
+ Color.FromArgb(random.Next(30, 120), random.Next(30, 120), random.Next(30, 120)),
+ Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2)));
+ break;
+ default:
+ return;
+ }
+
+ if (_company + drawningDozer)
+ {
+ MessageBox.Show("Объект добавлен.");
+ pictureBox.Image = _company.Show();
+ }
+ else
+ {
+ MessageBox.Show("Не удалось добавить объект...");
+ }
+ /*
+ _drawningDozer.SetPictureSize(pictureBoxBulldozer.Width, pictureBoxBulldozer.Height);
+ _drawningDozer.SetPosition(random.Next(10, 100), random.Next(10, 100));
+ _strategy = null;
+ comboBoxStrategy.Enabled = true;
+ Draw();*/
+ }
+
+ ///
+ /// Получение цвета самого бульдозера
+ ///
+ /// Генератор случайных чисел
+ ///
+ private static Color GetBodyColor(Random random)
+ {
+ Color color = Color.FromArgb(random.Next(170, 256), random.Next(170, 256), random.Next(30, 140));
+ ColorDialog dialog = new();
+ if (dialog.ShowDialog() == DialogResult.OK)
+ {
+ color = dialog.Color;
+ }
+ return color;
+ }
+
+ ///
+ /// Удаление объекта
+ ///
+ ///
+ ///
+ private void ButtonDelBulldozer_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)
+ {
+ MessageBox.Show("Объект удалён.");
+ pictureBox.Image = _company.Show();
+ }
+ else
+ {
+ MessageBox.Show("Не удалось удалить объект...");
+ }
+ }
+
+ ///
+ /// Передача объека в другую форму
+ ///
+ ///
+ ///
+ private void ButtonGoToCheck_Click(object sender, EventArgs e)
+ {
+ if (_company == null)
+ {
+ return;
+ }
+
+ DrawningDozer? dozer = null;
+ int counter = 100;
+ while (dozer == null)
+ {
+ dozer = _company.GetRandomObject();
+ counter--;
+ if (counter <= 0)
+ {
+ break;
+ }
+ }
+
+ if (dozer == null)
+ {
+ return;
+ }
+
+ FormBulldozer form = new()
+ {
+ SetCar = dozer
+ };
+ form.ShowDialog();
+ }
+
+ ///
+ /// Прорисовка коллекции
+ ///
+ ///
+ ///
+ private void ButtonRefresh_Click(object sender, EventArgs e)
+ {
+ if(_company == null)
+ {
+ return;
+ }
+
+ pictureBox.Image = _company.Show();
+ }
+}
diff --git a/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.resx b/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.resx
new file mode 100644
index 0000000..af32865
--- /dev/null
+++ b/ProjectBulldozer/ProjectBulldozer/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/ProjectBulldozer/ProjectBulldozer/Program.cs b/ProjectBulldozer/ProjectBulldozer/Program.cs
index ce4d1f0..5cad856 100644
--- a/ProjectBulldozer/ProjectBulldozer/Program.cs
+++ b/ProjectBulldozer/ProjectBulldozer/Program.cs
@@ -11,7 +11,7 @@ namespace ProjectBulldozer
// To customize application configuration such as set high DPI settings or default font,
// see https://aka.ms/applicationconfiguration.
ApplicationConfiguration.Initialize();
- Application.Run(new FormBulldozer());
+ Application.Run(new FormBulldozerCollection());
}
}
}
\ No newline at end of file