From 492227f8267b7e86bc29e9443ebbcd061c61992f Mon Sep 17 00:00:00 2001 From: Evgeny Egov Date: Sat, 6 Jan 2024 12:36:18 +0400 Subject: [PATCH 1/5] =?UTF-8?q?6=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE?= =?UTF-8?q?=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ICollectionGenericObjects.cs | 13 +- .../MassiveGenericObjects.cs | 29 +++- .../StorageCollection.cs | 158 +++++++++++++++++- .../Drawnings/ExtentionDrawningCar.cs | 54 ++++++ .../ProjectSportCar/Entities/EntityCar.cs | 24 +++ .../FormCarCollection.Designer.cs | 68 +++++++- .../ProjectSportCar/FormCarCollection.cs | 30 ++++ .../ProjectSportCar/FormCarCollection.resx | 9 + 8 files changed, 375 insertions(+), 10 deletions(-) create mode 100644 ProjectSportCar/ProjectSportCar/Drawnings/ExtentionDrawningCar.cs diff --git a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ICollectionGenericObjects.cs b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ICollectionGenericObjects.cs index b478a4e..78668cf 100644 --- a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ICollectionGenericObjects.cs +++ b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ICollectionGenericObjects.cs @@ -15,7 +15,7 @@ public interface ICollectionGenericObjects /// /// Установка максимального количества элементов /// - int SetMaxCount { set; } + int MaxCount { get; set; } /// /// Добавление объекта в коллекцию @@ -45,4 +45,15 @@ public interface ICollectionGenericObjects /// Позиция /// Объект T? Get(int position); + + /// + /// Получение типа коллекции + /// + CollectionType GetCollectionType { get; } + + /// + /// Получение объектов коллекции по одному + /// + /// Поэлементый вывод элементов коллекции + IEnumerable GetItems(); } \ No newline at end of file diff --git a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs index d7808a5..f190f14 100644 --- a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs @@ -1,4 +1,5 @@ -namespace ProjectSportCar.CollectionGenericObjects; + +namespace ProjectSportCar.CollectionGenericObjects; /// /// Параметризованный набор объектов @@ -14,7 +15,23 @@ public class MassiveGenericObjects : ICollectionGenericObjects public int Count => _collection.Length; - public int SetMaxCount { set { if (value > 0) { _collection = new T?[value]; } } } + public int MaxCount + { + get + { + return _collection.Length; + } + + set + { + if (value > 0) + { + _collection = new T?[value]; + } + } + } + + public CollectionType GetCollectionType => CollectionType.Massive; /// /// Конструктор @@ -52,4 +69,12 @@ public class MassiveGenericObjects : ICollectionGenericObjects // TODO удаление объекта из массива, присовив элементу массива значение null return true; } + + public IEnumerable GetItems() + { + for (int i = 0; i < _collection.Length; ++i) + { + yield return _collection[i]; + } + } } \ No newline at end of file diff --git a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/StorageCollection.cs b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/StorageCollection.cs index 8d7c8d2..68994ff 100644 --- a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/StorageCollection.cs +++ b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/StorageCollection.cs @@ -1,11 +1,14 @@ -namespace ProjectSportCar.CollectionGenericObjects; +using ProjectSportCar.Drawnings; +using System.Text; + +namespace ProjectSportCar.CollectionGenericObjects; /// /// Класс-хранилище коллекций /// /// public class StorageCollection - where T : class + where T : DrawningCar { /// /// Словарь (хранилище) с коллекциями @@ -17,6 +20,21 @@ public class StorageCollection /// public List Keys => _storages.Keys.ToList(); + /// + /// Ключевое слово, с которого должен начинаться файл + /// + private readonly string _collectionKey = "CollectionsStorage"; + + /// + /// Разделитель для записи ключа и значения элемента словаря + /// + private readonly string _separatorForKeyValue = "|"; + + /// + /// Разделитель для записей коллекции данных в файл + /// + private readonly string _separatorItems = ";"; + /// /// Конструктор /// @@ -58,4 +76,140 @@ public class StorageCollection return null; } } + + /// + /// Сохранение информации по автомобилям в хранилище в файл + /// + /// Путь и имя файла + /// true - сохранение прошло успешно, false - ошибка при сохранении данных + public bool SaveData(string filename) + { + if (_storages.Count == 0) + { + return false; + } + + if (File.Exists(filename)) + { + File.Delete(filename); + } + + StringBuilder sb = new(); + + sb.Append(_collectionKey); + foreach (KeyValuePair> value in _storages) + { + sb.Append(Environment.NewLine); + // не сохраняем пустые коллекции + if (value.Value.Count == 0) + { + continue; + } + + sb.Append(value.Key); + sb.Append(_separatorForKeyValue); + sb.Append(value.Value.GetCollectionType); + sb.Append(_separatorForKeyValue); + sb.Append(value.Value.MaxCount); + sb.Append(_separatorForKeyValue); + + foreach (T? item in value.Value.GetItems()) + { + string data = item?.GetDataForSave() ?? string.Empty; + if (string.IsNullOrEmpty(data)) + { + continue; + } + + sb.Append(data); + sb.Append(_separatorItems); + } + } + + using FileStream fs = new(filename, FileMode.Create); + byte[] info = new UTF8Encoding(true).GetBytes(sb.ToString()); + fs.Write(info, 0, info.Length); + return true; + } + + /// + /// Загрузка информации по автомобилям в хранилище из файла + /// + /// Путь и имя файла + /// true - загрузка прошла успешно, false - ошибка при загрузке данных + public bool LoadData(string filename) + { + if (!File.Exists(filename)) + { + return false; + } + + string bufferTextFromFile = ""; + using (FileStream fs = new(filename, FileMode.Open)) + { + byte[] b = new byte[fs.Length]; + UTF8Encoding temp = new(true); + while (fs.Read(b, 0, b.Length) > 0) + { + bufferTextFromFile += temp.GetString(b); + } + } + + string[] strs = bufferTextFromFile.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries); + if (strs == null || strs.Length == 0) + { + return false; + } + + if (!strs[0].Equals(_collectionKey)) + { + //если нет такой записи, то это не те данные + return false; + } + + _storages.Clear(); + foreach (string data in strs) + { + string[] record = data.Split(_separatorForKeyValue, StringSplitOptions.RemoveEmptyEntries); + if (record.Length != 4) + { + continue; + } + + CollectionType collectionType = (CollectionType)Enum.Parse(typeof(CollectionType), record[1]); + ICollectionGenericObjects? collection = StorageCollection.CreateCollection(collectionType); + if (collection == null) + { + return false; + } + + collection.MaxCount = Convert.ToInt32(record[2]); + + string[] set = record[3].Split(_separatorItems, StringSplitOptions.RemoveEmptyEntries); + foreach (string elem in set) + { + if (elem?.CreateDrawningCar() is T car) + { + if (!collection.Insert(car)) + { + return false; + } + } + } + + _storages.Add(record[0], collection); + } + + return true; + } + + private static ICollectionGenericObjects? CreateCollection(CollectionType collectionType) + { + return collectionType switch + { + CollectionType.Massive => new MassiveGenericObjects(), + CollectionType.List => new ListGenericObjects(), + _ => null, + }; + } } \ No newline at end of file diff --git a/ProjectSportCar/ProjectSportCar/Drawnings/ExtentionDrawningCar.cs b/ProjectSportCar/ProjectSportCar/Drawnings/ExtentionDrawningCar.cs new file mode 100644 index 0000000..95357a3 --- /dev/null +++ b/ProjectSportCar/ProjectSportCar/Drawnings/ExtentionDrawningCar.cs @@ -0,0 +1,54 @@ +using ProjectSportCar.Entities; + +namespace ProjectSportCar.Drawnings; + +/// +/// Расширение для класса EntityCar +/// +public static class ExtentionDrawningCar +{ + /// + /// Разделитель для записи информации по объекту в файл + /// + private static readonly string _separatorForObject = ":"; + + /// + /// Создание объекта из строки + /// + /// Строка с данными для создания объекта + /// Объект + public static DrawningCar? CreateDrawningCar(this string info) + { + string[] strs = info.Split(_separatorForObject); + EntityCar? car = EntitySportCar.CreateEntitySportCar(strs); + if (car != null) + { + return new DrawningSportCar(car); + } + + car = EntityCar.CreateEntityCar(strs); + if (car != null) + { + return new DrawningCar(car); + } + + return null; + } + + /// + /// Получение данных для сохранения в файл + /// + /// Сохраняемый объект + /// Строка с данными по объекту + public static string GetDataForSave(this DrawningCar drawningCar) + { + string[]? array = drawningCar?.EntityCar?.GetStringRepresentation(); + + if (array == null) + { + return string.Empty; + } + + return string.Join(_separatorForObject, array); + } +} \ No newline at end of file diff --git a/ProjectSportCar/ProjectSportCar/Entities/EntityCar.cs b/ProjectSportCar/ProjectSportCar/Entities/EntityCar.cs index 12456a5..cc60bc9 100644 --- a/ProjectSportCar/ProjectSportCar/Entities/EntityCar.cs +++ b/ProjectSportCar/ProjectSportCar/Entities/EntityCar.cs @@ -37,4 +37,28 @@ public class EntityCar Weight = weight; BodyColor = bodyColor; } + + /// + /// Получение строк со значениями свойств объекта класса-сущности + /// + /// + public virtual string[] GetStringRepresentation() + { + return new[] { nameof(EntityCar), Speed.ToString(), Weight.ToString(), BodyColor.Name }; + } + + /// + /// Создание объекта из массива строк + /// + /// + /// + public static EntityCar? CreateEntityCar(string[] strs) + { + if (strs.Length != 4 || strs[0] != nameof(EntityCar)) + { + return null; + } + + return new EntityCar(Convert.ToInt32(strs[1]), Convert.ToDouble(strs[2]), Color.FromName(strs[3])); + } } \ No newline at end of file diff --git a/ProjectSportCar/ProjectSportCar/FormCarCollection.Designer.cs b/ProjectSportCar/ProjectSportCar/FormCarCollection.Designer.cs index f756a4e..d00450d 100644 --- a/ProjectSportCar/ProjectSportCar/FormCarCollection.Designer.cs +++ b/ProjectSportCar/ProjectSportCar/FormCarCollection.Designer.cs @@ -46,10 +46,17 @@ labelCollectionName = new Label(); comboBoxSelectorCompany = new ComboBox(); pictureBox = new PictureBox(); + menuStrip = new MenuStrip(); + файлToolStripMenuItem = new ToolStripMenuItem(); + saveToolStripMenuItem = new ToolStripMenuItem(); + loadToolStripMenuItem = new ToolStripMenuItem(); + saveFileDialog = new SaveFileDialog(); + openFileDialog = new OpenFileDialog(); groupBoxTools.SuspendLayout(); panelCompanyTools.SuspendLayout(); panelStorage.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).BeginInit(); + menuStrip.SuspendLayout(); SuspendLayout(); // // groupBoxTools @@ -59,9 +66,9 @@ groupBoxTools.Controls.Add(panelStorage); groupBoxTools.Controls.Add(comboBoxSelectorCompany); groupBoxTools.Dock = DockStyle.Right; - groupBoxTools.Location = new Point(783, 0); + groupBoxTools.Location = new Point(783, 24); groupBoxTools.Name = "groupBoxTools"; - groupBoxTools.Size = new Size(179, 616); + groupBoxTools.Size = new Size(179, 592); groupBoxTools.TabIndex = 0; groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; @@ -75,7 +82,7 @@ panelCompanyTools.Controls.Add(buttonGoToCheck); panelCompanyTools.Dock = DockStyle.Bottom; panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 360); + panelCompanyTools.Location = new Point(3, 336); panelCompanyTools.Name = "panelCompanyTools"; panelCompanyTools.Size = new Size(173, 253); panelCompanyTools.TabIndex = 9; @@ -240,12 +247,52 @@ // pictureBox // pictureBox.Dock = DockStyle.Fill; - pictureBox.Location = new Point(0, 0); + pictureBox.Location = new Point(0, 24); pictureBox.Name = "pictureBox"; - pictureBox.Size = new Size(783, 616); + pictureBox.Size = new Size(783, 592); pictureBox.TabIndex = 1; pictureBox.TabStop = false; // + // menuStrip + // + menuStrip.Items.AddRange(new ToolStripItem[] { файлToolStripMenuItem }); + menuStrip.Location = new Point(0, 0); + menuStrip.Name = "menuStrip"; + menuStrip.Size = new Size(962, 24); + menuStrip.TabIndex = 2; + menuStrip.Text = "menuStrip"; + // + // файлToolStripMenuItem + // + файлToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { saveToolStripMenuItem, loadToolStripMenuItem }); + файлToolStripMenuItem.Name = "файлToolStripMenuItem"; + файлToolStripMenuItem.Size = new Size(48, 20); + файлToolStripMenuItem.Text = "Файл"; + // + // saveToolStripMenuItem + // + saveToolStripMenuItem.Name = "saveToolStripMenuItem"; + saveToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.S; + saveToolStripMenuItem.Size = new Size(181, 22); + saveToolStripMenuItem.Text = "Сохранение"; + saveToolStripMenuItem.Click += SaveToolStripMenuItem_Click; + // + // loadToolStripMenuItem + // + loadToolStripMenuItem.Name = "loadToolStripMenuItem"; + loadToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.L; + loadToolStripMenuItem.Size = new Size(181, 22); + loadToolStripMenuItem.Text = "Загрузка"; + loadToolStripMenuItem.Click += LoadToolStripMenuItem_Click; + // + // saveFileDialog + // + saveFileDialog.Filter = "txt file | *.txt"; + // + // openFileDialog + // + openFileDialog.Filter = "txt file | *.txt"; + // // FormCarCollection // AutoScaleDimensions = new SizeF(7F, 15F); @@ -253,6 +300,8 @@ ClientSize = new Size(962, 616); Controls.Add(pictureBox); Controls.Add(groupBoxTools); + Controls.Add(menuStrip); + MainMenuStrip = menuStrip; Name = "FormCarCollection"; Text = "Коллекция автомобилей"; groupBoxTools.ResumeLayout(false); @@ -261,7 +310,10 @@ panelStorage.ResumeLayout(false); panelStorage.PerformLayout(); ((System.ComponentModel.ISupportInitialize)pictureBox).EndInit(); + menuStrip.ResumeLayout(false); + menuStrip.PerformLayout(); ResumeLayout(false); + PerformLayout(); } #endregion @@ -284,5 +336,11 @@ private Button buttonCollectionDel; private Button buttonCreateCompany; private Panel panelCompanyTools; + private MenuStrip menuStrip; + private ToolStripMenuItem файлToolStripMenuItem; + private ToolStripMenuItem saveToolStripMenuItem; + private ToolStripMenuItem loadToolStripMenuItem; + private SaveFileDialog saveFileDialog; + private OpenFileDialog openFileDialog; } } \ No newline at end of file diff --git a/ProjectSportCar/ProjectSportCar/FormCarCollection.cs b/ProjectSportCar/ProjectSportCar/FormCarCollection.cs index badddec..0ef9025 100644 --- a/ProjectSportCar/ProjectSportCar/FormCarCollection.cs +++ b/ProjectSportCar/ProjectSportCar/FormCarCollection.cs @@ -238,4 +238,34 @@ public partial class FormCarCollection : Form panelCompanyTools.Enabled = true; RerfreshListBoxItems(); } + + /// + /// Обработка нажатия "Сохранение" + /// + /// + /// + private void SaveToolStripMenuItem_Click(object sender, EventArgs e) + { + if (saveFileDialog.ShowDialog() == DialogResult.OK) + { + if (_storageCollection.SaveData(saveFileDialog.FileName)) + { + MessageBox.Show("Сохранение прошло успешно", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Information); + } + else + { + MessageBox.Show("Не сохранилось", "Результат", MessageBoxButtons.OK, MessageBoxIcon.Error); + } + } + } + + /// + /// Обработка нажатия "Загрузка" + /// + /// + /// + private void LoadToolStripMenuItem_Click(object sender, EventArgs e) + { + // TODO продумать логику + } } \ No newline at end of file diff --git a/ProjectSportCar/ProjectSportCar/FormCarCollection.resx b/ProjectSportCar/ProjectSportCar/FormCarCollection.resx index af32865..8b1dfa1 100644 --- a/ProjectSportCar/ProjectSportCar/FormCarCollection.resx +++ b/ProjectSportCar/ProjectSportCar/FormCarCollection.resx @@ -117,4 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + + + 126, 17 + + + 261, 17 + \ No newline at end of file -- 2.25.1 From 0277d5a36cc8a2dd0d1cf534c2ad2509960b4451 Mon Sep 17 00:00:00 2001 From: Evgeny Egov Date: Sat, 6 Jan 2024 12:38:34 +0400 Subject: [PATCH 2/5] =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=BE=D0=BF=D0=B8=D1=81=D0=B0=D0=BD=D0=B8=D0=B5?= =?UTF-8?q?=20=D0=BA=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CollectionGenericObjects/StorageCollection.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/StorageCollection.cs b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/StorageCollection.cs index 68994ff..9c82df4 100644 --- a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/StorageCollection.cs +++ b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/StorageCollection.cs @@ -203,6 +203,11 @@ public class StorageCollection return true; } + /// + /// Создание коллекции по типу + /// + /// + /// private static ICollectionGenericObjects? CreateCollection(CollectionType collectionType) { return collectionType switch -- 2.25.1 From 3c43df8a4518f9c6f14592005190a5e7380f0f35 Mon Sep 17 00:00:00 2001 From: Evgeny Egov Date: Sat, 6 Jan 2024 19:42:32 +0400 Subject: [PATCH 3/5] =?UTF-8?q?=D1=87=D1=82=D0=BE=D0=B1=D1=8B=20=D0=BD?= =?UTF-8?q?=D0=B5=20=D1=80=D1=83=D0=B3=D0=B0=D0=BB=D0=BE=D1=81=D1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AbstractCompany.cs | 2 +- .../ListGenericObjects.cs | 23 +++++++++++++++++-- .../ProjectSportCar/Drawnings/DrawningCar.cs | 9 ++++++++ .../Drawnings/DrawningSportCar.cs | 11 ++++++++- .../Entities/EntitySportCar.cs | 11 +++++++++ 5 files changed, 52 insertions(+), 4 deletions(-) diff --git a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/AbstractCompany.cs b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/AbstractCompany.cs index 85edb53..0753208 100644 --- a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/AbstractCompany.cs +++ b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/AbstractCompany.cs @@ -48,7 +48,7 @@ public abstract class AbstractCompany _pictureWidth = picWidth; _pictureHeight = picHeight; _collection = collection; - _collection.SetMaxCount = GetMaxCount; + _collection.MaxCount = GetMaxCount; } /// diff --git a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ListGenericObjects.cs b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ListGenericObjects.cs index e6c0b2c..e8c5ae5 100644 --- a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ListGenericObjects.cs +++ b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/ListGenericObjects.cs @@ -1,4 +1,5 @@ -namespace ProjectSportCar.CollectionGenericObjects; + +namespace ProjectSportCar.CollectionGenericObjects; /// /// Параметризованный набор объектов @@ -19,7 +20,20 @@ public class ListGenericObjects : ICollectionGenericObjects public int Count => _collection.Count; - public int SetMaxCount { set { if (value > 0) { _maxCount = value; } } } + public int MaxCount + { + get => _maxCount; + set + { + if (value > 0) + { + _maxCount = value; + } + } + } + + + public CollectionType GetCollectionType => throw new NotImplementedException(); /// /// Конструктор @@ -56,4 +70,9 @@ public class ListGenericObjects : ICollectionGenericObjects // TODO удаление объекта из списка return true; } + + public IEnumerable GetItems() + { + throw new NotImplementedException(); + } } \ No newline at end of file diff --git a/ProjectSportCar/ProjectSportCar/Drawnings/DrawningCar.cs b/ProjectSportCar/ProjectSportCar/Drawnings/DrawningCar.cs index 570b5b6..e3f5302 100644 --- a/ProjectSportCar/ProjectSportCar/Drawnings/DrawningCar.cs +++ b/ProjectSportCar/ProjectSportCar/Drawnings/DrawningCar.cs @@ -84,6 +84,15 @@ public class DrawningCar EntityCar = new EntityCar(speed, weight, bodyColor); } + /// + /// Конструктор + /// + /// Класс-сущность + public DrawningCar(EntityCar car) : this() + { + // TODO продумать логику + } + /// /// Конструктор для наследников /// diff --git a/ProjectSportCar/ProjectSportCar/Drawnings/DrawningSportCar.cs b/ProjectSportCar/ProjectSportCar/Drawnings/DrawningSportCar.cs index 9bf7210..59bc69b 100644 --- a/ProjectSportCar/ProjectSportCar/Drawnings/DrawningSportCar.cs +++ b/ProjectSportCar/ProjectSportCar/Drawnings/DrawningSportCar.cs @@ -20,7 +20,16 @@ public class DrawningSportCar : DrawningCar public DrawningSportCar(int speed, double weight, Color bodyColor, Color additionalColor, bool bodyKit, bool wing, bool sportLine) : base(110, 60) { EntityCar = new EntitySportCar(speed, weight, bodyColor, additionalColor, bodyKit, wing, sportLine); - } + } + + /// + /// Конструктор + /// + /// Класс-сущность + public DrawningSportCar(EntityCar car) : base(110, 60) + { + // TODO продумать логику + } public override void DrawTransport(Graphics g) { diff --git a/ProjectSportCar/ProjectSportCar/Entities/EntitySportCar.cs b/ProjectSportCar/ProjectSportCar/Entities/EntitySportCar.cs index 4972c1c..d039499 100644 --- a/ProjectSportCar/ProjectSportCar/Entities/EntitySportCar.cs +++ b/ProjectSportCar/ProjectSportCar/Entities/EntitySportCar.cs @@ -44,4 +44,15 @@ public class EntitySportCar : EntityCar } //TODO Прописать метод + + /// + /// Создание объекта из массива строк + /// + /// + /// + public static EntitySportCar? CreateEntitySportCar(string[] strs) + { + // TODO продумать логику + return null; + } } \ No newline at end of file -- 2.25.1 From e9cd7c75ce70ad71511275e4a2a0662b76e2d0e3 Mon Sep 17 00:00:00 2001 From: Evgeny Egov Date: Sat, 6 Jan 2024 19:52:26 +0400 Subject: [PATCH 4/5] =?UTF-8?q?=D0=B8=D0=B7=D0=BC=D0=B5=D0=BD=D0=B8=D0=BB?= =?UTF-8?q?=D0=B8=20=D1=80=D0=B0=D0=B7=D0=BC=D0=B5=D1=80=D1=8B=20=D1=84?= =?UTF-8?q?=D0=BE=D1=80=D0=BC=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ProjectSportCar/FormCarCollection.Designer.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ProjectSportCar/ProjectSportCar/FormCarCollection.Designer.cs b/ProjectSportCar/ProjectSportCar/FormCarCollection.Designer.cs index d00450d..f204ff8 100644 --- a/ProjectSportCar/ProjectSportCar/FormCarCollection.Designer.cs +++ b/ProjectSportCar/ProjectSportCar/FormCarCollection.Designer.cs @@ -68,7 +68,7 @@ groupBoxTools.Dock = DockStyle.Right; groupBoxTools.Location = new Point(783, 24); groupBoxTools.Name = "groupBoxTools"; - groupBoxTools.Size = new Size(179, 592); + groupBoxTools.Size = new Size(179, 608); groupBoxTools.TabIndex = 0; groupBoxTools.TabStop = false; groupBoxTools.Text = "Инструменты"; @@ -82,7 +82,7 @@ panelCompanyTools.Controls.Add(buttonGoToCheck); panelCompanyTools.Dock = DockStyle.Bottom; panelCompanyTools.Enabled = false; - panelCompanyTools.Location = new Point(3, 336); + panelCompanyTools.Location = new Point(3, 352); panelCompanyTools.Name = "panelCompanyTools"; panelCompanyTools.Size = new Size(173, 253); panelCompanyTools.TabIndex = 9; @@ -249,7 +249,7 @@ pictureBox.Dock = DockStyle.Fill; pictureBox.Location = new Point(0, 24); pictureBox.Name = "pictureBox"; - pictureBox.Size = new Size(783, 592); + pictureBox.Size = new Size(783, 608); pictureBox.TabIndex = 1; pictureBox.TabStop = false; // @@ -297,7 +297,7 @@ // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(962, 616); + ClientSize = new Size(962, 632); Controls.Add(pictureBox); Controls.Add(groupBoxTools); Controls.Add(menuStrip); -- 2.25.1 From e1a7ba4fd4dc8bc4f5ba19e97ec293498eb04193 Mon Sep 17 00:00:00 2001 From: Evgeny Egov Date: Sat, 6 Jan 2024 20:27:29 +0400 Subject: [PATCH 5/5] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CollectionGenericObjects/MassiveGenericObjects.cs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs index 82983b3..5b24776 100644 --- a/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs +++ b/ProjectSportCar/ProjectSportCar/CollectionGenericObjects/MassiveGenericObjects.cs @@ -26,7 +26,14 @@ public class MassiveGenericObjects : ICollectionGenericObjects { if (value > 0) { - _collection = new T?[value]; + if (_collection.Length > 0) + { + Array.Resize(ref _collection, value); + } + else + { + _collection = new T?[value]; + } } } } -- 2.25.1