From 95480afb9f842d89275dc05f353810dc76429a6a Mon Sep 17 00:00:00 2001 From: Evgeny Egov Date: Fri, 5 Jan 2024 16:10:23 +0400 Subject: [PATCH 1/6] =?UTF-8?q?=D0=9A=D0=BE=D0=BB=D0=BB=D0=B5=D0=BA=D1=86?= =?UTF-8?q?=D0=B8=D0=B8=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ICollectionGenericObjects.cs | 48 ++++++++++++++++ .../MassiveGenericObjects.cs | 55 +++++++++++++++++++ 2 files changed, 103 insertions(+) create mode 100644 ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ICollectionGenericObjects.cs create mode 100644 ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs diff --git a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ICollectionGenericObjects.cs new file mode 100644 index 0000000..b478a4e --- /dev/null +++ b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -0,0 +1,48 @@ +namespace ProjectSportCar.CollectionGenericObjects; + +/// +/// Интерфейс описания действий для набора хранимых объектов +/// +/// Параметр: ограничение - ссылочный тип +public interface ICollectionGenericObjects + where T : class +{ + /// + /// Количество объектов в коллекции + /// + int Count { get; } + + /// + /// Установка максимального количества элементов + /// + int SetMaxCount { set; } + + /// + /// Добавление объекта в коллекцию + /// + /// Добавляемый объект + /// true - вставка прошла удачно, false - вставка не удалась + bool Insert(T obj); + + /// + /// Добавление объекта в коллекцию на конкретную позицию + /// + /// Добавляемый объект + /// Позиция + /// true - вставка прошла удачно, false - вставка не удалась + bool Insert(T obj, int position); + + /// + /// Удаление объекта из коллекции с конкретной позиции + /// + /// Позиция + /// true - удаление прошло удачно, false - удаление не удалось + bool Remove(int position); + + /// + /// Получение объекта по позиции + /// + /// Позиция + /// Объект + T? Get(int position); +} \ No newline at end of file diff --git a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs new file mode 100644 index 0000000..d7808a5 --- /dev/null +++ b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs @@ -0,0 +1,55 @@ +namespace ProjectSportCar.CollectionGenericObjects; + +/// +/// Параметризованный набор объектов +/// +/// Параметр: ограничение - ссылочный тип +public class MassiveGenericObjects : ICollectionGenericObjects + where T : class +{ + /// + /// Массив объектов, которые храним + /// + private T?[] _collection; + + public int Count => _collection.Length; + + public int SetMaxCount { set { if (value > 0) { _collection = new T?[value]; } } } + + /// + /// Конструктор + /// + public MassiveGenericObjects() + { + _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; + } +} \ No newline at end of file -- 2.25.1 From 1476a703957adfb071585404a1823b5fae9253b3 Mon Sep 17 00:00:00 2001 From: Evgeny Egov Date: Fri, 5 Jan 2024 16:42:35 +0400 Subject: [PATCH 2/6] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BF=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbstractCompany.cs | 116 +++++++++++ .../CarSharingService.cs | 20 ++ .../FormCarCollection.Designer.cs | 173 ++++++++++++++++ .../ProjectSportCar/FormCarCollection.cs | 188 ++++++++++++++++++ .../ProjectSportCar/FormCarCollection.resx | 120 +++++++++++ .../ProjectSportCar/FormSportCar.Designer.cs | 28 --- .../ProjectSportCar/FormSportCar.cs | 59 ++---- 7 files changed, 632 insertions(+), 72 deletions(-) create mode 100644 ProjectSportCar/ProjectSportCar/CollectionGenericObjects/AbstractCompany.cs create mode 100644 ProjectSportCar/ProjectSportCar/CollectionGenericObjects/CarSharingService.cs create mode 100644 ProjectSportCar/ProjectSportCar/FormCarCollection.Designer.cs create mode 100644 ProjectSportCar/ProjectSportCar/FormCarCollection.cs create mode 100644 ProjectSportCar/ProjectSportCar/FormCarCollection.resx diff --git a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/AbstractCompany.cs b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/AbstractCompany.cs new file mode 100644 index 0000000..85edb53 --- /dev/null +++ b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/AbstractCompany.cs @@ -0,0 +1,116 @@ +using ProjectSportCar.Drawnings; + +namespace ProjectSportCar.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); + + /// + /// Конструктор + /// + /// Ширина окна + /// Высота окна + /// Коллекция автомобилей + public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects collection) + { + _pictureWidth = picWidth; + _pictureHeight = picHeight; + _collection = collection; + _collection.SetMaxCount = GetMaxCount; + } + + /// + /// Перегрузка оператора сложения для класса + /// + /// Компания + /// Добавляемый объект + /// + public static bool operator +(AbstractCompany company, DrawningCar car) + { + return company._collection?.Insert(car) ?? false; + } + + /// + /// Перегрузка оператора удаления для класса + /// + /// Компания + /// Номер удаляемого объекта + /// + public static bool operator -(AbstractCompany company, int position) + { + return company._collection?.Remove(position) ?? false; + } + + /// + /// Получение случайного объекта из коллекции + /// + /// + public DrawningCar? GetRandomObject() + { + Random rnd = new(); + return _collection?.Get(rnd.Next(GetMaxCount)); + } + + /// + /// Вывод всей коллекции + /// + /// + public Bitmap? Show() + { + Bitmap bitmap = new(_pictureWidth, _pictureHeight); + Graphics graphics = Graphics.FromImage(bitmap); + DrawBackgound(graphics); + + SetObjectsPosition(); + for (int i = 0; i < (_collection?.Count ?? 0); ++i) + { + DrawningCar? obj = _collection?.Get(i); + obj?.DrawTransport(graphics); + } + + return bitmap; + } + + /// + /// Вывод заднего фона + /// + /// + protected abstract void DrawBackgound(Graphics g); + + /// + /// Расстановка объектов + /// + protected abstract void SetObjectsPosition(); +} \ No newline at end of file diff --git a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/CarSharingService.cs b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/CarSharingService.cs new file mode 100644 index 0000000..e73434f --- /dev/null +++ b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/CarSharingService.cs @@ -0,0 +1,20 @@ +using ProjectSportCar.Drawnings; + +namespace ProjectSportCar.CollectionGenericObjects; + +public class CarSharingService : AbstractCompany +{ + public CarSharingService(int picWidth, int picHeight, ICollectionGenericObjects collection) : base(picWidth, picHeight, collection) + { + } + + protected override void DrawBackgound(Graphics g) + { + throw new NotImplementedException(); + } + + protected override void SetObjectsPosition() + { + throw new NotImplementedException(); + } +} \ No newline at end of file diff --git a/ProjectSportCar/ProjectSportCar/FormCarCollection.Designer.cs b/ProjectSportCar/ProjectSportCar/FormCarCollection.Designer.cs new file mode 100644 index 0000000..97f663c --- /dev/null +++ b/ProjectSportCar/ProjectSportCar/FormCarCollection.Designer.cs @@ -0,0 +1,173 @@ +namespace ProjectSportCar +{ + partial class FormCarCollection + { + /// + /// 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(); + buttonAddSportCar = new Button(); + buttonAddCar = 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(buttonAddSportCar); + groupBoxTools.Controls.Add(buttonAddCar); + groupBoxTools.Controls.Add(comboBoxSelectorCompany); + groupBoxTools.Dock = DockStyle.Right; + groupBoxTools.Location = new Point(783, 0); + groupBoxTools.Name = "groupBoxTools"; + groupBoxTools.Size = new Size(179, 616); + groupBoxTools.TabIndex = 0; + groupBoxTools.TabStop = false; + groupBoxTools.Text = "Инструменты"; + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(6, 499); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(167, 40); + buttonRefresh.TabIndex = 6; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + buttonRefresh.Click += ButtonRefresh_Click; + // + // buttonGoToCheck + // + buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonGoToCheck.Location = new Point(6, 361); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(167, 40); + 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(6, 251); + buttonRemoveCar.Name = "buttonRemoveCar"; + buttonRemoveCar.Size = new Size(167, 40); + buttonRemoveCar.TabIndex = 4; + buttonRemoveCar.Text = "Удалить автомобиль"; + buttonRemoveCar.UseVisualStyleBackColor = true; + buttonRemoveCar.Click += ButtonRemoveCar_Click; + // + // maskedTextBoxPosition + // + maskedTextBoxPosition.Location = new Point(6, 222); + maskedTextBoxPosition.Mask = "00"; + maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + maskedTextBoxPosition.Size = new Size(167, 23); + maskedTextBoxPosition.TabIndex = 3; + maskedTextBoxPosition.ValidatingType = typeof(int); + // + // buttonAddSportCar + // + buttonAddSportCar.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddSportCar.Location = new Point(6, 137); + buttonAddSportCar.Name = "buttonAddSportCar"; + buttonAddSportCar.Size = new Size(167, 40); + buttonAddSportCar.TabIndex = 2; + buttonAddSportCar.Text = "Добавление спортивного автомобиля"; + buttonAddSportCar.UseVisualStyleBackColor = true; + buttonAddSportCar.Click += ButtonAddSportCar_Click; + // + // buttonAddCar + // + buttonAddCar.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddCar.Location = new Point(6, 91); + buttonAddCar.Name = "buttonAddCar"; + buttonAddCar.Size = new Size(167, 40); + buttonAddCar.TabIndex = 1; + buttonAddCar.Text = "Добавление автомобиля"; + buttonAddCar.UseVisualStyleBackColor = true; + buttonAddCar.Click += ButtonAddCar_Click; + // + // comboBoxSelectorCompany + // + comboBoxSelectorCompany.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + comboBoxSelectorCompany.DropDownStyle = ComboBoxStyle.DropDownList; + comboBoxSelectorCompany.FormattingEnabled = true; + comboBoxSelectorCompany.Items.AddRange(new object[] { "Хранилище" }); + comboBoxSelectorCompany.Location = new Point(6, 22); + comboBoxSelectorCompany.Name = "comboBoxSelectorCompany"; + comboBoxSelectorCompany.Size = new Size(167, 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(783, 616); + pictureBox.TabIndex = 1; + pictureBox.TabStop = false; + // + // FormCarCollection + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(962, 616); + Controls.Add(pictureBox); + Controls.Add(groupBoxTools); + Name = "FormCarCollection"; + Text = "Коллекция автомобилей"; + groupBoxTools.ResumeLayout(false); + groupBoxTools.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBoxTools; + private ComboBox comboBoxSelectorCompany; + private Button buttonAddSportCar; + private Button buttonAddCar; + private Button buttonRemoveCar; + private MaskedTextBox maskedTextBoxPosition; + private PictureBox pictureBox; + private Button buttonGoToCheck; + private Button buttonRefresh; + } +} \ No newline at end of file diff --git a/ProjectSportCar/ProjectSportCar/FormCarCollection.cs b/ProjectSportCar/ProjectSportCar/FormCarCollection.cs new file mode 100644 index 0000000..6cbc738 --- /dev/null +++ b/ProjectSportCar/ProjectSportCar/FormCarCollection.cs @@ -0,0 +1,188 @@ +using ProjectSportCar.CollectionGenericObjects; +using ProjectSportCar.Drawnings; + +namespace ProjectSportCar; + +/// +/// Форма работы с компанией и ее коллекцией +/// +public partial class FormCarCollection : Form +{ + /// + /// Компания + /// + private AbstractCompany? _company = null; + + /// + /// Конструктор + /// + public FormCarCollection() + { + InitializeComponent(); + } + + /// + /// Выбор компании + /// + /// + /// + private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorCompany.Text) + { + case "Хранилище": + _company = new CarSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects()); + break; + } + } + + /// + /// Добавление обычного автомобиля + /// + /// + /// + private void ButtonAddCar_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningCar)); + + /// + /// Добавление спортивного автомобиля + /// + /// + /// + private void ButtonAddSportCar_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningSportCar)); + + /// + /// Создание объекта класса-перемещения + /// + /// Тип создаваемого объекта + private void CreateObject(string type) + { + if (_company == null) + { + return; + } + + Random random = new(); + DrawningCar drawningCar; + switch (type) + { + case nameof(DrawningCar): + drawningCar = new DrawningCar(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); + break; + case nameof(DrawningSportCar): + drawningCar = new DrawningSportCar(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)), Convert.ToBoolean(random.Next(0, 2))); + break; + default: + return; + } + + if (_company + drawningCar) + { + 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; + } + + DrawningCar? car = null; + int counter = 100; + while (car == null) + { + car = _company.GetRandomObject(); + counter--; + if (counter <= 0) + { + break; + } + } + + if (car == null) + { + return; + } + + FormSportCar form = new() + { + SetCar = car + }; + form.ShowDialog(); + } + + /// + /// Перерисовка коллекции + /// + /// + /// + private void ButtonRefresh_Click(object sender, EventArgs e) + { + if (_company == null) + { + return; + } + + pictureBox.Image = _company.Show(); + } +} \ No newline at end of file diff --git a/ProjectSportCar/ProjectSportCar/FormCarCollection.resx b/ProjectSportCar/ProjectSportCar/FormCarCollection.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectSportCar/ProjectSportCar/FormCarCollection.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/ProjectSportCar/ProjectSportCar/FormSportCar.Designer.cs b/ProjectSportCar/ProjectSportCar/FormSportCar.Designer.cs index 44ec48a..064681d 100644 --- a/ProjectSportCar/ProjectSportCar/FormSportCar.Designer.cs +++ b/ProjectSportCar/ProjectSportCar/FormSportCar.Designer.cs @@ -29,12 +29,10 @@ private void InitializeComponent() { pictureBoxSportCar = new PictureBox(); - buttonCreateSportCar = new Button(); buttonLeft = new Button(); buttonUp = new Button(); buttonDown = new Button(); buttonRight = new Button(); - buttonCreateCar = new Button(); comboBoxStrategy = new ComboBox(); buttonStrategyStep = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxSportCar).BeginInit(); @@ -49,17 +47,6 @@ pictureBoxSportCar.TabIndex = 0; pictureBoxSportCar.TabStop = false; // - // buttonCreateSportCar - // - buttonCreateSportCar.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - buttonCreateSportCar.Location = new Point(12, 562); - buttonCreateSportCar.Name = "buttonCreateSportCar"; - buttonCreateSportCar.Size = new Size(223, 23); - buttonCreateSportCar.TabIndex = 1; - buttonCreateSportCar.Text = "Создать спортивный автомобиль"; - buttonCreateSportCar.UseVisualStyleBackColor = true; - buttonCreateSportCar.Click += ButtonCreateSportCar_Click; - // // buttonLeft // buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; @@ -108,17 +95,6 @@ buttonRight.UseVisualStyleBackColor = true; buttonRight.Click += ButtonMove_Click; // - // buttonCreateCar - // - buttonCreateCar.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - buttonCreateCar.Location = new Point(250, 562); - buttonCreateCar.Name = "buttonCreateCar"; - buttonCreateCar.Size = new Size(223, 23); - buttonCreateCar.TabIndex = 6; - buttonCreateCar.Text = "Создать автомобиль"; - buttonCreateCar.UseVisualStyleBackColor = true; - buttonCreateCar.Click += ButtonCreateCar_Click; - // // comboBoxStrategy // comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; @@ -146,12 +122,10 @@ ClientSize = new Size(923, 597); Controls.Add(buttonStrategyStep); Controls.Add(comboBoxStrategy); - Controls.Add(buttonCreateCar); Controls.Add(buttonRight); Controls.Add(buttonDown); Controls.Add(buttonUp); Controls.Add(buttonLeft); - Controls.Add(buttonCreateSportCar); Controls.Add(pictureBoxSportCar); Name = "FormSportCar"; Text = "Спортивный автомобиль"; @@ -162,12 +136,10 @@ #endregion private PictureBox pictureBoxSportCar; - private Button buttonCreateSportCar; private Button buttonLeft; private Button buttonUp; private Button buttonDown; private Button buttonRight; - private Button buttonCreateCar; private ComboBox comboBoxStrategy; private Button buttonStrategyStep; } diff --git a/ProjectSportCar/ProjectSportCar/FormSportCar.cs b/ProjectSportCar/ProjectSportCar/FormSportCar.cs index e2af534..e484243 100644 --- a/ProjectSportCar/ProjectSportCar/FormSportCar.cs +++ b/ProjectSportCar/ProjectSportCar/FormSportCar.cs @@ -18,6 +18,21 @@ public partial class FormSportCar : Form /// private AbstractStrategy? _strategy; + /// + /// Получение объекта + /// + public DrawningCar SetCar + { + set + { + _drawningCar = value; + _drawningCar.SetPictureSize(pictureBoxSportCar.Width, pictureBoxSportCar.Height); + comboBoxStrategy.Enabled = true; + _strategy = null; + Draw(); + } + } + /// /// Конструктор формы /// @@ -43,50 +58,6 @@ public partial class FormSportCar : Form pictureBoxSportCar.Image = bmp; } - /// - /// Создание объекта класса-перемещения - /// - /// Тип создаваемого объекта - private void CreateObject(string type) - { - Random random = new(); - switch (type) - { - case nameof(DrawningCar): - _drawningCar = new DrawningCar(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(DrawningSportCar): - _drawningCar = new DrawningSportCar(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)), Convert.ToBoolean(random.Next(0, 2))); - break; - default: - return; - } - - _drawningCar.SetPictureSize(pictureBoxSportCar.Width, pictureBoxSportCar.Height); - _drawningCar.SetPosition(random.Next(10, 100), random.Next(10, 100)); - _strategy = null; - comboBoxStrategy.Enabled = true; - Draw(); - } - - /// - /// Обработка нажатия кнопки "Создать спортивный автомобиль" - /// - /// - /// - private void ButtonCreateSportCar_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningSportCar)); - - /// - /// Обработка нажатия кнопки "Создать автомобиль" - /// - /// - /// - private void ButtonCreateCar_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningCar)); - /// /// Перемешение объекта по форме (нажатие кнопок навигации) /// -- 2.25.1 From 02cb45ab7c2192f5578b99903b6d7464acc4d7b1 Mon Sep 17 00:00:00 2001 From: Evgeny Egov Date: Fri, 5 Jan 2024 16:46:41 +0400 Subject: [PATCH 3/6] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20program?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectSportCar/ProjectSportCar/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectSportCar/ProjectSportCar/Program.cs b/ProjectSportCar/ProjectSportCar/Program.cs index ebda3cc..fc2e906 100644 --- a/ProjectSportCar/ProjectSportCar/Program.cs +++ b/ProjectSportCar/ProjectSportCar/Program.cs @@ -11,7 +11,7 @@ namespace ProjectSportCar // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormSportCar()); + Application.Run(new FormCarCollection()); } } } \ No newline at end of file -- 2.25.1 From 1358d1f9699d93660842e3acc4c6d8d6353adfd7 Mon Sep 17 00:00:00 2001 From: Evgeny Egov Date: Sat, 6 Jan 2024 17:36:56 +0400 Subject: [PATCH 4/6] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CollectionGenericObjects/CarSharingService.cs | 9 +++++++++ ProjectSportCar/ProjectSportCar/FormCarCollection.cs | 1 + 2 files changed, 10 insertions(+) diff --git a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/CarSharingService.cs b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/CarSharingService.cs index e73434f..1060292 100644 --- a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/CarSharingService.cs +++ b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/CarSharingService.cs @@ -2,8 +2,17 @@ namespace ProjectSportCar.CollectionGenericObjects; +/// +/// Реализация абстрактной компании - каршеринг +/// public class CarSharingService : AbstractCompany { + /// + /// Конструктор + /// + /// + /// + /// public CarSharingService(int picWidth, int picHeight, ICollectionGenericObjects collection) : base(picWidth, picHeight, collection) { } diff --git a/ProjectSportCar/ProjectSportCar/FormCarCollection.cs b/ProjectSportCar/ProjectSportCar/FormCarCollection.cs index 6cbc738..9d26a36 100644 --- a/ProjectSportCar/ProjectSportCar/FormCarCollection.cs +++ b/ProjectSportCar/ProjectSportCar/FormCarCollection.cs @@ -69,6 +69,7 @@ public partial class FormCarCollection : Form drawningCar = new DrawningCar(random.Next(100, 300), random.Next(1000, 3000), GetColor(random)); break; case nameof(DrawningSportCar): + // TODO вызов диалогового окна для выбора цвета drawningCar = new DrawningSportCar(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)), -- 2.25.1 From 08ad72a781c3f04e6cd0cd04244125dba8034586 Mon Sep 17 00:00:00 2001 From: Evgeny Egov Date: Sat, 6 Jan 2024 19:45:54 +0400 Subject: [PATCH 5/6] =?UTF-8?q?=D0=BE=D0=BF=D0=B5=D1=87=D0=B0=D1=82=D0=BA?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CollectionGenericObjects/MassiveGenericObjects.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs index d7808a5..d39a0f8 100644 --- a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs @@ -49,7 +49,7 @@ public class MassiveGenericObjects : ICollectionGenericObjects public bool Remove(int position) { // TODO проверка позиции - // TODO удаление объекта из массива, присовив элементу массива значение null + // TODO удаление объекта из массива, присвоив элементу массива значение null return true; } } \ No newline at end of file -- 2.25.1 From eff3a95bb3dc4b5cf38348c8c76e0798f726be0a Mon Sep 17 00:00:00 2001 From: Evgeny Egov Date: Sat, 6 Jan 2024 20:40:23 +0400 Subject: [PATCH 6/6] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B0=D0=BB?= =?UTF-8?q?=D0=BA=D0=B0=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D1=8B=20=D1=81=20?= =?UTF-8?q?=D0=BC=D0=B0=D1=81=D1=81=D0=B8=D0=B2=D0=BE=D0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MassiveGenericObjects.cs | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs index d39a0f8..8f69c05 100644 --- a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs @@ -14,7 +14,23 @@ public class MassiveGenericObjects : ICollectionGenericObjects public int Count => _collection.Length; - public int SetMaxCount { set { if (value > 0) { _collection = new T?[value]; } } } + public int SetMaxCount + { + set + { + if (value > 0) + { + if (_collection.Length > 0) + { + Array.Resize(ref _collection, value); + } + else + { + _collection = new T?[value]; + } + } + } + } /// /// Конструктор -- 2.25.1