From da49c0985f0fd6bfbf5ceba272c52fb0216aa60d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=B7=D0=B0=D0=BC=D0=B0=D1=82=20=D0=98=D1=88=D1=82?= =?UTF-8?q?=D1=83=D0=B3=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Sun, 24 Mar 2024 20:29:01 +0400 Subject: [PATCH 1/3] =?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 | 43 +++++++++++++++++ .../MassiveGenericObjects.cs | 48 +++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 MotorBoat/MotorBoat/CollectionGenericObjects/ICollectionGenericObjects.cs create mode 100644 MotorBoat/MotorBoat/CollectionGenericObjects/MassiveGenericObjects.cs diff --git a/MotorBoat/MotorBoat/CollectionGenericObjects/ICollectionGenericObjects.cs b/MotorBoat/MotorBoat/CollectionGenericObjects/ICollectionGenericObjects.cs new file mode 100644 index 0000000..da4f722 --- /dev/null +++ b/MotorBoat/MotorBoat/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -0,0 +1,43 @@ +namespace MotorBoat.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); +} diff --git a/MotorBoat/MotorBoat/CollectionGenericObjects/MassiveGenericObjects.cs b/MotorBoat/MotorBoat/CollectionGenericObjects/MassiveGenericObjects.cs new file mode 100644 index 0000000..a875b6b --- /dev/null +++ b/MotorBoat/MotorBoat/CollectionGenericObjects/MassiveGenericObjects.cs @@ -0,0 +1,48 @@ +namespace MotorBoat.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; + } +} -- 2.25.1 From 653ea2820f1e05c10472158d7fd810f216177256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=B7=D0=B0=D0=BC=D0=B0=D1=82=20=D0=98=D1=88=D1=82?= =?UTF-8?q?=D1=83=D0=B3=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Mon, 25 Mar 2024 22:46:30 +0400 Subject: [PATCH 2/3] =?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 | 102 ++++++++++ .../CollectionGenericObjects/Harbor.cs | 58 ++++++ .../ICollectionGenericObjects.cs | 6 +- .../MassiveGenericObjects.cs | 63 +++++- .../MotorBoat/FormBoatCollection.Designer.cs | 173 +++++++++++++++++ MotorBoat/MotorBoat/FormBoatCollection.cs | 182 ++++++++++++++++++ MotorBoat/MotorBoat/FormBoatCollection.resx | 120 ++++++++++++ MotorBoat/MotorBoat/FormMotorBoat.Designer.cs | 28 --- MotorBoat/MotorBoat/FormMotorBoat.cs | 50 ++--- MotorBoat/MotorBoat/Program.cs | 2 +- 10 files changed, 708 insertions(+), 76 deletions(-) create mode 100644 MotorBoat/MotorBoat/CollectionGenericObjects/AbstractCompany.cs create mode 100644 MotorBoat/MotorBoat/CollectionGenericObjects/Harbor.cs create mode 100644 MotorBoat/MotorBoat/FormBoatCollection.Designer.cs create mode 100644 MotorBoat/MotorBoat/FormBoatCollection.cs create mode 100644 MotorBoat/MotorBoat/FormBoatCollection.resx diff --git a/MotorBoat/MotorBoat/CollectionGenericObjects/AbstractCompany.cs b/MotorBoat/MotorBoat/CollectionGenericObjects/AbstractCompany.cs new file mode 100644 index 0000000..cd85cfa --- /dev/null +++ b/MotorBoat/MotorBoat/CollectionGenericObjects/AbstractCompany.cs @@ -0,0 +1,102 @@ +using MotorBoat.Drawnings; + +namespace MotorBoat.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 / _placeSizeWidth * (_pictureHeight / _placeSizeHeight / 2); + /// + /// Конструктор + /// + /// Ширина окна + /// Высота окна + /// Коллекция лодок + public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects collection) + { + _pictureWidth = picWidth; + _pictureHeight = picHeight; + _collection = collection; + _collection.SetMaxCount = GetMaxCount; + } + /// + /// Перегрузка оператора сложения для класса + /// + /// Компания + /// Добавляемый объект + /// + public static int operator +(AbstractCompany company, DrawningBoat boat) + { + return company._collection.Insert(boat); + } + /// + /// Перегрузка оператора удаления для класса + /// + /// Компания + /// Номер удаляемого объекта + /// + public static DrawningBoat operator -(AbstractCompany company, int position) + { + return company._collection.Remove(position); + } + + /// + /// Получение случайного объекта из коллекции + /// + /// + public DrawningBoat? 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) + { + DrawningBoat? obj = _collection?.Get(i); + obj?.DrawTransport(graphics); + } + return bitmap; + } + /// + /// Вывод заднего фона + /// + /// + protected abstract void DrawBackgound(Graphics g); + /// + /// Расстановка объектов + /// + protected abstract void SetObjectsPosition(); +} diff --git a/MotorBoat/MotorBoat/CollectionGenericObjects/Harbor.cs b/MotorBoat/MotorBoat/CollectionGenericObjects/Harbor.cs new file mode 100644 index 0000000..3d8f2dc --- /dev/null +++ b/MotorBoat/MotorBoat/CollectionGenericObjects/Harbor.cs @@ -0,0 +1,58 @@ +using MotorBoat.Drawnings; + +namespace MotorBoat.CollectionGenericObjects; + +/// +/// Реализация абстрактной компании - гавань +/// +public class Harbor : AbstractCompany +{ + /// + /// Конструктор + /// + /// + /// + /// + public Harbor(int picWidth, int picHeight, ICollectionGenericObjects collection) + : base(picWidth, picHeight, collection) + { + } + + protected override void DrawBackgound(Graphics g) + { + Pen pen = new Pen(Color.Black, 4f); + for (int i = 0; i < _pictureHeight / _placeSizeHeight / 2; i++) + { + g.DrawLine(pen, 0, i * _placeSizeHeight * 2, _pictureWidth / _placeSizeWidth * _placeSizeWidth, i * _placeSizeHeight * 2); + for (int j = 0; j < _pictureWidth / _placeSizeWidth + 1; ++j) + { + g.DrawLine(pen, j * _placeSizeWidth, i * _placeSizeHeight * 2, j * _placeSizeWidth, i * _placeSizeHeight * 2 + _placeSizeHeight); + } + } + } + protected override void SetObjectsPosition() + { + int nowWidth = 0; + int nowHeight = 0; + + for (int i = 0; i < (_collection?.Count ?? 0); i++) + { + if (nowHeight > _pictureHeight / _placeSizeHeight) + { + return; + } + if (_collection?.Get(i) != null) + { + _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight); + _collection?.Get(i)?.SetPosition(_placeSizeWidth * nowWidth + 30, nowHeight * _placeSizeHeight * 2 + 20); + } + + if (nowWidth < _pictureWidth / _placeSizeWidth - 1) nowWidth++; + else + { + nowWidth = 0; + nowHeight++; + } + } + } +} diff --git a/MotorBoat/MotorBoat/CollectionGenericObjects/ICollectionGenericObjects.cs b/MotorBoat/MotorBoat/CollectionGenericObjects/ICollectionGenericObjects.cs index da4f722..79993da 100644 --- a/MotorBoat/MotorBoat/CollectionGenericObjects/ICollectionGenericObjects.cs +++ b/MotorBoat/MotorBoat/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -20,20 +20,20 @@ public interface ICollectionGenericObjects /// /// Добавляемый объект /// true - вставка прошла удачно, false - вставка не удалась - bool Insert(T obj); + int Insert(T obj); /// /// Добавление объекта в коллекцию на конкретную позицию /// /// Добавляемый объект /// Позиция /// true - вставка прошла удачно, false - вставка не удалась - bool Insert(T obj, int position); + int Insert(T obj, int position); /// /// Удаление объекта из коллекции с конкретной позиции /// /// Позиция /// true - удаление прошло удачно, false - удаление не удалось - bool Remove(int position); + T? Remove(int position); /// /// Получение объекта по позиции /// diff --git a/MotorBoat/MotorBoat/CollectionGenericObjects/MassiveGenericObjects.cs b/MotorBoat/MotorBoat/CollectionGenericObjects/MassiveGenericObjects.cs index a875b6b..5dd8570 100644 --- a/MotorBoat/MotorBoat/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/MotorBoat/MotorBoat/CollectionGenericObjects/MassiveGenericObjects.cs @@ -1,4 +1,6 @@ -namespace MotorBoat.CollectionGenericObjects; +using MotorBoat.Drawnings; + +namespace MotorBoat.CollectionGenericObjects; /// /// Параметризованный набор объектов @@ -23,26 +25,71 @@ public class MassiveGenericObjects : ICollectionGenericObjects public T? Get(int position) { // TODO проверка позиции - return _collection[position]; + + // return _collection[position]; + if (position <= Count) + { + return _collection[position]; + } + else + return null; } - public bool Insert(T obj) + public int Insert(T obj) { // TODO вставка в свободное место набора - return false; + + // return false; + + for (int i = 0; i < Count; i++) + { + if (_collection[i] == null) + { + _collection[i] = obj; + return i; + } + } + return -1; } - public bool Insert(T obj, int position) + public int Insert(T obj, int position) { // TODO проверка позиции // TODO проверка, что элемент массива по этой позиции пустой, если нет, то // ищется свободное место после этой позиции и идет вставка туда // если нет после, ищем до // TODO вставка - return false; + + // return false; + + if (position < Count) + { + if (_collection[position] == null) + { + _collection[position] = obj; + return position; + } + else + { + for (int i = 0; i < Count; i++) + { + if (_collection[i] == null) + { + _collection[i] = obj; + return i; + } + } + } + } + return -1; } - public bool Remove(int position) + public T? Remove(int position) { // TODO проверка позиции // TODO удаление объекта из массива, присвоив элементу массива значение null - return true; + + // return true; + if (position >= Count || position < 0) return null; + T? myObject = _collection[position]; + _collection[position] = null; + return myObject; } } diff --git a/MotorBoat/MotorBoat/FormBoatCollection.Designer.cs b/MotorBoat/MotorBoat/FormBoatCollection.Designer.cs new file mode 100644 index 0000000..d9c695f --- /dev/null +++ b/MotorBoat/MotorBoat/FormBoatCollection.Designer.cs @@ -0,0 +1,173 @@ +namespace MotorBoat +{ + partial class FormBoatCollection + { + /// + /// 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(); + buttonRemoveBoat = new Button(); + maskedTextBoxPosition = new MaskedTextBox(); + buttonAddMotorBoat = new Button(); + buttonAddBoat = 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(buttonRemoveBoat); + groupBoxTools.Controls.Add(maskedTextBoxPosition); + groupBoxTools.Controls.Add(buttonAddMotorBoat); + groupBoxTools.Controls.Add(buttonAddBoat); + groupBoxTools.Controls.Add(comboBoxSelectorCompany); + groupBoxTools.Dock = DockStyle.Right; + groupBoxTools.Location = new Point(630, 0); + groupBoxTools.Name = "groupBoxTools"; + groupBoxTools.Size = new Size(170, 483); + groupBoxTools.TabIndex = 0; + groupBoxTools.TabStop = false; + groupBoxTools.Text = "Инструменты"; + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(6, 401); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(158, 33); + 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, 319); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(158, 33); + buttonGoToCheck.TabIndex = 5; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += ButtonGoToCheck_Click; + // + // buttonRemoveBoat + // + buttonRemoveBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRemoveBoat.Location = new Point(6, 227); + buttonRemoveBoat.Name = "buttonRemoveBoat"; + buttonRemoveBoat.Size = new Size(158, 32); + buttonRemoveBoat.TabIndex = 4; + buttonRemoveBoat.Text = "Удалить лодку"; + buttonRemoveBoat.UseVisualStyleBackColor = true; + buttonRemoveBoat.Click += ButtonRemoveBoat_Click; + // + // maskedTextBoxPosition + // + maskedTextBoxPosition.Location = new Point(6, 198); + maskedTextBoxPosition.Mask = "00"; + maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + maskedTextBoxPosition.Size = new Size(158, 23); + maskedTextBoxPosition.TabIndex = 3; + maskedTextBoxPosition.ValidatingType = typeof(int); + // + // buttonAddMotorBoat + // + buttonAddMotorBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddMotorBoat.Location = new Point(6, 112); + buttonAddMotorBoat.Name = "buttonAddMotorBoat"; + buttonAddMotorBoat.Size = new Size(158, 38); + buttonAddMotorBoat.TabIndex = 2; + buttonAddMotorBoat.Text = "Добавление моторной лодки"; + buttonAddMotorBoat.UseVisualStyleBackColor = true; + buttonAddMotorBoat.Click += ButtonAddMotorBoat_Click; + // + // buttonAddBoat + // + buttonAddBoat.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddBoat.Location = new Point(6, 71); + buttonAddBoat.Name = "buttonAddBoat"; + buttonAddBoat.Size = new Size(158, 35); + buttonAddBoat.TabIndex = 1; + buttonAddBoat.Text = "Добавление лодки"; + buttonAddBoat.UseVisualStyleBackColor = true; + buttonAddBoat.Click += ButtonAddBoat_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(158, 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(630, 483); + pictureBox.TabIndex = 1; + pictureBox.TabStop = false; + // + // FormBoatCollection + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(800, 483); + Controls.Add(pictureBox); + Controls.Add(groupBoxTools); + Name = "FormBoatCollection"; + Text = "Коллекция лодок"; + groupBoxTools.ResumeLayout(false); + groupBoxTools.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBoxTools; + private Button buttonAddBoat; + private ComboBox comboBoxSelectorCompany; + private Button buttonAddMotorBoat; + private PictureBox pictureBox; + private Button buttonGoToCheck; + private Button buttonRemoveBoat; + private MaskedTextBox maskedTextBoxPosition; + private Button buttonRefresh; + } +} \ No newline at end of file diff --git a/MotorBoat/MotorBoat/FormBoatCollection.cs b/MotorBoat/MotorBoat/FormBoatCollection.cs new file mode 100644 index 0000000..e6784d6 --- /dev/null +++ b/MotorBoat/MotorBoat/FormBoatCollection.cs @@ -0,0 +1,182 @@ +using MotorBoat.CollectionGenericObjects; +using MotorBoat.Drawnings; + +namespace MotorBoat; + +/// +/// Форма работы с компанией и ее коллекцией +/// +public partial class FormBoatCollection : Form +{ + /// + /// Компания + /// + private AbstractCompany? _company = null; + /// + /// Конструктор + /// + public FormBoatCollection() + { + InitializeComponent(); + } + /// + /// Выбор компании + /// + /// + /// + private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorCompany.Text) + { + case "Хранилище": + _company = new Harbor(pictureBox.Width, + pictureBox.Height, new MassiveGenericObjects()); + break; + } + } + + /// + /// Создание объекта класса-перемещения + /// + /// Тип создаваемого объекта + private void CreateObject(string type) + { + if (_company == null) + { + return; + } + Random random = new(); + DrawningBoat drawningBoat; + switch (type) + { + case nameof(DrawningBoat): + drawningBoat = new DrawningBoat(random.Next(100, 300), + random.Next(1000, 3000), GetColor(random)); + break; + case nameof(DrawningMotorBoat): + // TODO вызов диалогового окна для выбора цвета + drawningBoat = new DrawningMotorBoat(random.Next(100, + 300), random.Next(1000, 3000), + Color.FromArgb(random.Next(0, 256), + random.Next(0, 256), random.Next(0, 256)), + Color.FromArgb(random.Next(0, 256), + random.Next(0, 256), random.Next(0, 256)), + Convert.ToBoolean(random.Next(0, 2)), + Convert.ToBoolean(random.Next(0, 2))); + break; + default: + return; + } + if (_company + drawningBoat != -1) + { + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _company.Show(); + } + else + { + MessageBox.Show("Не удалось добавить объект"); + } + } + /// + /// Получение цвета + /// + /// Генератор случайных чисел + /// + private static Color GetColor(Random random) + { + Color color = Color.FromArgb(random.Next(0, 256), random.Next(0, + 256), random.Next(0, 256)); + ColorDialog dialog = new(); + if (dialog.ShowDialog() == DialogResult.OK) + { + color = dialog.Color; + } + return color; + } + + /// + /// Добавление лодки + /// + /// + /// + private void ButtonAddBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBoat)); + /// + /// Добавление моторной лодки + /// + /// + /// + private void ButtonAddMotorBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningMotorBoat)); + /// + /// Удаление лодки + /// + /// + /// + private void ButtonRemoveBoat_Click(object sender, EventArgs e) + { + if (string.IsNullOrEmpty(maskedTextBoxPosition.Text) || _company == null) + { + return; + } + if (MessageBox.Show("Удалить объект?", "Удаление", + MessageBoxButtons.YesNo, MessageBoxIcon.Question) != DialogResult.Yes) + { + return; + } + int pos = Convert.ToInt32(maskedTextBoxPosition.Text); + if (_company - pos != null) + { + MessageBox.Show("Объект удален"); + pictureBox.Image = _company.Show(); + } + else + { + MessageBox.Show("Не удалось удалить объект"); + } + + } + /// + /// Передача объекта в другую форму + /// + /// + /// + private void ButtonGoToCheck_Click(object sender, EventArgs e) + { + if (_company == null) + { + return; + } + DrawningBoat? boat = null; + int counter = 100; + while (boat == null) + { + boat = _company.GetRandomObject(); + counter--; + if (counter <= 0) + { + break; + } + } + if (boat == null) + { + return; + } + FormMotorBoat form = new() + { + SetBoat = boat + }; + form.ShowDialog(); + } + /// + /// Перерисовка коллекции + /// + /// + /// + private void ButtonRefresh_Click(object sender, EventArgs e) + { + if (_company == null) + { + return; + } + pictureBox.Image = _company.Show(); + } +} diff --git a/MotorBoat/MotorBoat/FormBoatCollection.resx b/MotorBoat/MotorBoat/FormBoatCollection.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/MotorBoat/MotorBoat/FormBoatCollection.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/MotorBoat/MotorBoat/FormMotorBoat.Designer.cs b/MotorBoat/MotorBoat/FormMotorBoat.Designer.cs index 961978e..24052e5 100644 --- a/MotorBoat/MotorBoat/FormMotorBoat.Designer.cs +++ b/MotorBoat/MotorBoat/FormMotorBoat.Designer.cs @@ -29,12 +29,10 @@ private void InitializeComponent() { pictureBoxMotorBoat = new PictureBox(); - buttonCreateMotorBoat = new Button(); buttonLeft = new Button(); buttonDown = new Button(); buttonRight = new Button(); buttonUp = new Button(); - buttonCreateBoat = new Button(); comboBoxStrategy = new ComboBox(); buttonStrategyStep = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxMotorBoat).BeginInit(); @@ -49,17 +47,6 @@ pictureBoxMotorBoat.TabIndex = 0; pictureBoxMotorBoat.TabStop = false; // - // buttonCreateMotorBoat - // - buttonCreateMotorBoat.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - buttonCreateMotorBoat.Location = new Point(12, 412); - buttonCreateMotorBoat.Name = "buttonCreateMotorBoat"; - buttonCreateMotorBoat.Size = new Size(174, 23); - buttonCreateMotorBoat.TabIndex = 1; - buttonCreateMotorBoat.Text = "Создать моторную лодку"; - buttonCreateMotorBoat.UseVisualStyleBackColor = true; - buttonCreateMotorBoat.Click += ButtonCreateMotorBoat_Click; - // // buttonLeft // buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; @@ -108,17 +95,6 @@ buttonUp.UseVisualStyleBackColor = true; buttonUp.Click += ButtonMove_Click; // - // buttonCreateBoat - // - buttonCreateBoat.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - buttonCreateBoat.Location = new Point(203, 412); - buttonCreateBoat.Name = "buttonCreateBoat"; - buttonCreateBoat.Size = new Size(174, 23); - buttonCreateBoat.TabIndex = 6; - buttonCreateBoat.Text = "Создать лодку"; - buttonCreateBoat.UseVisualStyleBackColor = true; - buttonCreateBoat.Click += ButtonCreateBoat_Click; - // // comboBoxStrategy // comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; @@ -146,12 +122,10 @@ ClientSize = new Size(861, 447); Controls.Add(buttonStrategyStep); Controls.Add(comboBoxStrategy); - Controls.Add(buttonCreateBoat); Controls.Add(buttonUp); Controls.Add(buttonRight); Controls.Add(buttonDown); Controls.Add(buttonLeft); - Controls.Add(buttonCreateMotorBoat); Controls.Add(pictureBoxMotorBoat); Name = "FormMotorBoat"; Text = "Моторная лодка"; @@ -162,12 +136,10 @@ #endregion private PictureBox pictureBoxMotorBoat; - private Button buttonCreateMotorBoat; private Button buttonLeft; private Button buttonDown; private Button buttonRight; private Button buttonUp; - private Button buttonCreateBoat; private ComboBox comboBoxStrategy; private Button buttonStrategyStep; } diff --git a/MotorBoat/MotorBoat/FormMotorBoat.cs b/MotorBoat/MotorBoat/FormMotorBoat.cs index 8cf446e..1a79bfd 100644 --- a/MotorBoat/MotorBoat/FormMotorBoat.cs +++ b/MotorBoat/MotorBoat/FormMotorBoat.cs @@ -26,6 +26,20 @@ namespace MotorBoat /// private AbstractStrategy? _strategy; /// + /// Получение объекта + /// + public DrawningBoat SetBoat + { + set + { + _drawningBoat = value; ; + _drawningBoat.SetPictureSize(pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height); + comboBoxStrategy.Enabled = true; + _strategy = null; + Draw(); + } + } + /// /// Конструктор формы /// public FormMotorBoat() @@ -48,42 +62,6 @@ namespace MotorBoat _drawningBoat.DrawTransport(gr); pictureBoxMotorBoat.Image = bmp; } - private void CreateObject(string type) - { - Random random = new Random(); - switch (type) - { - case nameof(DrawningBoat): - _drawningBoat = new DrawningBoat(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(DrawningMotorBoat): - _drawningBoat = new DrawningMotorBoat(random.Next(100, 300), random.Next(1000, 3000), - Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), - Color.FromArgb(random.Next(0, 256), random.Next(0, 256), random.Next(0, 256)), - Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); - break; - default: - return; - } - _drawningBoat.SetPictureSize(pictureBoxMotorBoat.Width, pictureBoxMotorBoat.Height); - _drawningBoat.SetPosition(random.Next(10, 100), random.Next(10, 100)); - _strategy = null; - comboBoxStrategy.Enabled = true; - Draw(); - } - /// - /// Обработка нажатия кнопки "Создать моторную лодку" - /// - /// - /// - private void ButtonCreateMotorBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningMotorBoat)); - /// - /// Обработка нажатия кнопки "Создать лодку" - /// - /// - /// - private void ButtonCreateBoat_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningBoat)); /// /// Перемещение объекта по форме (нажатие кнопок навигации) /// diff --git a/MotorBoat/MotorBoat/Program.cs b/MotorBoat/MotorBoat/Program.cs index 6b95e75..4052ad6 100644 --- a/MotorBoat/MotorBoat/Program.cs +++ b/MotorBoat/MotorBoat/Program.cs @@ -9,7 +9,7 @@ namespace MotorBoat static void Main() { ApplicationConfiguration.Initialize(); - Application.Run(new FormMotorBoat()); + Application.Run(new FormBoatCollection()); } } } \ No newline at end of file -- 2.25.1 From 78427c0ce29c83b8c741c765dd89957019bf901f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=B7=D0=B0=D0=BC=D0=B0=D1=82=20=D0=98=D1=88=D1=82?= =?UTF-8?q?=D1=83=D0=B3=D0=B0=D0=BD=D0=BE=D0=B2?= Date: Mon, 8 Apr 2024 21:23:36 +0400 Subject: [PATCH 3/3] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=B4=D0=B8=D0=B0=D0=BB=D0=BE=D0=B3=D0=BE=D0=B2=D0=BE=D0=B5?= =?UTF-8?q?=20=D0=BE=D0=BA=D0=BD=D0=BE=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80?= =?UTF-8?q?=D0=B0=20=D1=86=D0=B2=D0=B5=D1=82=D0=BE=D0=B2=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=BF=D1=80=D0=BE=D0=B4=D0=B2=D0=B8=D0=BD=D1=83=D1=82?= =?UTF-8?q?=D0=BE=D0=B3=D0=BE=20=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- MotorBoat/MotorBoat/FormBoatCollection.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/MotorBoat/MotorBoat/FormBoatCollection.cs b/MotorBoat/MotorBoat/FormBoatCollection.cs index e6784d6..d57a03c 100644 --- a/MotorBoat/MotorBoat/FormBoatCollection.cs +++ b/MotorBoat/MotorBoat/FormBoatCollection.cs @@ -54,13 +54,10 @@ public partial class FormBoatCollection : Form random.Next(1000, 3000), GetColor(random)); break; case nameof(DrawningMotorBoat): - // TODO вызов диалогового окна для выбора цвета drawningBoat = new DrawningMotorBoat(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)), + GetColor(random), + GetColor(random), Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); break; -- 2.25.1