From 6a6aa6fba3ba0dd7fcaf99dfedf5ea1870ede267 Mon Sep 17 00:00:00 2001 From: H0llowVoid Date: Wed, 17 Apr 2024 16:54:41 +0400 Subject: [PATCH 1/2] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=963?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbstractCompany.cs | 119 +++++++++++ .../CraneSharingService.cs | 55 +++++ .../ICollectionGenericObjects.cs | 55 +++++ .../MassiveGenericObjects.cs | 104 +++++++++ .../CollectionGenericObjects/ParamClass1.cs | 12 ++ .../FormCraneCollection.Designer.cs | 173 +++++++++++++++ .../FormCraneCollection.cs | 199 ++++++++++++++++++ .../FormCraneCollection.resx | 120 +++++++++++ .../FormHoistingCrane.Designer.cs | 28 --- .../ProjectHoistingCrane/FormHoistingCrane.cs | 63 ++---- .../ProjectHoistingCrane/Program.cs | 2 +- 11 files changed, 853 insertions(+), 77 deletions(-) create mode 100644 ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/AbstractCompany.cs create mode 100644 ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/CraneSharingService.cs create mode 100644 ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/ICollectionGenericObjects.cs create mode 100644 ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/MassiveGenericObjects.cs create mode 100644 ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/ParamClass1.cs create mode 100644 ProjectHoistingCrane/ProjectHoistingCrane/FormCraneCollection.Designer.cs create mode 100644 ProjectHoistingCrane/ProjectHoistingCrane/FormCraneCollection.cs create mode 100644 ProjectHoistingCrane/ProjectHoistingCrane/FormCraneCollection.resx diff --git a/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/AbstractCompany.cs b/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/AbstractCompany.cs new file mode 100644 index 0000000..2305270 --- /dev/null +++ b/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/AbstractCompany.cs @@ -0,0 +1,119 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using ProjectHoistingCrane.Drawnings; + +namespace ProjectHoistingCrane.CollectionGenericObjects; + +/// +/// Абстракция компании, хранящей коллекцию кранов +/// +public abstract class AbstractCompany +{ + /// + /// Размер места (ширина) + /// + protected readonly int _placeSizeWidth = 118; + + /// + /// Размер места (высота) + /// + protected readonly int _placeSizeHeight = 60; + + /// + /// Ширина окна + /// + protected readonly int _pictureWidth; + + /// + /// Высота окна + /// + protected readonly int _pictureHeight; + + /// + /// Коллекция автомобилей + /// + protected ICollectionGenericObjects? _collection = null; + + /// + /// Вычисление максимального количества элементов, который можно разместить в окне + /// + private int GetMaxCount => (_pictureWidth / _placeSizeWidth) * (_pictureHeight /_placeSizeHeight); + + /// + /// Конструктор + /// + /// Ширина окна + /// Высота окна + /// Коллекция автомобилей + public AbstractCompany(int picWidth, int picHeight, ICollectionGenericObjects collection) + { + _pictureWidth = picWidth; + _pictureHeight = picHeight; + _collection = collection; + _collection.SetMaxCount = GetMaxCount; + } + + /// + /// Перегрузка оператора сложения для класса + /// + /// Компания + /// Добавляемый объект + /// + public static int operator +(AbstractCompany company, DrawningCrane crane) + { + return company._collection.Insert(crane); + } + + /// + /// Перегрузка оператора удаления для класса + /// + /// Компания + /// Номер удаляемого объекта + /// + public static DrawningCrane operator -(AbstractCompany company, int position) + { + return company._collection.Remove(position); + } + + /// + /// Получение случайного объекта из коллекции + /// + /// + public DrawningCrane? 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) + { + DrawningCrane? obj = _collection?.Get(i); + obj?.DrawTransport(graphics); + } + return bitmap; + } + + /// + /// Вывод заднего фона + /// + /// + protected abstract void DrawBackgound(Graphics g); + + /// + /// Расстановка объектов + /// + protected abstract void SetObjectsPosition(); +} diff --git a/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/CraneSharingService.cs b/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/CraneSharingService.cs new file mode 100644 index 0000000..3f6aec3 --- /dev/null +++ b/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/CraneSharingService.cs @@ -0,0 +1,55 @@ +using ProjectHoistingCrane.Drawnings; +using static System.Windows.Forms.AxHost; +using System.Drawing; + +namespace ProjectHoistingCrane.CollectionGenericObjects; + +public class CraneSharingService : AbstractCompany +{ + public CraneSharingService(int picWidth, int picHeight, ICollectionGenericObjects collection) : base(picWidth, picHeight, collection) + { + } + + protected override void DrawBackgound(Graphics g) + { + Pen pen = new(Color.Black); + int startX = 0; + int startY = 0; + g.DrawLine(pen, startX, startY, _placeSizeWidth-10, startY); + for (int i = 1; i <= (_pictureWidth / _placeSizeWidth) * (_pictureHeight / _placeSizeHeight); i++) + { + g.DrawLine(pen, startX, startY, startX, startY + _placeSizeHeight); + g.DrawLine(pen, startX, startY+_placeSizeHeight, startX-10 + _placeSizeWidth, startY + _placeSizeHeight); + startY += _placeSizeHeight; + if (startY + _placeSizeHeight > _pictureHeight) + { + startX += _placeSizeWidth; + startY = 0; + if (i+1 <= (_pictureWidth / _placeSizeWidth) * (_pictureHeight / _placeSizeHeight)) + { + g.DrawLine(pen, startX, startY, startX + _placeSizeWidth - 10, startY); + } + } + } + } + + protected override void SetObjectsPosition() + { + int startX = _placeSizeWidth * ((_pictureWidth / _placeSizeWidth)-1); + int startY = _placeSizeHeight * ((_pictureHeight / _placeSizeHeight)-1); + for (int i = 0; i < (_pictureWidth / _placeSizeWidth) * (_pictureHeight /_placeSizeHeight); i++) + { + if (_collection?.Get(i) != null) + { + _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight); + _collection?.Get(i)?.SetPosition(startX+2, startY+2); + } + startX -= _placeSizeWidth; + if (startX < 0) + { + startY -= _placeSizeHeight; + startX = _placeSizeWidth * ((_pictureWidth / _placeSizeWidth) - 1); + } + } + } +} diff --git a/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/ICollectionGenericObjects.cs new file mode 100644 index 0000000..1708b1a --- /dev/null +++ b/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -0,0 +1,55 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectHoistingCrane.CollectionGenericObjects; + +public interface ICollectionGenericObjects + where T : class +{ + /// + ///Количество элементов в коллекции + /// + int Count { get; } + + /// + ///Установка максимального количества элементов + /// + int SetMaxCount { set; } + + /// + ///Добавление объекта в коллекцию + /// + ///Добавляемый объект + ///true - вставка прошла удачно, false - вставка не удалась + int Insert(T obj); + + /// + ///Добавление объекта в коллекцию на конкретную позицию + /// + ///Добавляемый объект + ///Позиция + ///true - вставка прошла удачно, false - вставка не удалась + int Insert(T obj, int position); + + /// + ///Удаление объекта из коллекции с конкретной позиции + /// + ///Позиция + ///true - удаление прошло удачно, false - удаление не удалось + T? Remove(int position); + + /// + ///Получение объекта по позиции + /// + ///Позиция + ///Объект + T? Get(int position); + + + + + +} diff --git a/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/MassiveGenericObjects.cs new file mode 100644 index 0000000..a992d38 --- /dev/null +++ b/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/MassiveGenericObjects.cs @@ -0,0 +1,104 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectHoistingCrane.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 проверка позиции + + if (0 <= position && position <= Count) { + return _collection[position]; + } + return null; + } + + public int Insert(T obj) + { + // TODO вставка в свободное место набора + + for (int i = 0; i < Count; i++) + { + if (_collection[i] == null) + { + _collection[i] = obj; + return i; + } + } + return -1; + } + + public int Insert(T obj, int position) + { + // TODO проверка позиции + // TODO проверка что элемент массива по этой позиции пустой, если нет, то + // ищется свободное место после этой позиции и идёт вставка туда + // если нет после, ищем до + // TODO вставка + + if (0 <= position && position <= Count && _collection[position] != null) + { + if (_collection[position] == null) { + _collection[position] = obj; + return position; + } + else { + for (int i = position+1; i < Count; i++) + { + if (_collection[i] == null) + { + _collection[i] = obj; + return i; + } + } + for (int i = position-1;i >= 0;i--) { + if (_collection[i] == null) + { + _collection[i] = obj; + return i; + } + } + } + } + return -1; + } + + public T? Remove(int position) + { + // TODO проверка позиции + // TODO удаление объекта из массива, присвоив элементу массива значени null + + if (0 <= position && position <= Count && _collection[position] != null) + { + T? obj = _collection[position]; + _collection[position] = null; + return obj; + } + return null; + } +} diff --git a/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/ParamClass1.cs b/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/ParamClass1.cs new file mode 100644 index 0000000..fd15b6d --- /dev/null +++ b/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/ParamClass1.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectHoistingCrane.CollectionGenericObjects +{ + internal class ParamClass1 + { + } +} diff --git a/ProjectHoistingCrane/ProjectHoistingCrane/FormCraneCollection.Designer.cs b/ProjectHoistingCrane/ProjectHoistingCrane/FormCraneCollection.Designer.cs new file mode 100644 index 0000000..9d07998 --- /dev/null +++ b/ProjectHoistingCrane/ProjectHoistingCrane/FormCraneCollection.Designer.cs @@ -0,0 +1,173 @@ +namespace ProjectHoistingCrane +{ + partial class FormCraneCollection + { + /// + /// 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(); + buttonRemoveCrane = new Button(); + maskedTextBoxPosition = new MaskedTextBox(); + buttonAddHoistingCrane = new Button(); + buttonAddCrane = 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(buttonRemoveCrane); + groupBoxTools.Controls.Add(maskedTextBoxPosition); + groupBoxTools.Controls.Add(buttonAddHoistingCrane); + groupBoxTools.Controls.Add(buttonAddCrane); + groupBoxTools.Controls.Add(comboBoxSelectorCompany); + groupBoxTools.Dock = DockStyle.Right; + groupBoxTools.Location = new Point(738, 0); + groupBoxTools.Name = "groupBoxTools"; + groupBoxTools.Size = new Size(222, 618); + groupBoxTools.TabIndex = 0; + groupBoxTools.TabStop = false; + groupBoxTools.Text = "Инструменты"; + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(24, 513); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.Size = new Size(163, 53); + 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(24, 382); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.Size = new Size(163, 53); + buttonGoToCheck.TabIndex = 5; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += ButtonGoToCheck_Click; + // + // buttonRemoveCrane + // + buttonRemoveCrane.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRemoveCrane.Location = new Point(24, 277); + buttonRemoveCrane.Name = "buttonRemoveCrane"; + buttonRemoveCrane.Size = new Size(163, 53); + buttonRemoveCrane.TabIndex = 4; + buttonRemoveCrane.Text = "Удалить кран"; + buttonRemoveCrane.UseVisualStyleBackColor = true; + buttonRemoveCrane.Click += ButtonRemoveCrane_Click; + // + // maskedTextBoxPosition + // + maskedTextBoxPosition.Location = new Point(6, 244); + maskedTextBoxPosition.Mask = "00"; + maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + maskedTextBoxPosition.Size = new Size(210, 27); + maskedTextBoxPosition.TabIndex = 3; + maskedTextBoxPosition.ValidatingType = typeof(int); + // + // buttonAddHoistingCrane + // + buttonAddHoistingCrane.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddHoistingCrane.Location = new Point(24, 139); + buttonAddHoistingCrane.Name = "buttonAddHoistingCrane"; + buttonAddHoistingCrane.Size = new Size(163, 53); + buttonAddHoistingCrane.TabIndex = 2; + buttonAddHoistingCrane.Text = "Добавление подъёмного крана"; + buttonAddHoistingCrane.UseVisualStyleBackColor = true; + buttonAddHoistingCrane.Click += ButtonAddHoistingCrane_Click; + // + // buttonAddCrane + // + buttonAddCrane.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddCrane.Location = new Point(24, 80); + buttonAddCrane.Name = "buttonAddCrane"; + buttonAddCrane.Size = new Size(163, 53); + buttonAddCrane.TabIndex = 1; + buttonAddCrane.Text = "Добавление крана"; + buttonAddCrane.UseVisualStyleBackColor = true; + buttonAddCrane.Click += ButtonAddCrane_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, 26); + comboBoxSelectorCompany.Name = "comboBoxSelectorCompany"; + comboBoxSelectorCompany.Size = new Size(210, 28); + 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(738, 618); + pictureBox.TabIndex = 1; + pictureBox.TabStop = false; + // + // FormCraneCollection + // + AutoScaleDimensions = new SizeF(8F, 20F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(960, 618); + Controls.Add(pictureBox); + Controls.Add(groupBoxTools); + Name = "FormCraneCollection"; + Text = "Коллекция кранов"; + groupBoxTools.ResumeLayout(false); + groupBoxTools.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBoxTools; + private ComboBox comboBoxSelectorCompany; + private Button buttonAddHoistingCrane; + private Button buttonAddCrane; + private Button buttonRemoveCrane; + private MaskedTextBox maskedTextBoxPosition; + private PictureBox pictureBox; + private Button buttonRefresh; + private Button buttonGoToCheck; + } +} \ No newline at end of file diff --git a/ProjectHoistingCrane/ProjectHoistingCrane/FormCraneCollection.cs b/ProjectHoistingCrane/ProjectHoistingCrane/FormCraneCollection.cs new file mode 100644 index 0000000..9783e1d --- /dev/null +++ b/ProjectHoistingCrane/ProjectHoistingCrane/FormCraneCollection.cs @@ -0,0 +1,199 @@ +using ProjectHoistingCrane.CollectionGenericObjects; +using ProjectHoistingCrane.Drawnings; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; + +namespace ProjectHoistingCrane; + +/// +/// Форма работы с компанией и её коллекцией +/// +public partial class FormCraneCollection : Form +{ + /// + /// Компания + /// + private AbstractCompany? _company = null; + + /// + /// Конструктор + /// + public FormCraneCollection() + { + InitializeComponent(); + } + + /// + /// Выбор компании + /// + /// + /// + private void comboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorCompany.Text) + { + case "Хранилище": + _company = new CraneSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects()); + break; + } + + } + + /// + /// Добавление обычного крана + /// + /// + /// + private void ButtonAddCrane_Click(object sender, EventArgs e) + { + CreateObject(nameof(DrawningCrane)); + } + + + /// + /// Добавление подъёмного крана + /// + /// + /// + private void ButtonAddHoistingCrane_Click(object sender, EventArgs e) + { + CreateObject(nameof(DrawningHoistingCrane)); + } + + /// + /// Создание объекта класса-перемещения + /// + /// Тип создаваемого объекта + private void CreateObject(string type) + { + if (_company == null) + { + return; + } + Random random = new(); + DrawningCrane drawningCrane; + switch (type) + { + case nameof(DrawningCrane): + drawningCrane = new DrawningCrane(random.Next(100, 300), + random.Next(1000, 3000), GetColor(random)); + break; + case nameof(DrawningHoistingCrane): + // TODO вызов диалогового окна для выбора цвета + drawningCrane = new DrawningHoistingCrane(random.Next(100, 300), random.Next(1000, 3000), GetColor(random), GetColor(random), + Convert.ToBoolean(random.Next(0, 2)), + Convert.ToBoolean(random.Next(0, 2))); + break; + default: + return; + } + if (_company + drawningCrane > -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 ButtonRemoveCrane_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; + } + DrawningCrane? crane = null; + int counter = 100; + while (crane == null) + { + crane = _company.GetRandomObject(); + counter--; + if (counter <= 0) + { + break; + } + } + if (crane == null) + { + return; + } + FormHoistingCrane form = new() + { + SetCar = crane + }; + form.ShowDialog(); + } + + /// + /// Перерисовка коллекции + /// + /// + /// + private void ButtonRefresh_Click(object sender, EventArgs e) + { + if (_company == null) + { + return; + } + pictureBox.Image = _company.Show(); + } +} diff --git a/ProjectHoistingCrane/ProjectHoistingCrane/FormCraneCollection.resx b/ProjectHoistingCrane/ProjectHoistingCrane/FormCraneCollection.resx new file mode 100644 index 0000000..af32865 --- /dev/null +++ b/ProjectHoistingCrane/ProjectHoistingCrane/FormCraneCollection.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/ProjectHoistingCrane/ProjectHoistingCrane/FormHoistingCrane.Designer.cs b/ProjectHoistingCrane/ProjectHoistingCrane/FormHoistingCrane.Designer.cs index c077d90..714ff6a 100644 --- a/ProjectHoistingCrane/ProjectHoistingCrane/FormHoistingCrane.Designer.cs +++ b/ProjectHoistingCrane/ProjectHoistingCrane/FormHoistingCrane.Designer.cs @@ -30,12 +30,10 @@ { pictureBox1 = new PictureBox(); pictureBoxHoistingCrane = new PictureBox(); - buttonCreateHoistingCrane = new Button(); buttonLeft = new Button(); buttonUp = new Button(); buttonRight = new Button(); buttonDown = new Button(); - buttonCreateCrane = new Button(); comboBoxStrategy = new ComboBox(); StepButton = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBox1).BeginInit(); @@ -62,17 +60,6 @@ pictureBoxHoistingCrane.TabIndex = 1; pictureBoxHoistingCrane.TabStop = false; // - // buttonCreateHoistingCrane - // - buttonCreateHoistingCrane.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - buttonCreateHoistingCrane.Location = new Point(24, 402); - buttonCreateHoistingCrane.Name = "buttonCreateHoistingCrane"; - buttonCreateHoistingCrane.Size = new Size(210, 29); - buttonCreateHoistingCrane.TabIndex = 2; - buttonCreateHoistingCrane.Text = "Создать подъёмный кран"; - buttonCreateHoistingCrane.UseVisualStyleBackColor = true; - buttonCreateHoistingCrane.Click += buttonCreateHoistingCrane_Click; - // // buttonLeft // buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; @@ -121,17 +108,6 @@ buttonDown.UseVisualStyleBackColor = true; buttonDown.Click += buttonMove_Click; // - // buttonCreateCrane - // - buttonCreateCrane.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - buttonCreateCrane.Location = new Point(240, 401); - buttonCreateCrane.Name = "buttonCreateCrane"; - buttonCreateCrane.Size = new Size(210, 29); - buttonCreateCrane.TabIndex = 7; - buttonCreateCrane.Text = "Создать кран"; - buttonCreateCrane.UseVisualStyleBackColor = true; - buttonCreateCrane.Click += buttonCreateCrane_Click; - // // comboBoxStrategy // comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; @@ -159,12 +135,10 @@ ClientSize = new Size(682, 453); Controls.Add(StepButton); Controls.Add(comboBoxStrategy); - Controls.Add(buttonCreateCrane); Controls.Add(buttonDown); Controls.Add(buttonRight); Controls.Add(buttonUp); Controls.Add(buttonLeft); - Controls.Add(buttonCreateHoistingCrane); Controls.Add(pictureBoxHoistingCrane); Controls.Add(pictureBox1); Name = "FormHoistingCrane"; @@ -180,12 +154,10 @@ private PictureBox pictureBox1; private PictureBox pictureBoxHoistingCrane; - private Button buttonCreateHoistingCrane; private Button buttonLeft; private Button buttonUp; private Button buttonRight; private Button buttonDown; - private Button buttonCreateCrane; private ComboBox comboBoxStrategy; private Button StepButton; } diff --git a/ProjectHoistingCrane/ProjectHoistingCrane/FormHoistingCrane.cs b/ProjectHoistingCrane/ProjectHoistingCrane/FormHoistingCrane.cs index aef34a2..9ae3633 100644 --- a/ProjectHoistingCrane/ProjectHoistingCrane/FormHoistingCrane.cs +++ b/ProjectHoistingCrane/ProjectHoistingCrane/FormHoistingCrane.cs @@ -17,6 +17,21 @@ public partial class FormHoistingCrane : Form /// private AbstractStrategy? _strategy; + /// + /// + /// + public DrawningCrane SetCar + { + set + { + _drawningCrane = value; + _drawningCrane.SetPictureSize(pictureBoxHoistingCrane.Width, pictureBoxHoistingCrane.Height); + comboBoxStrategy.Enabled = true; + _strategy = null; + Draw(); + } + } + /// /// /// @@ -43,54 +58,6 @@ public partial class FormHoistingCrane : Form pictureBoxHoistingCrane.Image = bmp; } - /// - /// - - /// - /// - private void CreateObject(string type) - { - Random random = new(); - switch (type) - { - case nameof(DrawningCrane): - _drawningCrane = new DrawningCrane(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(DrawningHoistingCrane): - _drawningCrane = new DrawningHoistingCrane(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; - } - _drawningCrane.SetPictureSize(pictureBoxHoistingCrane.Width, pictureBoxHoistingCrane.Height); - _drawningCrane.SetPosition(random.Next(10, 100), random.Next(10, 100)); - _strategy = null; - comboBoxStrategy.Enabled = true; - Draw(); - } - - /// - /// " " - /// - /// - /// - private void buttonCreateHoistingCrane_Click(object sender, EventArgs e) - { - CreateObject(nameof(DrawningHoistingCrane)); - } - - /// - /// " " - /// - /// - /// - private void buttonCreateCrane_Click(object sender, EventArgs e) - { - CreateObject(nameof(DrawningCrane)); - } - /// /// ( ) /// diff --git a/ProjectHoistingCrane/ProjectHoistingCrane/Program.cs b/ProjectHoistingCrane/ProjectHoistingCrane/Program.cs index 5d92f2a..17a84d1 100644 --- a/ProjectHoistingCrane/ProjectHoistingCrane/Program.cs +++ b/ProjectHoistingCrane/ProjectHoistingCrane/Program.cs @@ -11,7 +11,7 @@ namespace ProjectHoistingCrane // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormHoistingCrane()); + Application.Run(new FormCraneCollection()); } } } \ No newline at end of file -- 2.25.1 From c8bb1b3c313ffa003b0e668855b283ceb6b7f735 Mon Sep 17 00:00:00 2001 From: H0llowVoid Date: Thu, 18 Apr 2024 22:39:34 +0400 Subject: [PATCH 2/2] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82?= =?UTF-8?q?=D0=B0=20=E2=84=963?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectAiSD/ProjectAiSD.sln | 31 ---- ProjectAiSD/ProjectAiSD/FileAiSD.c | 0 ProjectAiSD/ProjectAiSD/ProjectAiSD.vcxproj | 138 ------------------ .../ProjectAiSD/ProjectAiSD.vcxproj.filters | 17 --- .../{CraneSharingService.cs => Garage.cs} | 4 +- .../CollectionGenericObjects/ParamClass1.cs | 12 -- .../FormCraneCollection.cs | 3 +- 7 files changed, 3 insertions(+), 202 deletions(-) delete mode 100644 ProjectAiSD/ProjectAiSD.sln delete mode 100644 ProjectAiSD/ProjectAiSD/FileAiSD.c delete mode 100644 ProjectAiSD/ProjectAiSD/ProjectAiSD.vcxproj delete mode 100644 ProjectAiSD/ProjectAiSD/ProjectAiSD.vcxproj.filters rename ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/{CraneSharingService.cs => Garage.cs} (90%) delete mode 100644 ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/ParamClass1.cs diff --git a/ProjectAiSD/ProjectAiSD.sln b/ProjectAiSD/ProjectAiSD.sln deleted file mode 100644 index d414e0a..0000000 --- a/ProjectAiSD/ProjectAiSD.sln +++ /dev/null @@ -1,31 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.8.34330.188 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ProjectAiSD", "ProjectAiSD\ProjectAiSD.vcxproj", "{1203BB93-5B4B-446F-9CD3-4E1FBC19A791}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {1203BB93-5B4B-446F-9CD3-4E1FBC19A791}.Debug|x64.ActiveCfg = Debug|x64 - {1203BB93-5B4B-446F-9CD3-4E1FBC19A791}.Debug|x64.Build.0 = Debug|x64 - {1203BB93-5B4B-446F-9CD3-4E1FBC19A791}.Debug|x86.ActiveCfg = Debug|Win32 - {1203BB93-5B4B-446F-9CD3-4E1FBC19A791}.Debug|x86.Build.0 = Debug|Win32 - {1203BB93-5B4B-446F-9CD3-4E1FBC19A791}.Release|x64.ActiveCfg = Release|x64 - {1203BB93-5B4B-446F-9CD3-4E1FBC19A791}.Release|x64.Build.0 = Release|x64 - {1203BB93-5B4B-446F-9CD3-4E1FBC19A791}.Release|x86.ActiveCfg = Release|Win32 - {1203BB93-5B4B-446F-9CD3-4E1FBC19A791}.Release|x86.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {6902D87F-9F53-4C0D-8571-543876503D6B} - EndGlobalSection -EndGlobal diff --git a/ProjectAiSD/ProjectAiSD/FileAiSD.c b/ProjectAiSD/ProjectAiSD/FileAiSD.c deleted file mode 100644 index e69de29..0000000 diff --git a/ProjectAiSD/ProjectAiSD/ProjectAiSD.vcxproj b/ProjectAiSD/ProjectAiSD/ProjectAiSD.vcxproj deleted file mode 100644 index 7c6c389..0000000 --- a/ProjectAiSD/ProjectAiSD/ProjectAiSD.vcxproj +++ /dev/null @@ -1,138 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - - 17.0 - Win32Proj - {1203bb93-5b4b-446f-9cd3-4e1fbc19a791} - ProjectAiSD - 10.0 - - - - Application - true - v143 - Unicode - - - Application - false - v143 - true - Unicode - - - Application - true - v143 - Unicode - - - Application - false - v143 - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - Level3 - true - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - true - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level3 - true - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - Level3 - true - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - - - - diff --git a/ProjectAiSD/ProjectAiSD/ProjectAiSD.vcxproj.filters b/ProjectAiSD/ProjectAiSD/ProjectAiSD.vcxproj.filters deleted file mode 100644 index 153170c..0000000 --- a/ProjectAiSD/ProjectAiSD/ProjectAiSD.vcxproj.filters +++ /dev/null @@ -1,17 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - \ No newline at end of file diff --git a/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/CraneSharingService.cs b/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/Garage.cs similarity index 90% rename from ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/CraneSharingService.cs rename to ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/Garage.cs index 3f6aec3..01ae82b 100644 --- a/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/CraneSharingService.cs +++ b/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/Garage.cs @@ -4,9 +4,9 @@ using System.Drawing; namespace ProjectHoistingCrane.CollectionGenericObjects; -public class CraneSharingService : AbstractCompany +public class Garage : AbstractCompany { - public CraneSharingService(int picWidth, int picHeight, ICollectionGenericObjects collection) : base(picWidth, picHeight, collection) + public Garage(int picWidth, int picHeight, ICollectionGenericObjects collection) : base(picWidth, picHeight, collection) { } diff --git a/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/ParamClass1.cs b/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/ParamClass1.cs deleted file mode 100644 index fd15b6d..0000000 --- a/ProjectHoistingCrane/ProjectHoistingCrane/CollectionGenericObjects/ParamClass1.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace ProjectHoistingCrane.CollectionGenericObjects -{ - internal class ParamClass1 - { - } -} diff --git a/ProjectHoistingCrane/ProjectHoistingCrane/FormCraneCollection.cs b/ProjectHoistingCrane/ProjectHoistingCrane/FormCraneCollection.cs index 9783e1d..14a77bd 100644 --- a/ProjectHoistingCrane/ProjectHoistingCrane/FormCraneCollection.cs +++ b/ProjectHoistingCrane/ProjectHoistingCrane/FormCraneCollection.cs @@ -40,10 +40,9 @@ public partial class FormCraneCollection : Form switch (comboBoxSelectorCompany.Text) { case "Хранилище": - _company = new CraneSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects()); + _company = new Garage(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects()); break; } - } /// -- 2.25.1