From c20e24d2ed9d935a4af8238a1ec2e1d6ddc88fa1 Mon Sep 17 00:00:00 2001 From: MorozovDanil Date: Sun, 31 Mar 2024 23:14:21 +0400 Subject: [PATCH 1/8] =?UTF-8?q?=D1=81=D1=80=D0=B0=D0=B7=D1=83=20=D0=BF?= =?UTF-8?q?=D0=BE=D0=BF=D1=80=D0=B0=D0=B2=D0=B8=D0=BB=20=D0=BF=D1=80=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D1=81=D0=BE=D0=B2=D0=BA=D1=83=20(=D1=82=D0=B5?= =?UTF-8?q?=D0=BF=D0=B5=D1=80=D1=8C=20=D0=B2=D1=81=D0=B5=20=D0=B3=D1=83?= =?UTF-8?q?=D0=B4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Drawnings/DrawningContainerShip.cs | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/ProjectContainerShip/ProjectContainerShip/Drawnings/DrawningContainerShip.cs b/ProjectContainerShip/ProjectContainerShip/Drawnings/DrawningContainerShip.cs index 10eb41b..4c9e6b5 100644 --- a/ProjectContainerShip/ProjectContainerShip/Drawnings/DrawningContainerShip.cs +++ b/ProjectContainerShip/ProjectContainerShip/Drawnings/DrawningContainerShip.cs @@ -35,6 +35,18 @@ public class DrawningContainerShip : DrawningShip base.DrawTransport(g); _startPosX -= 5; _startPosY -= 30; + + // контейнеры + if (containerShip.Container) + { + g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 55, 40, 5); + g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 55, 40, 5); + g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 50, 40, 5); + g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 50, 40, 5); + g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 45, 40, 5); + g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 45, 40, 5); + } + // кран if (containerShip.Crane) { @@ -47,21 +59,6 @@ public class DrawningContainerShip : DrawningShip } - - //base.DrawTransport(g); - - - // контейнеры - if (containerShip.Container) - { - g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 55, 40, 5); - g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 55, 40, 5); - g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 50, 40, 5); - g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 50, 40, 5); - g.DrawRectangle(pen, _startPosX.Value + 60, _startPosY.Value + 45, 40, 5); - g.FillRectangle(additionalBrush, _startPosX.Value + 60, _startPosY.Value + 45, 40, 5); - } - //base.DrawTransport(g); _startPosX += 5; _startPosY += 30; -- 2.25.1 From 9aeb01c89e38ac4ebee36ded4ac7dd45112b75f7 Mon Sep 17 00:00:00 2001 From: MorozovDanil Date: Mon, 1 Apr 2024 00:18:42 +0400 Subject: [PATCH 2/8] =?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=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ICollectionGenericObjects.cs | 50 ++++++++ .../MassiveGenericObjects.cs | 109 ++++++++++++++++++ 2 files changed, 159 insertions(+) create mode 100644 ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ICollectionGenericObjects.cs create mode 100644 ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs diff --git a/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ICollectionGenericObjects.cs new file mode 100644 index 0000000..f537a94 --- /dev/null +++ b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace ProjectContainerShip.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/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs new file mode 100644 index 0000000..b5625b4 --- /dev/null +++ b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs @@ -0,0 +1,109 @@ +namespace ProjectContainerShip.CollectionGenericObjects; + +/// +/// Параметризованный набор объектов +/// +/// Параметр: ограничение - ссылочный тип +public class MassiveGenericObjects : ICollectionGenericObjects + where T : class +{ + /// + /// Массив объектов, которые храним + /// + private T?[] _collection; + + public int Count => _collection.Length; + + public int SetMaxCount + { + set + { + if (value > 0) + { + if (_collection.Length > 0) + { + Array.Resize(ref _collection, value); + } + else + { + _collection = new T?[value]; + } + } + } + } + + /// + /// Конструктор + /// + public MassiveGenericObjects() + { + _collection = Array.Empty(); + } + + public T? Get(int position) + { + if (position >= 0 && position < Count) + { + return _collection[position]; + } + + return null; + } + + public int Insert(T obj) + { + 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) + { + + if (position < 0 || position >= Count) + { + return -1; + } + if (_collection[position] == null) + { + _collection[position] = obj; + return position; + } + 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) + { + if (position < 0 || position >= Count) + { + return null; + } + T obj = _collection[position]; + _collection[position] = null; + return obj; + } +} +} \ No newline at end of file -- 2.25.1 From 2042563c0308087e27d1b9e253d73256eaa08679 Mon Sep 17 00:00:00 2001 From: MorozovDanil Date: Mon, 1 Apr 2024 03:37:23 +0400 Subject: [PATCH 3/8] =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=B0=20?= =?UTF-8?q?=D0=BA=20=D1=81=D0=B4=D0=B0=D1=87=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbstractCompany.cs | 115 +++++++++++ .../ICollectionGenericObjects.cs | 13 +- .../MassiveGenericObjects.cs | 11 +- .../ShipSharingService.cs | 65 ++++++ .../Entities/EntityContainerShip.cs | 2 +- .../FormContainerShip.Designer.cs | 28 --- .../ProjectContainerShip/FormContainerShip.cs | 59 ++---- .../FormShipCollection.Designer.cs | 177 ++++++++++++++++ .../FormShipCollection.cs | 189 ++++++++++++++++++ .../FormShipCollection.resx | 126 ++++++++++++ .../ProjectContainerShip/Program.cs | 2 +- 11 files changed, 698 insertions(+), 89 deletions(-) create mode 100644 ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/AbstractCompany.cs create mode 100644 ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ShipSharingService.cs create mode 100644 ProjectContainerShip/ProjectContainerShip/FormShipCollection.Designer.cs create mode 100644 ProjectContainerShip/ProjectContainerShip/FormShipCollection.cs create mode 100644 ProjectContainerShip/ProjectContainerShip/FormShipCollection.resx diff --git a/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/AbstractCompany.cs b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/AbstractCompany.cs new file mode 100644 index 0000000..af1727a --- /dev/null +++ b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/AbstractCompany.cs @@ -0,0 +1,115 @@ +using ProjectContainerShip.Drawnings; + +namespace ProjectContainerShip.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 int operator +(AbstractCompany company, DrawningShip boat) + { + return company._collection?.Insert(boat) ?? -1; + } + + /// + /// Перегрузка оператора удаления для класса + /// + /// Компания + /// Номер удаляемого объекта + /// + public static DrawningShip operator -(AbstractCompany company, int position) + { + return company._collection?.Remove(position) ?? null; + } + + /// + /// Получение случайного объекта из коллекции + /// + /// + public DrawningShip? GetRandomObject() + { + Random rnd = new(); + return _collection?.Get(rnd.Next(GetMaxCount)); + } + + /// + /// Вывод всей коллекции + /// + /// + public Bitmap? Show() + { + Bitmap bitmap = new(_pictureWidth, _pictureHeight); + Graphics graphics = Graphics.FromImage(bitmap); + DrawBackground(graphics); + + SetObjectsPosition(); + for (int i = 0; i < (_collection?.Count ?? 0); ++i) + { + DrawningShip? obj = _collection?.Get(i); + obj?.DrawTransport(graphics); + } + + return bitmap; + } + + /// + /// Вывод заднего фона + /// + /// + protected abstract void DrawBackground(Graphics g); + + /// + /// Расстановка объектов + /// + protected abstract void SetObjectsPosition(); +} diff --git a/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ICollectionGenericObjects.cs index f537a94..2dc17b3 100644 --- a/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ICollectionGenericObjects.cs +++ b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -1,9 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - + namespace ProjectContainerShip.CollectionGenericObjects; public interface ICollectionGenericObjects @@ -24,7 +19,7 @@ public interface ICollectionGenericObjects /// /// Добавляемый объект /// true - вставка прошла удачно, false - вставка не удалась - bool Insert (T obj); + int Insert (T obj); /// /// Добавление объекта в коллекцию на конкретную позицию @@ -32,14 +27,14 @@ public interface ICollectionGenericObjects /// /// Добавляемый объект /// /// Позиция /// 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/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs index b5625b4..abe67dc 100644 --- a/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs @@ -33,9 +33,9 @@ public class MassiveGenericObjects : ICollectionGenericObjects } /// - /// Конструктор - /// - public MassiveGenericObjects() + /// Конструктор + /// + public MassiveGenericObjects() { _collection = Array.Empty(); } @@ -65,7 +65,6 @@ public class MassiveGenericObjects : ICollectionGenericObjects public int Insert(T obj, int position) { - if (position < 0 || position >= Count) { return -1; @@ -75,6 +74,7 @@ public class MassiveGenericObjects : ICollectionGenericObjects _collection[position] = obj; return position; } + for (int i = position + 1; i < Count; i++) { if (_collection[i] == null) @@ -98,12 +98,11 @@ public class MassiveGenericObjects : ICollectionGenericObjects public T Remove(int position) { if (position < 0 || position >= Count) - { + { return null; } T obj = _collection[position]; _collection[position] = null; return obj; } -} } \ No newline at end of file diff --git a/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ShipSharingService.cs b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ShipSharingService.cs new file mode 100644 index 0000000..d2e7c60 --- /dev/null +++ b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/ShipSharingService.cs @@ -0,0 +1,65 @@ +using ProjectContainerShip.Drawnings; + +namespace ProjectContainerShip.CollectionGenericObjects; + +public class ShipSharingService : AbstractCompany +{ + private List> locCoord = new List>(); + private int numRows, numCols; + /// + /// Конструктор + /// + /// + /// + /// + public ShipSharingService(int picWidth, int picHeight, ICollectionGenericObjects collection) : base(picWidth, picHeight, collection) + { + } + + protected override void DrawBackground(Graphics g) + { + //Color backgroundColor = Color.SkyBlue; + //using (Brush brush = new SolidBrush(backgroundColor)) + //{ + // g.FillRectangle(brush, new Rectangle(0, 0, _pictureWidth, _pictureHeight)); + //} + Pen pen = new Pen(Color.Brown, 3); + int offsetX = 10, offsetY = -12; + int x = 1 + offsetX, y = _pictureHeight - _placeSizeHeight + offsetY; + numRows = 0; + while (y >= 0) + { + int numCols = 0; + while (x + _placeSizeWidth <= _pictureWidth) + { + numCols++; + g.DrawLine(pen, x, y, x + _placeSizeWidth / 2, y); + g.DrawLine(pen, x, y, x, y + _placeSizeHeight + 8); + locCoord.Add(new Tuple(x, y)); + x += _placeSizeWidth + 2; + } + numRows++; + x = 1 + offsetX; + y -= _placeSizeHeight + 5 + offsetY; + } + } + + protected override void SetObjectsPosition() + { + if (locCoord == null || _collection == null) + { + return; + } + int row = numRows - 1, col = numCols; + for (int i = 0; i < _collection?.Count; i++, col--) + { + _collection?.Get(i)?.SetPictureSize(_pictureWidth, _pictureHeight); + _collection?.Get(i)?.SetPosition(locCoord[row * numCols - col].Item1 + 5, locCoord[row * numCols - col].Item2 + 9); + if (col == 1) + { + col = numCols + 1; + row--; + } + } + } +} \ No newline at end of file diff --git a/ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs b/ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs index 81a0511..53ab768 100644 --- a/ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs +++ b/ProjectContainerShip/ProjectContainerShip/Entities/EntityContainerShip.cs @@ -29,7 +29,7 @@ public class EntityContainerShip : EntityShip /// Дополнительный цвет /// Признак наличия крана /// Признак наличия контейнеров - public EntityContainerShip(int speed, double weight, Color bodyColor, Color additionalColor, bool crane, bool container) : base(speed, weight, Color.Black) + public EntityContainerShip(int speed, double weight, Color bodyColor, Color additionalColor, bool crane, bool container) : base(speed, weight, bodyColor) { AdditionalColor = additionalColor; Crane = crane; diff --git a/ProjectContainerShip/ProjectContainerShip/FormContainerShip.Designer.cs b/ProjectContainerShip/ProjectContainerShip/FormContainerShip.Designer.cs index 5ab38c5..4974af2 100644 --- a/ProjectContainerShip/ProjectContainerShip/FormContainerShip.Designer.cs +++ b/ProjectContainerShip/ProjectContainerShip/FormContainerShip.Designer.cs @@ -33,12 +33,10 @@ namespace ProjectContainerShip private void InitializeComponent() { pictureBoxContainerShip = new PictureBox(); - buttonCreateContainerShip = new Button(); buttonLeft = new Button(); buttonUp = new Button(); buttonDown = new Button(); buttonRight = new Button(); - buttonCreateShip = new Button(); comboBoxStrategy = new ComboBox(); buttonStrategyStep = new Button(); ((System.ComponentModel.ISupportInitialize)pictureBoxContainerShip).BeginInit(); @@ -53,17 +51,6 @@ namespace ProjectContainerShip pictureBoxContainerShip.TabIndex = 0; pictureBoxContainerShip.TabStop = false; // - // buttonCreateContainerShip - // - buttonCreateContainerShip.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - buttonCreateContainerShip.Location = new Point(12, 546); - buttonCreateContainerShip.Name = "buttonCreateContainerShip"; - buttonCreateContainerShip.Size = new Size(196, 26); - buttonCreateContainerShip.TabIndex = 1; - buttonCreateContainerShip.Text = "Создать контейнеровоз"; - buttonCreateContainerShip.UseVisualStyleBackColor = true; - buttonCreateContainerShip.Click += ButtonCreateContainerShip_Click; - // // buttonLeft // buttonLeft.Anchor = AnchorStyles.Bottom | AnchorStyles.Right; @@ -112,17 +99,6 @@ namespace ProjectContainerShip buttonRight.UseVisualStyleBackColor = true; buttonRight.Click += ButtonMove_Click; // - // buttonCreateShip - // - buttonCreateShip.Anchor = AnchorStyles.Bottom | AnchorStyles.Left; - buttonCreateShip.Location = new Point(214, 546); - buttonCreateShip.Name = "buttonCreateShip"; - buttonCreateShip.Size = new Size(196, 26); - buttonCreateShip.TabIndex = 6; - buttonCreateShip.Text = "Создать корабль"; - buttonCreateShip.UseVisualStyleBackColor = true; - buttonCreateShip.Click +=ButtonCreateShip_Click; - // // comboBoxStrategy // comboBoxStrategy.DropDownStyle = ComboBoxStyle.DropDownList; @@ -150,12 +126,10 @@ namespace ProjectContainerShip ClientSize = new Size(934, 586); Controls.Add(buttonStrategyStep); Controls.Add(comboBoxStrategy); - Controls.Add(buttonCreateShip); Controls.Add(buttonRight); Controls.Add(buttonDown); Controls.Add(buttonUp); Controls.Add(buttonLeft); - Controls.Add(buttonCreateContainerShip); Controls.Add(pictureBoxContainerShip); Name = "FormContainerShip"; Text = "Спортивный автомобиль"; @@ -166,13 +140,11 @@ namespace ProjectContainerShip #endregion private PictureBox pictureBoxContainerShip; - private Button buttonCreateContainerShip; private Button buttonLeft; private Button buttonUp; private Button buttonDown; private Button buttonRight; private Button button1; - private Button buttonCreateShip; private ComboBox comboBoxStrategy; private Button buttonStrategyStep; } diff --git a/ProjectContainerShip/ProjectContainerShip/FormContainerShip.cs b/ProjectContainerShip/ProjectContainerShip/FormContainerShip.cs index 4ff8e6b..34ca18a 100644 --- a/ProjectContainerShip/ProjectContainerShip/FormContainerShip.cs +++ b/ProjectContainerShip/ProjectContainerShip/FormContainerShip.cs @@ -18,6 +18,21 @@ public partial class FormContainerShip : Form /// private AbstractStrategy? _strategy; + /// + /// Получение объекта + /// + public DrawningShip SetShip + { + set + { + _drawningShip = value; + _drawningShip.SetPictureSize(pictureBoxContainerShip.Width, pictureBoxContainerShip.Height); + comboBoxStrategy.Enabled = true; + _strategy = null; + Draw(); + } + } + /// /// Конструктор формы /// @@ -43,50 +58,6 @@ public partial class FormContainerShip : Form pictureBoxContainerShip.Image = bmp; } - /// - /// Создание объекта класса-перемещения - /// - /// Тип создаваемого объекта - private void CreateObject(string type) - { - Random random = new(); - switch (type) - { - case nameof(DrawningShip): - _drawningShip = new DrawningShip(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(DrawningContainerShip): - _drawningShip = new DrawningContainerShip(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; - } - - _drawningShip.SetPictureSize(pictureBoxContainerShip.Width, pictureBoxContainerShip.Height); - _drawningShip.SetPosition(random.Next(10, 100), random.Next(10, 100)); - _strategy = null; - comboBoxStrategy.Enabled = true; - Draw(); - } - - /// - /// Обработка нажатия кнопки "Создать спортивный автомобиль" - /// - /// - /// - private void ButtonCreateContainerShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningContainerShip)); - - /// - /// Обработка нажатия кнопки "Создать автомобиль" - /// - /// - /// - private void ButtonCreateShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningShip)); - /// /// Перемещение объекта по форме (нажатие кнопок навигации) /// diff --git a/ProjectContainerShip/ProjectContainerShip/FormShipCollection.Designer.cs b/ProjectContainerShip/ProjectContainerShip/FormShipCollection.Designer.cs new file mode 100644 index 0000000..cf8986e --- /dev/null +++ b/ProjectContainerShip/ProjectContainerShip/FormShipCollection.Designer.cs @@ -0,0 +1,177 @@ +namespace ProjectContainerShip +{ + partial class FormShipCollection + { + /// + /// 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(); + buttonDelShip = new Button(); + maskedTextBoxPosition = new MaskedTextBox(); + buttonAddContainerShip = new Button(); + buttonAddShip = new Button(); + comboBoxSelectorCompany = new ComboBox(); + pictureBox = new PictureBox(); + colorDialog = new ColorDialog(); + groupBoxTools.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); + SuspendLayout(); + // + // groupBoxTools + // + groupBoxTools.Controls.Add(buttonRefresh); + groupBoxTools.Controls.Add(buttonGoToCheck); + groupBoxTools.Controls.Add(buttonDelShip); + groupBoxTools.Controls.Add(maskedTextBoxPosition); + groupBoxTools.Controls.Add(buttonAddContainerShip); + groupBoxTools.Controls.Add(buttonAddShip); + groupBoxTools.Controls.Add(comboBoxSelectorCompany); + groupBoxTools.Dock = DockStyle.Right; + groupBoxTools.Location = new Point(930, 0); + groupBoxTools.Name = "groupBoxTools"; + groupBoxTools.Size = new Size(206, 617); + groupBoxTools.TabIndex = 0; + groupBoxTools.TabStop = false; + groupBoxTools.Text = "Инструменты"; + // + // buttonRefresh + // + buttonRefresh.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonRefresh.Location = new Point(6, 482); + buttonRefresh.Name = "buttonRefresh"; + buttonRefresh.RightToLeft = RightToLeft.No; + buttonRefresh.Size = new Size(194, 34); + buttonRefresh.TabIndex = 6; + buttonRefresh.Text = "Обновить"; + buttonRefresh.UseVisualStyleBackColor = true; + // + // buttonGoToCheck + // + buttonGoToCheck.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonGoToCheck.Location = new Point(6, 367); + buttonGoToCheck.Name = "buttonGoToCheck"; + buttonGoToCheck.RightToLeft = RightToLeft.No; + buttonGoToCheck.Size = new Size(194, 34); + buttonGoToCheck.TabIndex = 5; + buttonGoToCheck.Text = "Передать на тесты"; + buttonGoToCheck.UseVisualStyleBackColor = true; + buttonGoToCheck.Click += ButtonGoToCheck_Click; + // + // buttonDelShip + // + buttonDelShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonDelShip.Location = new Point(6, 234); + buttonDelShip.Name = "buttonDelShip"; + buttonDelShip.RightToLeft = RightToLeft.No; + buttonDelShip.Size = new Size(194, 34); + buttonDelShip.TabIndex = 4; + buttonDelShip.Text = "Удалить"; + buttonDelShip.UseVisualStyleBackColor = true; + buttonDelShip.Click += ButtonDelShip_Click; + // + // maskedTextBoxPosition + // + maskedTextBoxPosition.Location = new Point(6, 203); + maskedTextBoxPosition.Mask = "00"; + maskedTextBoxPosition.Name = "maskedTextBoxPosition"; + maskedTextBoxPosition.Size = new Size(188, 25); + maskedTextBoxPosition.TabIndex = 3; + maskedTextBoxPosition.ValidatingType = typeof(int); + // + // buttonAddContainerShip + // + buttonAddContainerShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddContainerShip.Location = new Point(6, 134); + buttonAddContainerShip.Name = "buttonAddContainerShip"; + buttonAddContainerShip.Size = new Size(194, 34); + buttonAddContainerShip.TabIndex = 2; + buttonAddContainerShip.Text = "Добавление контейнеровоза"; + buttonAddContainerShip.UseVisualStyleBackColor = true; + buttonAddContainerShip.Click += ButtonAddContainerShip_Click; + // + // buttonAddShip + // + buttonAddShip.Anchor = AnchorStyles.Top | AnchorStyles.Left | AnchorStyles.Right; + buttonAddShip.Location = new Point(6, 94); + buttonAddShip.Name = "buttonAddShip"; + buttonAddShip.Size = new Size(194, 34); + buttonAddShip.TabIndex = 1; + buttonAddShip.Text = "Добавление корабля"; + buttonAddShip.UseVisualStyleBackColor = true; + buttonAddShip.Click += ButtonAddShip_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, 24); + comboBoxSelectorCompany.Name = "comboBoxSelectorCompany"; + comboBoxSelectorCompany.Size = new Size(194, 25); + 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(930, 617); + pictureBox.TabIndex = 1; + pictureBox.TabStop = false; + // + // FormShipCollection + // + AutoScaleDimensions = new SizeF(7F, 17F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(1136, 617); + Controls.Add(pictureBox); + Controls.Add(groupBoxTools); + Name = "FormShipCollection"; + Text = "Коллекция кораблей"; + groupBoxTools.ResumeLayout(false); + groupBoxTools.PerformLayout(); + ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); + ResumeLayout(false); + } + + #endregion + + private GroupBox groupBoxTools; + private Button buttonAddShip; + private ComboBox comboBoxSelectorCompany; + private MaskedTextBox maskedTextBoxPosition; + private Button buttonAddContainerShip; + private PictureBox pictureBox; + private Button buttonDelShip; + private Button buttonRefresh; + private Button buttonGoToCheck; + private ColorDialog colorDialog; + } +} \ No newline at end of file diff --git a/ProjectContainerShip/ProjectContainerShip/FormShipCollection.cs b/ProjectContainerShip/ProjectContainerShip/FormShipCollection.cs new file mode 100644 index 0000000..66fc54f --- /dev/null +++ b/ProjectContainerShip/ProjectContainerShip/FormShipCollection.cs @@ -0,0 +1,189 @@ +using ProjectContainerShip.CollectionGenericObjects; +using ProjectContainerShip.Drawnings; + + +namespace ProjectContainerShip +{ + /// + /// Форма работы с компанией и ее коллекцией + /// + public partial class FormShipCollection : Form + { + /// + /// Компания + /// + private AbstractCompany? _company; + + /// + /// Конструктор + /// + public FormShipCollection() + { + InitializeComponent(); + } + + /// + /// Выбор компании + /// + /// + /// + private void ComboBoxSelectorCompany_SelectedIndexChanged(object sender, EventArgs e) + { + switch (comboBoxSelectorCompany.Text) + { + case "Хранилище": + _company = new ShipSharingService(pictureBox.Width, pictureBox.Height, new MassiveGenericObjects()); + break; + } + } + + /// + /// Создание объекта класса-перемещения + /// + /// Тип создаваемого объекта + private void CreateObject(string type) + { + if (_company == null) + { + return; + } + DrawningShip _drawningShip; + Random random = new(); + switch (type) + { + case nameof(DrawningShip): + _drawningShip = new DrawningShip(random.Next(30, 70), random.Next(100, 500), + GetColor(random)); + break; + case nameof(DrawningContainerShip): + _drawningShip = new DrawningContainerShip(random.Next(30, 70), random.Next(100, 500), + GetColor(random), GetColor(random), + Convert.ToBoolean(random.Next(0, 2)), Convert.ToBoolean(random.Next(0, 2))); + break; + default: + return; + + } + if (_company + _drawningShip != -1) + { + MessageBox.Show("Объект добавлен"); + pictureBox.Image = _company.Show(); + } + else + { + MessageBox.Show("Не удалось добавить объект"); + } + } + + + /// + /// Добавление обычного корабля + /// + /// + /// + private void ButtonAddShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningShip)); + + /// + /// Добавление контейнеровоза + /// + /// + /// + private void ButtonAddContainerShip_Click(object sender, EventArgs e) => CreateObject(nameof(DrawningContainerShip)); + + /// + /// Получение цвета + /// + /// Генератор случайных чисел + /// + 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 ButtonDelShip_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; + } + + DrawningShip? ship = null; + int counter = 100; + while (ship == null) + { + ship = _company.GetRandomObject(); + counter--; + if (counter <= 0) + { + break; + } + } + + if (ship == null) + { + return; + } + + FormContainerShip form = new FormContainerShip(); + form.SetShip = ship; + form.ShowDialog(); + } + + /// + /// Перерисовка коллекции + /// + /// + /// + private void ButtonRefresh_Click(object sender, EventArgs e) + { + if (_company == null) + { + return; + } + + pictureBox.Image = _company.Show(); + } + + } +} diff --git a/ProjectContainerShip/ProjectContainerShip/FormShipCollection.resx b/ProjectContainerShip/ProjectContainerShip/FormShipCollection.resx new file mode 100644 index 0000000..3bec0d5 --- /dev/null +++ b/ProjectContainerShip/ProjectContainerShip/FormShipCollection.resx @@ -0,0 +1,126 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 + + + 17, 17 + + + 79 + + \ No newline at end of file diff --git a/ProjectContainerShip/ProjectContainerShip/Program.cs b/ProjectContainerShip/ProjectContainerShip/Program.cs index 426af01..4f76f20 100644 --- a/ProjectContainerShip/ProjectContainerShip/Program.cs +++ b/ProjectContainerShip/ProjectContainerShip/Program.cs @@ -11,7 +11,7 @@ namespace ProjectContainerShip // To customize application configuration such as set high DPI settings or default font, // see https://aka.ms/applicationconfiguration. ApplicationConfiguration.Initialize(); - Application.Run(new FormContainerShip()); + Application.Run(new FormShipCollection()); } } } \ No newline at end of file -- 2.25.1 From c330b3eadd6706ece3a752d647f38ffbfa3f1ad6 Mon Sep 17 00:00:00 2001 From: MorozovDanil Date: Mon, 1 Apr 2024 11:50:10 +0400 Subject: [PATCH 4/8] =?UTF-8?q?=D0=9B=D0=B0=D0=B1=D0=B0=20=D1=81=D0=B4?= =?UTF-8?q?=D0=B0=D0=BD=D0=B0,=20=D0=BF=D1=80=D0=B8=D0=BD=D1=8F=D1=82?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CollectionGenericObjects/AbstractCompany.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/AbstractCompany.cs b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/AbstractCompany.cs index af1727a..4a20e8c 100644 --- a/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/AbstractCompany.cs +++ b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/AbstractCompany.cs @@ -112,4 +112,5 @@ public abstract class AbstractCompany /// Расстановка объектов /// protected abstract void SetObjectsPosition(); + } -- 2.25.1 From 6c8c81d5337fbf06040bbc1d601aa91403e9774a Mon Sep 17 00:00:00 2001 From: MorozovDanil Date: Sun, 14 Apr 2024 19:25:25 +0400 Subject: [PATCH 5/8] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ProjectContainerShip/.editorconfig | 231 ++++++++++++++++++ .../MassiveGenericObjects.cs | 11 +- .../FormShipConfig.Designer.cs | 39 +++ .../ProjectContainerShip/FormShipConfig.cs | 20 ++ .../ProjectContainerShip/FormShipConfig.resx | 120 +++++++++ 5 files changed, 412 insertions(+), 9 deletions(-) create mode 100644 ProjectContainerShip/.editorconfig create mode 100644 ProjectContainerShip/ProjectContainerShip/FormShipConfig.Designer.cs create mode 100644 ProjectContainerShip/ProjectContainerShip/FormShipConfig.cs create mode 100644 ProjectContainerShip/ProjectContainerShip/FormShipConfig.resx diff --git a/ProjectContainerShip/.editorconfig b/ProjectContainerShip/.editorconfig new file mode 100644 index 0000000..e0c1b90 --- /dev/null +++ b/ProjectContainerShip/.editorconfig @@ -0,0 +1,231 @@ +# Удалите строку ниже, если вы хотите наследовать параметры .editorconfig из каталогов, расположенных выше в иерархии +root = true + +# Файлы C# +[*.cs] + +#### Основные параметры EditorConfig #### + +# Отступы и интервалы +indent_size = 4 +indent_style = space +tab_width = 4 + +# Предпочтения для новых строк +end_of_line = crlf +insert_final_newline = false + +#### Рекомендации по написанию кода .NET #### + +# Упорядочение Using +dotnet_separate_import_directive_groups = false +dotnet_sort_system_directives_first = false +file_header_template = unset + +# Предпочтения для this. и Me. +dotnet_style_qualification_for_event = false +dotnet_style_qualification_for_field = false +dotnet_style_qualification_for_method = false +dotnet_style_qualification_for_property = false + +# Параметры использования ключевых слов языка и типов BCL +dotnet_style_predefined_type_for_locals_parameters_members = true +dotnet_style_predefined_type_for_member_access = true + +# Предпочтения для скобок +dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity +dotnet_style_parentheses_in_other_binary_operators = always_for_clarity +dotnet_style_parentheses_in_other_operators = never_if_unnecessary +dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity + +# Предпочтения модификатора +dotnet_style_require_accessibility_modifiers = for_non_interface_members + +# Выражения уровень предпочтения +dotnet_style_coalesce_expression = true +dotnet_style_collection_initializer = true +dotnet_style_explicit_tuple_names = true +dotnet_style_namespace_match_folder = true +dotnet_style_null_propagation = true +dotnet_style_object_initializer = true +dotnet_style_operator_placement_when_wrapping = beginning_of_line +dotnet_style_prefer_auto_properties = true +dotnet_style_prefer_collection_expression = when_types_loosely_match +dotnet_style_prefer_compound_assignment = true +dotnet_style_prefer_conditional_expression_over_assignment = true +dotnet_style_prefer_conditional_expression_over_return = true +dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed +dotnet_style_prefer_inferred_anonymous_type_member_names = true +dotnet_style_prefer_inferred_tuple_names = true +dotnet_style_prefer_is_null_check_over_reference_equality_method = true +dotnet_style_prefer_simplified_boolean_expressions = true +dotnet_style_prefer_simplified_interpolation = true + +# Предпочтения для полей +dotnet_style_readonly_field = true + +# Настройки параметров +dotnet_code_quality_unused_parameters = all + +# Параметры подавления +dotnet_remove_unnecessary_suppression_exclusions = none + +# Предпочтения для новых строк +dotnet_style_allow_multiple_blank_lines_experimental = true +dotnet_style_allow_statement_immediately_after_block_experimental = true + +#### Рекомендации по написанию кода C# #### + +# Предпочтения var +csharp_style_var_elsewhere = false +csharp_style_var_for_built_in_types = false +csharp_style_var_when_type_is_apparent = false + +# Члены, заданные выражениями +csharp_style_expression_bodied_accessors = true +csharp_style_expression_bodied_constructors = false +csharp_style_expression_bodied_indexers = true +csharp_style_expression_bodied_lambdas = true +csharp_style_expression_bodied_local_functions = false +csharp_style_expression_bodied_methods = false +csharp_style_expression_bodied_operators = false +csharp_style_expression_bodied_properties = true + +# Настройки соответствия шаблонов +csharp_style_pattern_matching_over_as_with_null_check = true +csharp_style_pattern_matching_over_is_with_cast_check = true +csharp_style_prefer_extended_property_pattern = true +csharp_style_prefer_not_pattern = true +csharp_style_prefer_pattern_matching = true +csharp_style_prefer_switch_expression = true + +# Настройки проверки на null +csharp_style_conditional_delegate_call = true + +# Предпочтения модификатора +csharp_prefer_static_local_function = true +csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async +csharp_style_prefer_readonly_struct = true +csharp_style_prefer_readonly_struct_member = true + +# Предпочтения для блоков кода +csharp_prefer_braces = true +csharp_prefer_simple_using_statement = true +csharp_style_namespace_declarations = block_scoped +csharp_style_prefer_method_group_conversion = true +csharp_style_prefer_primary_constructors = true +csharp_style_prefer_top_level_statements = true + +# Выражения уровень предпочтения +csharp_prefer_simple_default_expression = true +csharp_style_deconstructed_variable_declaration = true +csharp_style_implicit_object_creation_when_type_is_apparent = true +csharp_style_inlined_variable_declaration = true +csharp_style_prefer_index_operator = true +csharp_style_prefer_local_over_anonymous_function = true +csharp_style_prefer_null_check_over_type_check = true +csharp_style_prefer_range_operator = true +csharp_style_prefer_tuple_swap = true +csharp_style_prefer_utf8_string_literals = true +csharp_style_throw_expression = true +csharp_style_unused_value_assignment_preference = discard_variable +csharp_style_unused_value_expression_statement_preference = discard_variable + +# предпочтения для директивы using +csharp_using_directive_placement = outside_namespace + +# Предпочтения для новых строк +csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true +csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true +csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true +csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true +csharp_style_allow_embedded_statements_on_same_line_experimental = true + +#### Правила форматирования C# #### + +# Предпочтения для новых строк +csharp_new_line_before_catch = true +csharp_new_line_before_else = true +csharp_new_line_before_finally = true +csharp_new_line_before_members_in_anonymous_types = true +csharp_new_line_before_members_in_object_initializers = true +csharp_new_line_before_open_brace = all +csharp_new_line_between_query_expression_clauses = true + +# Предпочтения для отступов +csharp_indent_block_contents = true +csharp_indent_braces = false +csharp_indent_case_contents = true +csharp_indent_case_contents_when_block = true +csharp_indent_labels = one_less_than_current +csharp_indent_switch_labels = true + +# Предпочтения для интервалов +csharp_space_after_cast = false +csharp_space_after_colon_in_inheritance_clause = true +csharp_space_after_comma = true +csharp_space_after_dot = false +csharp_space_after_keywords_in_control_flow_statements = true +csharp_space_after_semicolon_in_for_statement = true +csharp_space_around_binary_operators = before_and_after +csharp_space_around_declaration_statements = false +csharp_space_before_colon_in_inheritance_clause = true +csharp_space_before_comma = false +csharp_space_before_dot = false +csharp_space_before_open_square_brackets = false +csharp_space_before_semicolon_in_for_statement = false +csharp_space_between_empty_square_brackets = false +csharp_space_between_method_call_empty_parameter_list_parentheses = false +csharp_space_between_method_call_name_and_opening_parenthesis = false +csharp_space_between_method_call_parameter_list_parentheses = false +csharp_space_between_method_declaration_empty_parameter_list_parentheses = false +csharp_space_between_method_declaration_name_and_open_parenthesis = false +csharp_space_between_method_declaration_parameter_list_parentheses = false +csharp_space_between_parentheses = false +csharp_space_between_square_brackets = false + +# Предпочтения переноса +csharp_preserve_single_line_blocks = true +csharp_preserve_single_line_statements = true + +#### Стили именования #### + +# Правила именования + +dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion +dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface +dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i + +dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.types_should_be_pascal_case.symbols = types +dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case + +dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion +dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members +dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case + +# Спецификации символов + +dotnet_naming_symbols.interface.applicable_kinds = interface +dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.interface.required_modifiers = + +dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum +dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.types.required_modifiers = + +dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method +dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected +dotnet_naming_symbols.non_field_members.required_modifiers = + +# Стили именования + +dotnet_naming_style.pascal_case.required_prefix = +dotnet_naming_style.pascal_case.required_suffix = +dotnet_naming_style.pascal_case.word_separator = +dotnet_naming_style.pascal_case.capitalization = pascal_case + +dotnet_naming_style.begins_with_i.required_prefix = I +dotnet_naming_style.begins_with_i.required_suffix = +dotnet_naming_style.begins_with_i.word_separator = +dotnet_naming_style.begins_with_i.capitalization = pascal_case diff --git a/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs index abe67dc..1cf3552 100644 --- a/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs @@ -52,15 +52,8 @@ public class MassiveGenericObjects : ICollectionGenericObjects public int Insert(T obj) { - for (int i = 0; i < Count; i++) - { - if (_collection[i] == null) - { - _collection[i] = obj; - return i; - } - } - return -1; + return Insert(obj, 0); + } public int Insert(T obj, int position) diff --git a/ProjectContainerShip/ProjectContainerShip/FormShipConfig.Designer.cs b/ProjectContainerShip/ProjectContainerShip/FormShipConfig.Designer.cs new file mode 100644 index 0000000..f43455a --- /dev/null +++ b/ProjectContainerShip/ProjectContainerShip/FormShipConfig.Designer.cs @@ -0,0 +1,39 @@ +namespace ProjectContainerShip +{ + partial class FormShipConfig + { + /// + /// 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() + { + this.components = new System.ComponentModel.Container(); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.ClientSize = new System.Drawing.Size(800, 450); + this.Text = "FormShipConfig"; + } + + #endregion + } +} \ No newline at end of file diff --git a/ProjectContainerShip/ProjectContainerShip/FormShipConfig.cs b/ProjectContainerShip/ProjectContainerShip/FormShipConfig.cs new file mode 100644 index 0000000..857a13c --- /dev/null +++ b/ProjectContainerShip/ProjectContainerShip/FormShipConfig.cs @@ -0,0 +1,20 @@ +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 ProjectContainerShip +{ + public partial class FormShipConfig : Form + { + public FormShipConfig() + { + InitializeComponent(); + } + } +} diff --git a/ProjectContainerShip/ProjectContainerShip/FormShipConfig.resx b/ProjectContainerShip/ProjectContainerShip/FormShipConfig.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/ProjectContainerShip/ProjectContainerShip/FormShipConfig.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 -- 2.25.1 From 9f8280b5f9a45ba9526f2059e95fb2033d52ae61 Mon Sep 17 00:00:00 2001 From: MorozovDanil Date: Sun, 14 Apr 2024 19:34:30 +0400 Subject: [PATCH 6/8] =?UTF-8?q?=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FormShipConfig.Designer.cs | 39 ------ .../ProjectContainerShip/FormShipConfig.cs | 20 --- .../ProjectContainerShip/FormShipConfig.resx | 120 ------------------ 3 files changed, 179 deletions(-) delete mode 100644 ProjectContainerShip/ProjectContainerShip/FormShipConfig.Designer.cs delete mode 100644 ProjectContainerShip/ProjectContainerShip/FormShipConfig.cs delete mode 100644 ProjectContainerShip/ProjectContainerShip/FormShipConfig.resx diff --git a/ProjectContainerShip/ProjectContainerShip/FormShipConfig.Designer.cs b/ProjectContainerShip/ProjectContainerShip/FormShipConfig.Designer.cs deleted file mode 100644 index f43455a..0000000 --- a/ProjectContainerShip/ProjectContainerShip/FormShipConfig.Designer.cs +++ /dev/null @@ -1,39 +0,0 @@ -namespace ProjectContainerShip -{ - partial class FormShipConfig - { - /// - /// 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() - { - this.components = new System.ComponentModel.Container(); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Text = "FormShipConfig"; - } - - #endregion - } -} \ No newline at end of file diff --git a/ProjectContainerShip/ProjectContainerShip/FormShipConfig.cs b/ProjectContainerShip/ProjectContainerShip/FormShipConfig.cs deleted file mode 100644 index 857a13c..0000000 --- a/ProjectContainerShip/ProjectContainerShip/FormShipConfig.cs +++ /dev/null @@ -1,20 +0,0 @@ -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 ProjectContainerShip -{ - public partial class FormShipConfig : Form - { - public FormShipConfig() - { - InitializeComponent(); - } - } -} diff --git a/ProjectContainerShip/ProjectContainerShip/FormShipConfig.resx b/ProjectContainerShip/ProjectContainerShip/FormShipConfig.resx deleted file mode 100644 index 1af7de1..0000000 --- a/ProjectContainerShip/ProjectContainerShip/FormShipConfig.resx +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 -- 2.25.1 From 419dee846e32aead8b3f8754ab896334772a5f69 Mon Sep 17 00:00:00 2001 From: MorozovDanil Date: Mon, 15 Apr 2024 01:51:48 +0400 Subject: [PATCH 7/8] 1 --- .../CollectionGenericObjects/MassiveGenericObjects.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs index 1cf3552..3d4b85b 100644 --- a/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs @@ -53,7 +53,6 @@ public class MassiveGenericObjects : ICollectionGenericObjects public int Insert(T obj) { return Insert(obj, 0); - } public int Insert(T obj, int position) -- 2.25.1 From a8e14cb111c4ddea5a8505d2aa06e2b10a0b2baa Mon Sep 17 00:00:00 2001 From: MorozovDanil Date: Mon, 15 Apr 2024 02:07:48 +0400 Subject: [PATCH 8/8] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=B2=D0=B5=D1=80=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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs index 3d4b85b..c94b54c 100644 --- a/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectContainerShip/ProjectContainerShip/CollectionGenericObjects/MassiveGenericObjects.cs @@ -10,7 +10,7 @@ public class MassiveGenericObjects : ICollectionGenericObjects /// /// Массив объектов, которые храним /// - private T?[] _collection; + private T?[] _collection; public int Count => _collection.Length; @@ -52,7 +52,7 @@ public class MassiveGenericObjects : ICollectionGenericObjects public int Insert(T obj) { - return Insert(obj, 0); + return Insert(obj, 0); } public int Insert(T obj, int position) -- 2.25.1