From 870c31e157f7bc2580dee74ae6fce970e11d60df Mon Sep 17 00:00:00 2001 From: MariaBelkina <89656988623@mail.ru> Date: Sat, 6 Apr 2024 12:27:28 +0400 Subject: [PATCH 1/6] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=D0=B0=D1=86=D0=B8?= =?UTF-8?q?=D1=8F=20=D1=82=D1=80=D0=B5=D1=82=D1=8C=D0=B5=D0=B9=20=D0=BB?= =?UTF-8?q?=D0=B0=D0=B1=D1=8B=20=D0=BD=D0=B0=20=D0=B2=D1=81=D1=8F=D0=BA?= =?UTF-8?q?=D0=B8=D0=B9=20=D1=81=D0=BB=D1=83=D1=87=D0=B0=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ICollectoinGenericObjects.cs | 54 +++++++++++++++ .../MassiveGenericObject.cs | 69 +++++++++++++++++++ 2 files changed, 123 insertions(+) create mode 100644 ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/ICollectoinGenericObjects.cs create mode 100644 ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/MassiveGenericObject.cs diff --git a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/ICollectoinGenericObjects.cs b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/ICollectoinGenericObjects.cs new file mode 100644 index 0000000..be6c0e0 --- /dev/null +++ b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/ICollectoinGenericObjects.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectBulldozer.CollectionGenericObjects; + +/// +/// Интерфейс описания действий для набора хранимых объектов +/// +/// Параметр: ограничение - ссылочный тип +public interface ICollectoinGenericObjects + where T : class +{ + /// + /// Колличество объектов в коллекции + /// + int Count { get; } + + /// + /// Установка максимального колличества элементов + /// + int SetMaxCount { set; } + + /// + /// Добавление элемента в коллекцию + /// + /// Добавляемый объект + /// true - вставка прошла удачно, false - вставка не удалась + bool Insert(T obj); + + /// + /// Добавление объекта в коллекцию на конкретную позицию + /// + /// Добавляемый объект + /// Позиция + /// true - вставка прошла удачно, false - вставка не удалась + bool Insert(T obj, int position); + + /// + /// Удаление объекта из коллекции на конкретной позиции + /// + /// Позиция + /// + bool Remove(int position); + + /// + /// Получение объекта по позиции + /// + /// Позиция + /// Объект + T? Get(int position); +} diff --git a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/MassiveGenericObject.cs b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/MassiveGenericObject.cs new file mode 100644 index 0000000..57b2d03 --- /dev/null +++ b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/MassiveGenericObject.cs @@ -0,0 +1,69 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectBulldozer.CollectionGenericObjects; + +public class MassiveGenericObject : ICollectoinGenericObjects + where T : class +{ + /// + /// Массив объектов, который храним + /// + private T?[] _collection; + + public int Count => _collection.Length; + + public int SetMaxCount + { + set + { + if (value > 0) + { + Array.Resize(ref _collection, value); + } + else + { + _collection =new T?[value]; + } + } + } + + /// + /// Конструктор + /// + public MassiveGenericObject() + { + _collection = Array.Empty(); + } + + public T? Get(int position) + { + //TODO проверка позиции + return _collection[position]; + } + + public bool Insert(T obj) + { + //TODO вставка в свободное место набора + return false; + } + + public bool Insert(T obj, int position) + { + //TODO Проверка позиции + //TODO проверка, что элемент массива по этой позиции пустой, если нет, то ищется свободное место после этой + //позиции и идёт вставка туда, если нет после, ищем до + //TODO вставка + return false; + } + + public bool Remove(int position) + { + //TODO проверка позиции + //TODO удаление объекта из массива, присвоив элементу массива значение null + return true; + } +} -- 2.25.1 From 2dd9a71e1f7a6a4246195edf0f414270db211773 Mon Sep 17 00:00:00 2001 From: MariaBelkina <89656988623@mail.ru> Date: Tue, 9 Apr 2024 10:26:55 +0400 Subject: [PATCH 2/6] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=B0=203=20=D0=B1=D0=B5?= =?UTF-8?q?=D0=B7=20TODO?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbstractCompany.cs | 121 ++++++++++ .../CarSharingService.cs | 35 +++ .../ProjectBulldozer/FormBulldozer.cs | 26 ++- .../FormBulldozerCollection.Designer.cs | 175 +++++++++++++++ .../FormBulldozerCollection.cs | 207 ++++++++++++++++++ .../FormBulldozerCollection.resx | 120 ++++++++++ ProjectBulldozer/ProjectBulldozer/Program.cs | 2 +- 7 files changed, 681 insertions(+), 5 deletions(-) create mode 100644 ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/AbstractCompany.cs create mode 100644 ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/CarSharingService.cs create mode 100644 ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.Designer.cs create mode 100644 ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.cs create mode 100644 ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.resx 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 -- 2.25.1 From 614075b569eb053323b0c37efc616581e94af607 Mon Sep 17 00:00:00 2001 From: MariaBelkina <89656988623@mail.ru> Date: Fri, 12 Apr 2024 22:19:35 +0400 Subject: [PATCH 3/6] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=B0=203,=20=D0=BF?= =?UTF-8?q?=D0=B5=D1=80=D0=B5=D0=B4=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B5?= =?UTF-8?q?=D1=81=D0=B5=D0=BD=D0=B8=D0=B5=D0=BC=20=D0=B4=D0=BE=D0=BF=20?= =?UTF-8?q?=D1=86=D0=B2=D0=B5=D1=82=D0=B0=20=D0=B2=20=D0=BA=D1=80=D1=83?= =?UTF-8?q?=D1=82=D0=BE=D0=B9=20=D0=B1=D1=83=D0=BB=D1=8C=D0=B4=D0=BE=D0=B7?= =?UTF-8?q?=D0=B5=D1=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbstractCompany.cs | 4 +- .../CarSharingService.cs | 35 -------- .../CollectionGenericObjects/Garage.cs | 84 +++++++++++++++++++ .../MassiveGenericObject.cs | 78 +++++++++++++++-- .../FormBulldozer.Designer.cs | 30 ------- .../FormBulldozerCollection.Designer.cs | 2 + .../FormBulldozerCollection.cs | 22 +++-- 7 files changed, 170 insertions(+), 85 deletions(-) delete mode 100644 ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/CarSharingService.cs create mode 100644 ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/Garage.cs diff --git a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/AbstractCompany.cs b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/AbstractCompany.cs index 383d382..302c514 100644 --- a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/AbstractCompany.cs +++ b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/AbstractCompany.cs @@ -16,12 +16,12 @@ public abstract class AbstractCompany /// /// Размер места (ширина) /// - protected readonly int _placeSizeWidth = 210; + protected readonly int _placeSizeWidth = 190; /// /// Размер места (высота) /// - protected readonly int _placeSizeHeight = 80; + protected readonly int _placeSizeHeight = 130; /// /// Ширина окна diff --git a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/CarSharingService.cs b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/CarSharingService.cs deleted file mode 100644 index 124236c..0000000 --- a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/CarSharingService.cs +++ /dev/null @@ -1,35 +0,0 @@ -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/CollectionGenericObjects/Garage.cs b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/Garage.cs new file mode 100644 index 0000000..8583f11 --- /dev/null +++ b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/Garage.cs @@ -0,0 +1,84 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ProjectBulldozer.Drawnings; + +namespace ProjectBulldozer.CollectionGenericObjects; + +/// +/// Реализация абстрактной компании +/// +public class Garage : AbstractCompany +{ + /// + /// Конструктор + /// + /// + /// + /// + public Garage(int picWidth, int picHeight, ICollectoinGenericObjects collectoin) : base(picWidth, picHeight, collectoin) + { + + } + + /// + /// отрисовка парковки + /// + /// + protected override void DrawBackground(Graphics g) + { + int cntVertically = _pictureHeight / _placeSizeHeight; //Колличество мест по вертикали + int cntHorizontally = _pictureWidth / _placeSizeWidth; //Колличество мест по горизонтали + Pen pen = new Pen(Color.FromArgb(0, 0, 0)); + pen.Width = 3; + + for (int i = 0; i < cntHorizontally; i++) + { + g.DrawLine(pen, i * _placeSizeWidth, 0, i * _placeSizeWidth, cntVertically * _placeSizeHeight); + for (int j = 0; j < cntVertically + 1; j++) + { + g.DrawLine(pen, i * _placeSizeWidth, j * _placeSizeHeight, (i + 1) * _placeSizeWidth - 50, j * _placeSizeHeight); + } + } + } + + /// + /// выбор места на парковке + /// + protected override void SetObjectsPosition() + { + //Влево, вверх + int width = _pictureWidth / _placeSizeWidth - 1; + int height = _pictureHeight / _placeSizeHeight - 1; + + int placeHorizontally = width; + int placeVertically = height; + + for (int i = 0; i < (_collection?.Count ?? 0); i++) + { + if (placeVertically < 0) + { + return; + } + if (_collection?.Get(i) != null) + { + _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight); + _collection?.Get(i)?.SetPosition(_placeSizeWidth * placeHorizontally + 20, _placeSizeHeight * placeVertically + 20); + } + + if (placeHorizontally > 0) + { + placeHorizontally--; + } + else + { + placeHorizontally = width; + placeVertically--; + } + } + + //throw new NotImplementedException(); + } +} diff --git a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/MassiveGenericObject.cs b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/MassiveGenericObject.cs index 57b2d03..22bf179 100644 --- a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/MassiveGenericObject.cs +++ b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/MassiveGenericObject.cs @@ -41,29 +41,89 @@ public class MassiveGenericObject : ICollectoinGenericObjects public T? Get(int position) { - //TODO проверка позиции - return _collection[position]; + //Проверка позиции + if ((position >= 0) && (position < Count)) + { + return _collection[position]; + } + else + { + return null; + } } public bool Insert(T obj) { - //TODO вставка в свободное место набора + //Вставка в свободное место набора + for (int i = 0; i < Count; i++) + { + if (_collection[i] == null) + { + _collection[i] = obj; + return true; + } + } + return false; } public bool Insert(T obj, int position) { - //TODO Проверка позиции - //TODO проверка, что элемент массива по этой позиции пустой, если нет, то ищется свободное место после этой + //Проверка позиции + if ((position < 0) || (position >= Count)) + { + return false; + } + + //Проверка, что элемент массива по этой позиции пустой, если нет, то ищется свободное место после этой //позиции и идёт вставка туда, если нет после, ищем до - //TODO вставка - return false; + if (_collection[position] != null) + { + bool placed = false; + for (int i = position + 1; i < Count; i++) + { + if (_collection[i] == null) + { + position = i; + placed = true; + break; + } + } + + if (placed == false) + { + for (int i = position - 1; i >= 0; i--) + { + if (_collection[i] == null) + { + position = i; + placed = true; + break; + } + } + } + + if (placed == false) + { + return false; + } + } + + //Вставка + _collection[position] = obj; + return true; } public bool Remove(int position) { - //TODO проверка позиции - //TODO удаление объекта из массива, присвоив элементу массива значение null + //Проверка позиции + if ((position < 0) || (position >= Count) || (_collection[position] == null)) + { + return false; + } + + //Удаление объекта из массива, присвоив элементу массива значение null + _collection[position] = null; return true; } } diff --git a/ProjectBulldozer/ProjectBulldozer/FormBulldozer.Designer.cs b/ProjectBulldozer/ProjectBulldozer/FormBulldozer.Designer.cs index 3f5f8be..3ababcc 100644 --- a/ProjectBulldozer/ProjectBulldozer/FormBulldozer.Designer.cs +++ b/ProjectBulldozer/ProjectBulldozer/FormBulldozer.Designer.cs @@ -29,12 +29,10 @@ private void InitializeComponent() { pictureBoxBulldozer = new PictureBox(); - ButtonCreateBulldozer = new Button(); buttonRight = new Button(); buttonUp = new Button(); buttonLeft = new Button(); buttonDown = new Button(); - ButtonCreateDozer = new Button(); comboBoxStrategy = new ComboBox(); buttonStrategyStep = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxBulldozer).BeginInit(); @@ -50,18 +48,6 @@ pictureBoxBulldozer.TabIndex = 0; pictureBoxBulldozer.TabStop = false; // - // ButtonCreateBulldozer - // - ButtonCreateBulldozer.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - ButtonCreateBulldozer.Font = new Font("Comic Sans MS", 9F, FontStyle.Regular, GraphicsUnit.Point); - ButtonCreateBulldozer.Location = new Point(12, 371); - ButtonCreateBulldozer.Name = "ButtonCreateBulldozer"; - ButtonCreateBulldozer.Size = new Size(325, 46); - ButtonCreateBulldozer.TabIndex = 1; - ButtonCreateBulldozer.Text = "Создать крутой бульдозер"; - ButtonCreateBulldozer.UseVisualStyleBackColor = true; - ButtonCreateBulldozer.Click += ButtonCreateBulldozer_Click; - // // buttonRight // buttonRight.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; @@ -110,18 +96,6 @@ buttonDown.UseVisualStyleBackColor = true; buttonDown.Click += ButtonMove_Click; // - // ButtonCreateDozer - // - ButtonCreateDozer.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - ButtonCreateDozer.Font = new Font("Comic Sans MS", 9F, FontStyle.Regular, GraphicsUnit.Point); - ButtonCreateDozer.Location = new Point(343, 371); - ButtonCreateDozer.Name = "ButtonCreateDozer"; - ButtonCreateDozer.Size = new Size(248, 46); - ButtonCreateDozer.TabIndex = 6; - ButtonCreateDozer.Text = "Создать бульдозер"; - ButtonCreateDozer.UseVisualStyleBackColor = true; - ButtonCreateDozer.Click += ButtonCreateDozer_Click; - // // comboBoxStrategy // comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; @@ -151,12 +125,10 @@ ClientSize = new Size(874, 429); Controls.Add(buttonStrategyStep); Controls.Add(comboBoxStrategy); - Controls.Add(ButtonCreateDozer); Controls.Add(buttonDown); Controls.Add(buttonLeft); Controls.Add(buttonUp); Controls.Add(buttonRight); - Controls.Add(ButtonCreateBulldozer); Controls.Add(pictureBoxBulldozer); Name = "FormBulldozer"; Text = "FormBulldozer"; @@ -168,12 +140,10 @@ #endregion private PictureBox pictureBoxBulldozer; - private Button ButtonCreateBulldozer; private Button buttonRight; private Button buttonUp; private Button buttonLeft; private Button buttonDown; - private Button ButtonCreateDozer; private ComboBox comboBoxStrategy; private Button buttonStrategyStep; } diff --git a/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.Designer.cs b/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.Designer.cs index 846c232..a9ff02a 100644 --- a/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.Designer.cs +++ b/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.Designer.cs @@ -76,6 +76,7 @@ buttonRefresh.TabIndex = 3; buttonRefresh.Text = "Обновить"; buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; // // buttonGoToCheck // @@ -136,6 +137,7 @@ comboBoxSelectorCompany.Name = "comboBoxSelectorCompany"; comboBoxSelectorCompany.Size = new Size(332, 41); comboBoxSelectorCompany.TabIndex = 1; + comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged; // // pictureBox // diff --git a/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.cs b/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.cs index 9caa62f..b485011 100644 --- a/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.cs +++ b/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.cs @@ -36,7 +36,17 @@ public partial class FormBulldozerCollection : Form /// /// /// - private void ComboBoxSelectorCompany_SelectedIndexChanget(object sender, EventArgs e) + private void comboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorCompany.Text) + { + case "Хранилище": + _company = new Garage(pictureBox.Width, pictureBox.Height, new MassiveGenericObject()); + break; + } + + } +/* private void ComboBoxSelectorCompany_SelectedIndexChanget(object sender, EventArgs e) { switch (comboBoxSelectorCompany.Text) { @@ -44,7 +54,7 @@ public partial class FormBulldozerCollection : Form _company = new CarSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObject()); break; } - } + }*/ /// /// Добавление обычного бульдозера @@ -101,12 +111,6 @@ public partial class FormBulldozerCollection : Form { MessageBox.Show("Не удалось добавить объект..."); } - /* - _drawningDozer.SetPictureSize(pictureBoxBulldozer.Width, pictureBoxBulldozer.Height); - _drawningDozer.SetPosition(random.Next(10, 100), random.Next(10, 100)); - _strategy = null; - comboBoxStrategy.Enabled = true; - Draw();*/ } /// @@ -197,7 +201,7 @@ public partial class FormBulldozerCollection : Form /// private void ButtonRefresh_Click(object sender, EventArgs e) { - if(_company == null) + if (_company == null) { return; } -- 2.25.1 From 34d5daf3b1b5fdb3784d62c28bcd2b083fd942e2 Mon Sep 17 00:00:00 2001 From: MariaBelkina <89656988623@mail.ru> Date: Fri, 12 Apr 2024 22:54:00 +0400 Subject: [PATCH 4/6] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=B0=203,=20=D0=BA?= =?UTF-8?q?=D0=BE=D1=82=D0=BE=D1=80=D0=B0=D1=8F=20=D0=B3=D0=BE=D1=82=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D1=8F.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CollectionGenericObjects/Garage.cs | 2 +- .../Drawnings/DrawningBulldozer.cs | 2 +- .../Drawnings/DrawningDozer.cs | 16 ++++----- .../Entities/EntityBulldozer.cs | 35 +++++++++---------- .../ProjectBulldozer/Entities/EntityDozer.cs | 9 +---- .../FormBulldozerCollection.cs | 27 ++++++++++---- 6 files changed, 47 insertions(+), 44 deletions(-) diff --git a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/Garage.cs b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/Garage.cs index 8583f11..1e25e8d 100644 --- a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/Garage.cs +++ b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/Garage.cs @@ -31,7 +31,7 @@ public class Garage : AbstractCompany { int cntVertically = _pictureHeight / _placeSizeHeight; //Колличество мест по вертикали int cntHorizontally = _pictureWidth / _placeSizeWidth; //Колличество мест по горизонтали - Pen pen = new Pen(Color.FromArgb(0, 0, 0)); + Pen pen = new Pen(Color.FromArgb(185, 140, 0)); pen.Width = 3; for (int i = 0; i < cntHorizontally; i++) diff --git a/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningBulldozer.cs b/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningBulldozer.cs index fd24cf3..49f71ab 100644 --- a/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningBulldozer.cs +++ b/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningBulldozer.cs @@ -35,7 +35,7 @@ public class DrawningBulldozer : DrawningDozer Pen pen = new(Color.Black); Brush bodyBrush = new SolidBrush(EntityDozer.BodyColor); - Brush additionalBrush = new SolidBrush(EntityDozer.AdditionalColor); + Brush additionalBrush = new SolidBrush(bulldozer.AdditionalColor); //BULDOZER _startPosX += 0; _startPosY += 0; diff --git a/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningDozer.cs b/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningDozer.cs index 5d45b56..4715602 100644 --- a/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningDozer.cs +++ b/ProjectBulldozer/ProjectBulldozer/Drawnings/DrawningDozer.cs @@ -86,9 +86,9 @@ public class DrawningDozer /// Вес /// Основной цвет /// Дополнительный цвет(цвет колёс) - public DrawningDozer(int speed, double weight, Color bodyColor, Color additionalColor) : this() + public DrawningDozer(int speed, double weight, Color bodyColor) : this() { - EntityDozer = new EntityDozer(speed, weight, bodyColor, additionalColor); + EntityDozer = new EntityDozer(speed, weight, bodyColor); } /// @@ -99,9 +99,7 @@ public class DrawningDozer protected DrawningDozer (int drawningBulldozerWidth, int drawningBulldozerHeigh) :this() { _drawningBulldozerWidth = drawningBulldozerWidth; - //???????? _pictureHeight = drawningBulldozerHeigh; - //???????? } /// @@ -245,19 +243,19 @@ public class DrawningDozer Pen pen = new(Color.Black); Brush bodyBrush = new SolidBrush(EntityDozer.BodyColor); - Brush additionalBrush = new SolidBrush(EntityDozer.AdditionalColor); + Brush wheelsBrush = new SolidBrush(Color.FromArgb(60, 60, 60)); //BULDOZER //body g.FillRectangle(bodyBrush, _startPosX.Value + 10, _startPosY.Value + 15, _drawningBulldozerWidth - 20, _drawningBulldozerHeight - 30); g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 15, _drawningBulldozerWidth - 20, _drawningBulldozerHeight - 30); //wheels - g.FillRectangle(additionalBrush, _startPosX.Value, _startPosY.Value + _drawningBulldozerHeight - 15, 50, 15); + g.FillRectangle(wheelsBrush, _startPosX.Value, _startPosY.Value + _drawningBulldozerHeight - 15, 50, 15); g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value + _drawningBulldozerHeight - 15, 50, 15); - g.FillRectangle(additionalBrush, _startPosX.Value + _drawningBulldozerWidth - 50, _startPosY.Value + _drawningBulldozerHeight - 15, 50, 15); + g.FillRectangle(wheelsBrush, _startPosX.Value + _drawningBulldozerWidth - 50, _startPosY.Value + _drawningBulldozerHeight - 15, 50, 15); g.DrawRectangle(pen, _startPosX.Value + _drawningBulldozerWidth - 50, _startPosY.Value + _drawningBulldozerHeight - 15, 50, 15); - g.FillRectangle(additionalBrush, _startPosX.Value, _startPosY.Value, 50, 15); + g.FillRectangle(wheelsBrush, _startPosX.Value, _startPosY.Value, 50, 15); g.DrawRectangle(pen, _startPosX.Value, _startPosY.Value, 50, 15); - g.FillRectangle(additionalBrush, _startPosX.Value + _drawningBulldozerWidth - 50, _startPosY.Value, 50, 15); + g.FillRectangle(wheelsBrush, _startPosX.Value + _drawningBulldozerWidth - 50, _startPosY.Value, 50, 15); g.DrawRectangle(pen, _startPosX.Value + _drawningBulldozerWidth - 50, _startPosY.Value, 50, 15); //strange rectangles g.DrawRectangle(pen, _startPosX.Value + 10, _startPosY.Value + 25, 3, _drawningBulldozerHeight - 50); diff --git a/ProjectBulldozer/ProjectBulldozer/Entities/EntityBulldozer.cs b/ProjectBulldozer/ProjectBulldozer/Entities/EntityBulldozer.cs index db024f8..cfce915 100644 --- a/ProjectBulldozer/ProjectBulldozer/Entities/EntityBulldozer.cs +++ b/ProjectBulldozer/ProjectBulldozer/Entities/EntityBulldozer.cs @@ -22,28 +22,25 @@ public class EntityBulldozer : EntityDozer /// Признак (опция) наличие гусеницы /// public bool Caterpillar { get; private set; } -/* + + /// - /// Шаг перемещения бульдозера + /// Дополнительный цвет /// - public double Step => Speed * 100 / Weight;*/ -/* - /// - ///Инициализация полей объекта-класса бульдозера - /// - ///Скорость - ///Вес - ///Основной цвет - ///Дополнительный цвет - ///Признак наличия отвала - ///Признак наличия гусеницы - public void EntityBulldozer(bool blade, bool caterpillar) base(speed, ) - { - Blade = blade; - Caterpillar = caterpillar; - }*/ - public EntityBulldozer(int speed, double weight, Color bodyColor, Color additionalColor, bool blade, bool caterpillar) : base(speed, weight, bodyColor, additionalColor) + public Color AdditionalColor { get; private set; } + + /// + ///Инициализация полей объекта-класса бульдозера + /// + ///Скорость + ///Вес + ///Основной цвет + ///Дополнительный цвет + ///Признак наличия отвала + ///Признак наличия гусеницы + public EntityBulldozer(int speed, double weight, Color bodyColor, Color additionalColor, bool blade, bool caterpillar) : base(speed, weight, bodyColor) { + AdditionalColor = additionalColor; Blade = blade; Caterpillar = caterpillar; } diff --git a/ProjectBulldozer/ProjectBulldozer/Entities/EntityDozer.cs b/ProjectBulldozer/ProjectBulldozer/Entities/EntityDozer.cs index 89ec3e7..d78fe16 100644 --- a/ProjectBulldozer/ProjectBulldozer/Entities/EntityDozer.cs +++ b/ProjectBulldozer/ProjectBulldozer/Entities/EntityDozer.cs @@ -26,11 +26,6 @@ public class EntityDozer /// public Color BodyColor { get; private set; } - /// - /// Дополнительный цвет - /// - public Color AdditionalColor { get; private set; } - /// /// Шаг перемещения бульдозера /// @@ -42,13 +37,11 @@ public class EntityDozer ///Скорость ///Вес ///Основной цвет - ///Дополнительный цвет - public EntityDozer(int speed, double weight, Color bodyColor, Color additionalColor) + public EntityDozer(int speed, double weight, Color bodyColor/*, Color additionalColor*/) { Speed = speed; Weight = weight; BodyColor = bodyColor; - AdditionalColor = additionalColor; } } diff --git a/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.cs b/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.cs index b485011..6e42ba8 100644 --- a/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.cs +++ b/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.cs @@ -89,14 +89,13 @@ public partial class FormBulldozerCollection : Form { 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))); + GetBodyColor(random)); 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))); + GetBodyColor(random), GetWheelsColor(random), + Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); break; default: return; @@ -114,7 +113,7 @@ public partial class FormBulldozerCollection : Form } /// - /// Получение цвета самого бульдозера + /// Получение цвета корпуса бульдозера /// /// Генератор случайных чисел /// @@ -129,6 +128,22 @@ public partial class FormBulldozerCollection : Form return color; } + /// + /// Получение цвета гусеницы бульдозера + /// + /// Генератор случайных чисел + /// + private static Color GetWheelsColor(Random random) + { + Color color = Color.FromArgb(random.Next(30, 120), random.Next(30, 120), random.Next(30, 120)); + ColorDialog dialog = new(); + if (dialog.ShowDialog() == DialogResult.OK) + { + color = dialog.Color; + } + return color; + } + /// /// Удаление объекта /// -- 2.25.1 From 6eebbbad7c1538af0b16fcd390fee3dff2238f94 Mon Sep 17 00:00:00 2001 From: MariaBelkina <89656988623@mail.ru> Date: Tue, 23 Apr 2024 10:24:48 +0400 Subject: [PATCH 5/6] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=B0=203=20=D0=B1=D0=B5?= =?UTF-8?q?=D0=B7=20=D0=B4=D0=BE=D0=BF=D0=BE=D0=B2.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbstractCompany.cs | 8 +++---- .../CollectionGenericObjects/Garage.cs | 8 +++---- .../ICollectoinGenericObjects.cs | 6 +++--- .../MassiveGenericObject.cs | 21 ++++++++++--------- .../FormBulldozerCollection.Designer.cs | 2 +- .../FormBulldozerCollection.cs | 15 +++---------- 6 files changed, 26 insertions(+), 34 deletions(-) diff --git a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/AbstractCompany.cs b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/AbstractCompany.cs index 302c514..2db825c 100644 --- a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/AbstractCompany.cs +++ b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/AbstractCompany.cs @@ -63,9 +63,9 @@ public abstract class AbstractCompany /// Компания /// Добавляемый объект /// - public static bool operator +(AbstractCompany company, DrawningDozer dozer) + public static int operator +(AbstractCompany company, DrawningDozer dozer) { - return company._collection?.Insert(dozer) ?? false; + return company._collection.Insert(dozer); } /// @@ -74,9 +74,9 @@ public abstract class AbstractCompany /// Компания /// Номер удаляемого объекта /// - public static bool operator -(AbstractCompany company, int position) + public static DrawningDozer? operator -(AbstractCompany company, int position) { - return company._collection?.Remove(position) ?? false; + return company._collection.Remove(position); } /// diff --git a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/Garage.cs b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/Garage.cs index 1e25e8d..c1131d7 100644 --- a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/Garage.cs +++ b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/Garage.cs @@ -31,8 +31,10 @@ public class Garage : AbstractCompany { int cntVertically = _pictureHeight / _placeSizeHeight; //Колличество мест по вертикали int cntHorizontally = _pictureWidth / _placeSizeWidth; //Колличество мест по горизонтали - Pen pen = new Pen(Color.FromArgb(185, 140, 0)); - pen.Width = 3; + Pen pen = new(Color.FromArgb(185, 140, 0)) + { + Width = 3 + }; for (int i = 0; i < cntHorizontally; i++) { @@ -78,7 +80,5 @@ public class Garage : AbstractCompany placeVertically--; } } - - //throw new NotImplementedException(); } } diff --git a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/ICollectoinGenericObjects.cs b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/ICollectoinGenericObjects.cs index be6c0e0..ef584bc 100644 --- a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/ICollectoinGenericObjects.cs +++ b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/ICollectoinGenericObjects.cs @@ -28,7 +28,7 @@ public interface ICollectoinGenericObjects /// /// Добавляемый объект /// true - вставка прошла удачно, false - вставка не удалась - bool Insert(T obj); + int Insert(T obj); /// /// Добавление объекта в коллекцию на конкретную позицию @@ -36,14 +36,14 @@ public interface ICollectoinGenericObjects /// Добавляемый объект /// Позиция /// true - вставка прошла удачно, false - вставка не удалась - bool Insert(T obj, int position); + int Insert(T obj, int position); /// /// Удаление объекта из коллекции на конкретной позиции /// /// Позиция /// - bool Remove(int position); + T? Remove(int position); /// /// Получение объекта по позиции diff --git a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/MassiveGenericObject.cs b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/MassiveGenericObject.cs index 22bf179..8a90051 100644 --- a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/MassiveGenericObject.cs +++ b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/MassiveGenericObject.cs @@ -52,7 +52,7 @@ public class MassiveGenericObject : ICollectoinGenericObjects } } - public bool Insert(T obj) + public int Insert(T obj) { //Вставка в свободное место набора for (int i = 0; i < Count; i++) @@ -60,19 +60,19 @@ public class MassiveGenericObject : ICollectoinGenericObjects if (_collection[i] == null) { _collection[i] = obj; - return true; + return i; } } - return false; + return -1; } - public bool Insert(T obj, int position) + public int Insert(T obj, int position) { //Проверка позиции if ((position < 0) || (position >= Count)) { - return false; + return -1; } //Проверка, что элемент массива по этой позиции пустой, если нет, то ищется свободное место после этой @@ -105,25 +105,26 @@ public class MassiveGenericObject : ICollectoinGenericObjects if (placed == false) { - return false; + return -1; } } //Вставка _collection[position] = obj; - return true; + return position; } - public bool Remove(int position) + public T? Remove(int position) { //Проверка позиции if ((position < 0) || (position >= Count) || (_collection[position] == null)) { - return false; + return null; } //Удаление объекта из массива, присвоив элементу массива значение null + T? elem = _collection[position]; _collection[position] = null; - return true; + return elem; } } diff --git a/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.Designer.cs b/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.Designer.cs index a9ff02a..5dad03e 100644 --- a/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.Designer.cs +++ b/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.Designer.cs @@ -137,7 +137,7 @@ comboBoxSelectorCompany.Name = "comboBoxSelectorCompany"; comboBoxSelectorCompany.Size = new Size(332, 41); comboBoxSelectorCompany.TabIndex = 1; - comboBoxSelectorCompany.SelectedIndexChanged += comboBoxSelectorCompany_SelectedIndexChanged; + comboBoxSelectorCompany.SelectedIndexChanged += ComboBoxSelectorCompany_SelectedIndexChanged; // // pictureBox // diff --git a/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.cs b/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.cs index 6e42ba8..3c0a7b4 100644 --- a/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.cs +++ b/ProjectBulldozer/ProjectBulldozer/FormBulldozerCollection.cs @@ -36,7 +36,7 @@ public partial class FormBulldozerCollection : Form /// /// /// - private void comboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e) + private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e) { switch (comboBoxSelectorCompany.Text) { @@ -46,15 +46,6 @@ public partial class FormBulldozerCollection : Form } } -/* private void ComboBoxSelectorCompany_SelectedIndexChanget(object sender, EventArgs e) - { - switch (comboBoxSelectorCompany.Text) - { - case "Хранилище": - _company = new CarSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObject()); - break; - } - }*/ /// /// Добавление обычного бульдозера @@ -101,7 +92,7 @@ public partial class FormBulldozerCollection : Form return; } - if (_company + drawningDozer) + if (_company + drawningDozer != -1) { MessageBox.Show("Объект добавлен."); pictureBox.Image = _company.Show(); @@ -162,7 +153,7 @@ public partial class FormBulldozerCollection : Form } int pos = Convert.ToInt32(maskedTextBox.Text); - if (_company - pos) + if (_company - pos != null) { MessageBox.Show("Объект удалён."); pictureBox.Image = _company.Show(); -- 2.25.1 From 4de869410dd7a3b40707c9269391a6e0d8c1bf37 Mon Sep 17 00:00:00 2001 From: MariaBelkina <89656988623@mail.ru> Date: Tue, 23 Apr 2024 11:12:25 +0400 Subject: [PATCH 6/6] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=B0=203=20=D0=B3=D0=BE?= =?UTF-8?q?=D1=82=D0=BE=D0=B2=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CollectionGenericObjects/MassiveGenericObject.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/MassiveGenericObject.cs b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/MassiveGenericObject.cs index 8a90051..3dce26c 100644 --- a/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/MassiveGenericObject.cs +++ b/ProjectBulldozer/ProjectBulldozer/CollectionGenericObjects/MassiveGenericObject.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace ProjectBulldozer.CollectionGenericObjects; public class MassiveGenericObject : ICollectoinGenericObjects - where T : class + where T : class { /// /// Массив объектов, который храним -- 2.25.1